This commit is contained in:
Eric Bailey
2024-12-08 12:41:04 -06:00
parent fea90b72f9
commit dd66944777
+25 -14
View File
@@ -18,7 +18,6 @@ import {
APISubscription, APISubscription,
NativePurchaseRestricted, NativePurchaseRestricted,
} from '#/state/purchases/types' } from '#/state/purchases/types'
import {CenteredView} from '#/view/com/util/Views'
import {atoms as a, tokens, useBreakpoints, useTheme} from '#/alf' import {atoms as a, tokens, useBreakpoints, useTheme} from '#/alf'
import {Admonition} from '#/components/Admonition' import {Admonition} from '#/components/Admonition'
import {Button, ButtonIcon, ButtonText} from '#/components/Button' import {Button, ButtonIcon, ButtonText} from '#/components/Button'
@@ -29,11 +28,11 @@ import {GradientFill} from '#/components/GradientFill'
import {AndroidLogo} from '#/components/icons/AndroidLogo' import {AndroidLogo} from '#/components/icons/AndroidLogo'
import {AppleLogo} from '#/components/icons/AppleLogo' import {AppleLogo} from '#/components/icons/AppleLogo'
import {ArrowRotateCounterClockwise_Stroke2_Corner0_Rounded as Rotate} from '#/components/icons/ArrowRotateCounterClockwise' import {ArrowRotateCounterClockwise_Stroke2_Corner0_Rounded as Rotate} from '#/components/icons/ArrowRotateCounterClockwise'
import {Logotype} from '#/components/icons/BlueskyPlus' import {Full as BlueskyPlusLogo} from '#/components/icons/BlueskyPlus'
import {CheckThick_Stroke2_Corner0_Rounded as Check} from '#/components/icons/Check' import {CheckThick_Stroke2_Corner0_Rounded as Check} from '#/components/icons/Check'
import {Clock_Stroke2_Corner0_Rounded as Clock} from '#/components/icons/Clock' import {Clock_Stroke2_Corner0_Rounded as Clock} from '#/components/icons/Clock'
import {Globe_Stroke2_Corner0_Rounded as Globe} from '#/components/icons/Globe' import {Globe_Stroke2_Corner0_Rounded as Globe} from '#/components/icons/Globe'
import {Mark} from '#/components/icons/Logo' // import {Mark} from '#/components/icons/Logo'
import {PlusLarge_Stroke2_Corner0_Rounded as Plus} from '#/components/icons/Plus' import {PlusLarge_Stroke2_Corner0_Rounded as Plus} from '#/components/icons/Plus'
import * as Layout from '#/components/Layout' import * as Layout from '#/components/Layout'
import {createStaticClick, InlineLinkText, Link} from '#/components/Link' import {createStaticClick, InlineLinkText, Link} from '#/components/Link'
@@ -61,21 +60,29 @@ export function Subscriptions(_props: ScreenProps) {
return ( return (
<Layout.Screen> <Layout.Screen>
<Layout.Header.Outer> <Layout.Center>
<Layout.Header.BackButton /> <GradientFill gradient={tokens.gradients.nordic} />
<Layout.Header.Content> <Layout.Header.Outer noBottomBorder>
<Layout.Header.TitleText> <Layout.Header.BackButton />
<Trans>Subscriptions</Trans> <Layout.Header.Content>
</Layout.Header.TitleText> <BlueskyPlusLogo width={100} fill='white' />
</Layout.Header.Content> </Layout.Header.Content>
<Layout.Header.Slot /> <Layout.Header.Slot />
</Layout.Header.Outer> </Layout.Header.Outer>
{/*
<View style={[
a.px_xl,
]}>
<Divider style={{borderColor: 'white', opacity: 0.2}} />
</View>
*/}
</Layout.Center>
<Layout.Content <Layout.Content
refreshControl={ refreshControl={
<RefreshControl refreshing={refreshing} onRefresh={onRefresh} /> <RefreshControl refreshing={refreshing} onRefresh={onRefresh} />
}> }>
<CenteredView style={[a.util_screen_outer]}>
<View style={[a.px_xl, a.py_xl]}> <View style={[a.px_xl, a.py_xl]}>
{purchases.status === 'loading' || loading ? ( {purchases.status === 'loading' || loading ? (
<Loader /> <Loader />
@@ -87,7 +94,6 @@ export function Subscriptions(_props: ScreenProps) {
<Core state={purchases} restricted={restricted} /> <Core state={purchases} restricted={restricted} />
)} )}
</View> </View>
</CenteredView>
</Layout.Content> </Layout.Content>
</Layout.Screen> </Layout.Screen>
) )
@@ -110,10 +116,15 @@ function Core({
return ( return (
<View> <View>
<Text style={[a.text_md, a.font_bold, t.atoms.text_contrast_medium]}>
<Trans>My subscriptions</Trans>
</Text>
{/*
<View style={[a.flex_row, a.align_center, a.gap_xs]}> <View style={[a.flex_row, a.align_center, a.gap_xs]}>
<Mark width={30} gradient="nordic" /> <Mark width={30} gradient="nordic" />
<Logotype width={90} fill={t.atoms.text.color} /> <Logotype width={90} fill={t.atoms.text.color} />
</View> </View>
*/}
{restricted === 'yes' ? ( {restricted === 'yes' ? (
<Admonition type="info"> <Admonition type="info">