diff options
author | Samuel Newman <mozzius@protonmail.com> | 2024-12-18 20:15:05 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-12-18 20:15:05 +0000 |
commit | 674153c7258da7454dde649c920b29937c8e0ba8 (patch) | |
tree | 56440081b7752c29144e1f805854458912c4acb5 /src | |
parent | c8e307b5cf35580bc576cd26d9ec17a77d7bdba1 (diff) | |
download | voidsky-674153c7258da7454dde649c920b29937c8e0ba8.tar.zst |
move header inside sticky area (#7163)
Diffstat (limited to 'src')
-rw-r--r-- | src/screens/Hashtag.tsx | 48 | ||||
-rw-r--r-- | src/screens/Topic.tsx | 38 |
2 files changed, 43 insertions, 43 deletions
diff --git a/src/screens/Hashtag.tsx b/src/screens/Hashtag.tsx index 83eb5b80d..fd1bdffa7 100644 --- a/src/screens/Hashtag.tsx +++ b/src/screens/Hashtag.tsx @@ -107,34 +107,34 @@ export default function HashtagScreen({ return ( <Layout.Screen> - <Layout.Header.Outer noBottomBorder> - <Layout.Header.BackButton /> - <Layout.Header.Content> - <Layout.Header.TitleText>{headerTitle}</Layout.Header.TitleText> - {author && ( - <Layout.Header.SubtitleText> - {_(msg`From @${sanitizedAuthor}`)} - </Layout.Header.SubtitleText> - )} - </Layout.Header.Content> - <Layout.Header.Slot> - <Button - label={_(msg`Share`)} - size="small" - variant="ghost" - color="primary" - shape="round" - onPress={onShare} - hitSlop={HITSLOP_10} - style={[{right: -3}]}> - <ButtonIcon icon={Share} size="md" /> - </Button> - </Layout.Header.Slot> - </Layout.Header.Outer> <Pager onPageSelected={onPageSelected} renderTabBar={props => ( <Layout.Center style={[a.z_10, web([a.sticky, {top: 0}])]}> + <Layout.Header.Outer noBottomBorder> + <Layout.Header.BackButton /> + <Layout.Header.Content> + <Layout.Header.TitleText>{headerTitle}</Layout.Header.TitleText> + {author && ( + <Layout.Header.SubtitleText> + {_(msg`From @${sanitizedAuthor}`)} + </Layout.Header.SubtitleText> + )} + </Layout.Header.Content> + <Layout.Header.Slot> + <Button + label={_(msg`Share`)} + size="small" + variant="ghost" + color="primary" + shape="round" + onPress={onShare} + hitSlop={HITSLOP_10} + style={[{right: -3}]}> + <ButtonIcon icon={Share} size="md" /> + </Button> + </Layout.Header.Slot> + </Layout.Header.Outer> <TabBar items={sections.map(section => section.title)} {...props} /> </Layout.Center> )} diff --git a/src/screens/Topic.tsx b/src/screens/Topic.tsx index 6cd69f05f..62726bcc6 100644 --- a/src/screens/Topic.tsx +++ b/src/screens/Topic.tsx @@ -88,29 +88,29 @@ export default function TopicScreen({ return ( <Layout.Screen> - <Layout.Header.Outer noBottomBorder> - <Layout.Header.BackButton /> - <Layout.Header.Content> - <Layout.Header.TitleText>{headerTitle}</Layout.Header.TitleText> - </Layout.Header.Content> - <Layout.Header.Slot> - <Button - label={_(msg`Share`)} - size="small" - variant="ghost" - color="primary" - shape="round" - onPress={onShare} - hitSlop={HITSLOP_10} - style={[{right: -3}]}> - <ButtonIcon icon={Share} size="md" /> - </Button> - </Layout.Header.Slot> - </Layout.Header.Outer> <Pager onPageSelected={onPageSelected} renderTabBar={props => ( <Layout.Center style={[a.z_10, web([a.sticky, {top: 0}])]}> + <Layout.Header.Outer noBottomBorder> + <Layout.Header.BackButton /> + <Layout.Header.Content> + <Layout.Header.TitleText>{headerTitle}</Layout.Header.TitleText> + </Layout.Header.Content> + <Layout.Header.Slot> + <Button + label={_(msg`Share`)} + size="small" + variant="ghost" + color="primary" + shape="round" + onPress={onShare} + hitSlop={HITSLOP_10} + style={[{right: -3}]}> + <ButtonIcon icon={Share} size="md" /> + </Button> + </Layout.Header.Slot> + </Layout.Header.Outer> <TabBar items={sections.map(section => section.title)} {...props} /> </Layout.Center> )} |