Fix starter pack layout (#7869)
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
import React from 'react'
|
import React from 'react'
|
||||||
import {Pressable, ScrollView, View} from 'react-native'
|
import {Pressable, View} from 'react-native'
|
||||||
import Animated, {FadeIn, FadeOut} from 'react-native-reanimated'
|
import Animated, {FadeIn, FadeOut} from 'react-native-reanimated'
|
||||||
import {
|
import {
|
||||||
AppBskyGraphDefs,
|
AppBskyGraphDefs,
|
||||||
@@ -25,13 +25,13 @@ import {
|
|||||||
} from '#/state/shell/starter-pack'
|
} from '#/state/shell/starter-pack'
|
||||||
import {LoggedOutScreenState} from '#/view/com/auth/LoggedOut'
|
import {LoggedOutScreenState} from '#/view/com/auth/LoggedOut'
|
||||||
import {formatCount} from '#/view/com/util/numeric/format'
|
import {formatCount} from '#/view/com/util/numeric/format'
|
||||||
import {CenteredView} from '#/view/com/util/Views'
|
|
||||||
import {Logo} from '#/view/icons/Logo'
|
import {Logo} from '#/view/icons/Logo'
|
||||||
import {atoms as a, useTheme} from '#/alf'
|
import {atoms as a, useTheme} from '#/alf'
|
||||||
import {Button, ButtonText} from '#/components/Button'
|
import {Button, ButtonText} from '#/components/Button'
|
||||||
import {useDialogControl} from '#/components/Dialog'
|
import {useDialogControl} from '#/components/Dialog'
|
||||||
import * as FeedCard from '#/components/FeedCard'
|
import * as FeedCard from '#/components/FeedCard'
|
||||||
import {useRichText} from '#/components/hooks/useRichText'
|
import {useRichText} from '#/components/hooks/useRichText'
|
||||||
|
import * as Layout from '#/components/Layout'
|
||||||
import {LinearGradientBackground} from '#/components/LinearGradientBackground'
|
import {LinearGradientBackground} from '#/components/LinearGradientBackground'
|
||||||
import {ListMaybePlaceholder} from '#/components/Lists'
|
import {ListMaybePlaceholder} from '#/components/Lists'
|
||||||
import {Default as ProfileCard} from '#/components/ProfileCard'
|
import {Default as ProfileCard} from '#/components/ProfileCard'
|
||||||
@@ -165,10 +165,8 @@ function LandingScreenLoaded({
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<CenteredView style={a.flex_1}>
|
<View style={[a.flex_1]}>
|
||||||
<ScrollView
|
<Layout.Content ignoreTabletLayoutOffset>
|
||||||
style={[a.flex_1, t.atoms.bg]}
|
|
||||||
contentContainerStyle={{paddingBottom: 100}}>
|
|
||||||
<LinearGradientBackground
|
<LinearGradientBackground
|
||||||
style={[
|
style={[
|
||||||
a.align_center,
|
a.align_center,
|
||||||
@@ -313,7 +311,7 @@ function LandingScreenLoaded({
|
|||||||
</ButtonText>
|
</ButtonText>
|
||||||
</Button>
|
</Button>
|
||||||
</View>
|
</View>
|
||||||
</ScrollView>
|
</Layout.Content>
|
||||||
<AppClipOverlay
|
<AppClipOverlay
|
||||||
visible={appClipOverlayVisible}
|
visible={appClipOverlayVisible}
|
||||||
setIsVisible={setAppClipOverlayVisible}
|
setIsVisible={setAppClipOverlayVisible}
|
||||||
@@ -358,7 +356,7 @@ function LandingScreenLoaded({
|
|||||||
content="app-id=xyz.blueskyweb.app, app-clip-bundle-id=xyz.blueskyweb.app.AppClip, app-clip-display=card"
|
content="app-id=xyz.blueskyweb.app, app-clip-bundle-id=xyz.blueskyweb.app.AppClip, app-clip-display=card"
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</CenteredView>
|
</View>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -376,11 +374,8 @@ export function AppClipOverlay({
|
|||||||
accessibilityRole="button"
|
accessibilityRole="button"
|
||||||
style={[
|
style={[
|
||||||
a.absolute,
|
a.absolute,
|
||||||
|
a.inset_0,
|
||||||
{
|
{
|
||||||
top: 0,
|
|
||||||
left: 0,
|
|
||||||
right: 0,
|
|
||||||
bottom: 0,
|
|
||||||
backgroundColor: 'rgba(0, 0, 0, 0.95)',
|
backgroundColor: 'rgba(0, 0, 0, 0.95)',
|
||||||
zIndex: 1,
|
zIndex: 1,
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ import {logEvent} from '#/lib/statsig/statsig'
|
|||||||
import {cleanError} from '#/lib/strings/errors'
|
import {cleanError} from '#/lib/strings/errors'
|
||||||
import {getStarterPackOgCard} from '#/lib/strings/starter-pack'
|
import {getStarterPackOgCard} from '#/lib/strings/starter-pack'
|
||||||
import {logger} from '#/logger'
|
import {logger} from '#/logger'
|
||||||
import {isWeb} from '#/platform/detection'
|
|
||||||
import {updateProfileShadow} from '#/state/cache/profile-shadow'
|
import {updateProfileShadow} from '#/state/cache/profile-shadow'
|
||||||
import {useModerationOpts} from '#/state/preferences/moderation-opts'
|
import {useModerationOpts} from '#/state/preferences/moderation-opts'
|
||||||
import {getAllListMembers} from '#/state/queries/list-members'
|
import {getAllListMembers} from '#/state/queries/list-members'
|
||||||
@@ -43,7 +42,6 @@ import {useSetActiveStarterPack} from '#/state/shell/starter-pack'
|
|||||||
import {PagerWithHeader} from '#/view/com/pager/PagerWithHeader'
|
import {PagerWithHeader} from '#/view/com/pager/PagerWithHeader'
|
||||||
import {ProfileSubpageHeader} from '#/view/com/profile/ProfileSubpageHeader'
|
import {ProfileSubpageHeader} from '#/view/com/profile/ProfileSubpageHeader'
|
||||||
import * as Toast from '#/view/com/util/Toast'
|
import * as Toast from '#/view/com/util/Toast'
|
||||||
import {CenteredView} from '#/view/com/util/Views'
|
|
||||||
import {bulkWriteFollows} from '#/screens/Onboarding/util'
|
import {bulkWriteFollows} from '#/screens/Onboarding/util'
|
||||||
import {atoms as a, useBreakpoints, useTheme} from '#/alf'
|
import {atoms as a, useBreakpoints, useTheme} from '#/alf'
|
||||||
import {Button, ButtonIcon, ButtonText} from '#/components/Button'
|
import {Button, ButtonIcon, ButtonText} from '#/components/Button'
|
||||||
@@ -222,8 +220,7 @@ function StarterPackScreenLoaded({
|
|||||||
}, [onOpenShareDialog, routeParams.new, shareDialogControl])
|
}, [onOpenShareDialog, routeParams.new, shareDialogControl])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<CenteredView style={[a.h_full_vh]}>
|
<>
|
||||||
<View style={isWeb ? {minHeight: '100%'} : {height: '100%'}}>
|
|
||||||
<PagerWithHeader
|
<PagerWithHeader
|
||||||
items={tabs}
|
items={tabs}
|
||||||
isHeaderReady={true}
|
isHeaderReady={true}
|
||||||
@@ -270,7 +267,6 @@ function StarterPackScreenLoaded({
|
|||||||
)
|
)
|
||||||
: null}
|
: null}
|
||||||
</PagerWithHeader>
|
</PagerWithHeader>
|
||||||
</View>
|
|
||||||
|
|
||||||
<QrCodeDialog
|
<QrCodeDialog
|
||||||
control={qrCodeDialogControl}
|
control={qrCodeDialogControl}
|
||||||
@@ -284,7 +280,7 @@ function StarterPackScreenLoaded({
|
|||||||
link={link}
|
link={link}
|
||||||
imageLoaded={imageLoaded}
|
imageLoaded={imageLoaded}
|
||||||
/>
|
/>
|
||||||
</CenteredView>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -707,16 +703,8 @@ function InvalidStarterPack({rkey}: {rkey: string}) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<CenteredView
|
<Layout.Content centerContent>
|
||||||
style={[
|
<View style={[a.py_4xl, a.px_xl, a.align_center, a.gap_5xl]}>
|
||||||
a.flex_1,
|
|
||||||
a.align_center,
|
|
||||||
a.gap_5xl,
|
|
||||||
!gtMobile && a.justify_between,
|
|
||||||
t.atoms.border_contrast_low,
|
|
||||||
{paddingTop: 175, paddingBottom: 110},
|
|
||||||
]}
|
|
||||||
sideBorders={true}>
|
|
||||||
<View style={[a.w_full, a.align_center, a.gap_lg]}>
|
<View style={[a.w_full, a.align_center, a.gap_lg]}>
|
||||||
<Text style={[a.font_bold, a.text_3xl]}>
|
<Text style={[a.font_bold, a.text_3xl]}>
|
||||||
<Trans>Starter pack is invalid</Trans>
|
<Trans>Starter pack is invalid</Trans>
|
||||||
@@ -765,6 +753,7 @@ function InvalidStarterPack({rkey}: {rkey: string}) {
|
|||||||
</ButtonText>
|
</ButtonText>
|
||||||
</Button>
|
</Button>
|
||||||
</View>
|
</View>
|
||||||
</CenteredView>
|
</View>
|
||||||
|
</Layout.Content>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,7 +41,6 @@ import {useSession} from '#/state/session'
|
|||||||
import {useSetMinimalShellMode} from '#/state/shell'
|
import {useSetMinimalShellMode} from '#/state/shell'
|
||||||
import * as Toast from '#/view/com/util/Toast'
|
import * as Toast from '#/view/com/util/Toast'
|
||||||
import {UserAvatar} from '#/view/com/util/UserAvatar'
|
import {UserAvatar} from '#/view/com/util/UserAvatar'
|
||||||
import {CenteredView} from '#/view/com/util/Views'
|
|
||||||
import {useWizardState, WizardStep} from '#/screens/StarterPack/Wizard/State'
|
import {useWizardState, WizardStep} from '#/screens/StarterPack/Wizard/State'
|
||||||
import {StepDetails} from '#/screens/StarterPack/Wizard/StepDetails'
|
import {StepDetails} from '#/screens/StarterPack/Wizard/StepDetails'
|
||||||
import {StepFeeds} from '#/screens/StarterPack/Wizard/StepFeeds'
|
import {StepFeeds} from '#/screens/StarterPack/Wizard/StepFeeds'
|
||||||
@@ -281,7 +280,7 @@ function WizardInner({
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<CenteredView style={[a.flex_1]} sideBorders>
|
<Layout.Center style={[a.flex_1]}>
|
||||||
<Layout.Header.Outer>
|
<Layout.Header.Outer>
|
||||||
<Layout.Header.BackButton
|
<Layout.Header.BackButton
|
||||||
label={_(msg`Back`)}
|
label={_(msg`Back`)}
|
||||||
@@ -319,7 +318,7 @@ function WizardInner({
|
|||||||
profile={profile}
|
profile={profile}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</CenteredView>
|
</Layout.Center>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user