diff options
Diffstat (limited to 'src/screens')
-rw-r--r-- | src/screens/Onboarding/IconCircle.tsx | 51 | ||||
-rw-r--r-- | src/screens/Onboarding/Layout.tsx | 8 | ||||
-rw-r--r-- | src/screens/Onboarding/StepAlgoFeeds/index.tsx | 2 | ||||
-rw-r--r-- | src/screens/Onboarding/StepFinished.tsx | 2 | ||||
-rw-r--r-- | src/screens/Onboarding/StepFollowingFeed.tsx | 2 | ||||
-rw-r--r-- | src/screens/Onboarding/StepInterests/index.tsx | 2 | ||||
-rw-r--r-- | src/screens/Onboarding/StepModeration/index.tsx | 2 | ||||
-rw-r--r-- | src/screens/Onboarding/StepSuggestedAccounts/index.tsx | 2 | ||||
-rw-r--r-- | src/screens/Onboarding/StepTopicalFeeds.tsx | 2 |
9 files changed, 12 insertions, 61 deletions
diff --git a/src/screens/Onboarding/IconCircle.tsx b/src/screens/Onboarding/IconCircle.tsx deleted file mode 100644 index a54c8b4e4..000000000 --- a/src/screens/Onboarding/IconCircle.tsx +++ /dev/null @@ -1,51 +0,0 @@ -import React from 'react' -import {View} from 'react-native' - -import { - useTheme, - atoms as a, - ViewStyleProp, - TextStyleProp, - flatten, -} from '#/alf' -import {Growth_Stroke2_Corner0_Rounded as Growth} from '#/components/icons/Growth' -import {Props} from '#/components/icons/common' - -export function IconCircle({ - icon: Icon, - size = 'xl', - style, - iconStyle, -}: ViewStyleProp & { - icon: typeof Growth - size?: Props['size'] - iconStyle?: TextStyleProp['style'] -}) { - const t = useTheme() - - return ( - <View - style={[ - a.justify_center, - a.align_center, - a.rounded_full, - { - width: 64, - height: 64, - backgroundColor: - t.name === 'light' ? t.palette.primary_50 : t.palette.primary_950, - }, - flatten(style), - ]}> - <Icon - size={size} - style={[ - { - color: t.palette.primary_500, - }, - flatten(iconStyle), - ]} - /> - </View> - ) -} diff --git a/src/screens/Onboarding/Layout.tsx b/src/screens/Onboarding/Layout.tsx index d887c0820..6337cee09 100644 --- a/src/screens/Onboarding/Layout.tsx +++ b/src/screens/Onboarding/Layout.tsx @@ -17,7 +17,7 @@ import { flatten, TextStyleProp, } from '#/alf' -import {H2, P, leading} from '#/components/Typography' +import {P, leading, Text} from '#/components/Typography' import {ChevronLeft_Stroke2_Corner0_Rounded as ChevronLeft} from '#/components/icons/Chevron' import {Button, ButtonIcon} from '#/components/Button' import {ScrollView} from '#/view/com/util/Views' @@ -209,16 +209,18 @@ export function Title({ style, }: React.PropsWithChildren<TextStyleProp>) { return ( - <H2 + <Text style={[ a.pb_sm, + a.text_4xl, + a.font_bold, { lineHeight: leading(a.text_4xl, a.leading_tight), }, flatten(style), ]}> {children} - </H2> + </Text> ) } diff --git a/src/screens/Onboarding/StepAlgoFeeds/index.tsx b/src/screens/Onboarding/StepAlgoFeeds/index.tsx index 33e519207..1a4e4c493 100644 --- a/src/screens/Onboarding/StepAlgoFeeds/index.tsx +++ b/src/screens/Onboarding/StepAlgoFeeds/index.tsx @@ -20,7 +20,7 @@ import { OnboardingControls, } from '#/screens/Onboarding/Layout' import {FeedCard} from '#/screens/Onboarding/StepAlgoFeeds/FeedCard' -import {IconCircle} from '#/screens/Onboarding/IconCircle' +import {IconCircle} from '#/components/IconCircle' export type FeedConfig = { default: boolean diff --git a/src/screens/Onboarding/StepFinished.tsx b/src/screens/Onboarding/StepFinished.tsx index 72d53658b..944dcb96d 100644 --- a/src/screens/Onboarding/StepFinished.tsx +++ b/src/screens/Onboarding/StepFinished.tsx @@ -23,7 +23,7 @@ import { Description, OnboardingControls, } from '#/screens/Onboarding/Layout' -import {IconCircle} from '#/screens/Onboarding/IconCircle' +import {IconCircle} from '#/components/IconCircle' import { bulkWriteFollows, sortPrimaryAlgorithmFeeds, diff --git a/src/screens/Onboarding/StepFollowingFeed.tsx b/src/screens/Onboarding/StepFollowingFeed.tsx index 114e274b6..898afad13 100644 --- a/src/screens/Onboarding/StepFollowingFeed.tsx +++ b/src/screens/Onboarding/StepFollowingFeed.tsx @@ -22,7 +22,7 @@ import { usePreferencesQuery, useSetFeedViewPreferencesMutation, } from 'state/queries/preferences' -import {IconCircle} from '#/screens/Onboarding/IconCircle' +import {IconCircle} from '#/components/IconCircle' export function StepFollowingFeed() { const {_} = useLingui() diff --git a/src/screens/Onboarding/StepInterests/index.tsx b/src/screens/Onboarding/StepInterests/index.tsx index 4eaf0366e..ea23b74f0 100644 --- a/src/screens/Onboarding/StepInterests/index.tsx +++ b/src/screens/Onboarding/StepInterests/index.tsx @@ -26,7 +26,7 @@ import { OnboardingControls, } from '#/screens/Onboarding/Layout' import {InterestButton} from '#/screens/Onboarding/StepInterests/InterestButton' -import {IconCircle} from '#/screens/Onboarding/IconCircle' +import {IconCircle} from '#/components/IconCircle' export function StepInterests() { const {_} = useLingui() diff --git a/src/screens/Onboarding/StepModeration/index.tsx b/src/screens/Onboarding/StepModeration/index.tsx index c831b6880..543a5b159 100644 --- a/src/screens/Onboarding/StepModeration/index.tsx +++ b/src/screens/Onboarding/StepModeration/index.tsx @@ -26,7 +26,7 @@ import { import {ModerationOption} from '#/screens/Onboarding/StepModeration/ModerationOption' import {AdultContentEnabledPref} from '#/screens/Onboarding/StepModeration/AdultContentEnabledPref' import {Context} from '#/screens/Onboarding/state' -import {IconCircle} from '#/screens/Onboarding/IconCircle' +import {IconCircle} from '#/components/IconCircle' function AnimatedDivider() { return ( diff --git a/src/screens/Onboarding/StepSuggestedAccounts/index.tsx b/src/screens/Onboarding/StepSuggestedAccounts/index.tsx index 3caa38d4f..14faddc10 100644 --- a/src/screens/Onboarding/StepSuggestedAccounts/index.tsx +++ b/src/screens/Onboarding/StepSuggestedAccounts/index.tsx @@ -27,7 +27,7 @@ import { SuggestedAccountCardPlaceholder, } from '#/screens/Onboarding/StepSuggestedAccounts/SuggestedAccountCard' import {aggregateInterestItems} from '#/screens/Onboarding/util' -import {IconCircle} from '#/screens/Onboarding/IconCircle' +import {IconCircle} from '#/components/IconCircle' export function Inner({ profiles, diff --git a/src/screens/Onboarding/StepTopicalFeeds.tsx b/src/screens/Onboarding/StepTopicalFeeds.tsx index 3640b764d..4a2210853 100644 --- a/src/screens/Onboarding/StepTopicalFeeds.tsx +++ b/src/screens/Onboarding/StepTopicalFeeds.tsx @@ -21,7 +21,7 @@ import { } from '#/screens/Onboarding/Layout' import {FeedCard} from '#/screens/Onboarding/StepAlgoFeeds/FeedCard' import {aggregateInterestItems} from '#/screens/Onboarding/util' -import {IconCircle} from '#/screens/Onboarding/IconCircle' +import {IconCircle} from '#/components/IconCircle' export function StepTopicalFeeds() { const {_} = useLingui() |