Add util_screen_outer, apply to h_full_vh here needed

This commit is contained in:
Eric Bailey
2024-09-03 13:38:53 -05:00
parent 5f46890b68
commit c21b584d34
6 changed files with 20 additions and 16 deletions
+14 -1
View File
@@ -1,4 +1,4 @@
import {Platform, StyleSheet} from 'react-native' import {Platform, StyleSheet, ViewStyle} from 'react-native'
import * as tokens from '#/alf/tokens' import * as tokens from '#/alf/tokens'
import {native, web} from '#/alf/util/platform' import {native, web} from '#/alf/util/platform'
@@ -60,6 +60,19 @@ export const atoms = {
height: '100vh', height: '100vh',
}), }),
/**
* Used for the outermost components on screens, to ensure that they can fill
* the screen and extend beyond.
*/
util_screen_outer: [
web({
minHeight: '100vh',
}),
native({
height: '100%',
}),
] as ViewStyle,
/* /*
* Theme-independent bg colors * Theme-independent bg colors
*/ */
+1 -1
View File
@@ -27,7 +27,7 @@ export const PostLikedByScreen = ({route}: Props) => {
) )
return ( return (
<CenteredView style={a.h_full_vh} sideBorders={true}> <CenteredView style={a.util_screen_outer} sideBorders={true}>
<ListHeaderDesktop title={_(msg`Liked By`)} /> <ListHeaderDesktop title={_(msg`Liked By`)} />
<ViewHeader title={_(msg`Liked By`)} showBorder={!isWeb} /> <ViewHeader title={_(msg`Liked By`)} showBorder={!isWeb} />
<PostLikedByComponent uri={uri} /> <PostLikedByComponent uri={uri} />
+2 -11
View File
@@ -10,7 +10,7 @@ import {isWeb} from 'platform/detection'
import {PostQuotes as PostQuotesComponent} from '#/view/com/post-thread/PostQuotes' import {PostQuotes as PostQuotesComponent} from '#/view/com/post-thread/PostQuotes'
import {ViewHeader} from '#/view/com/util/ViewHeader' import {ViewHeader} from '#/view/com/util/ViewHeader'
import {CenteredView} from 'view/com/util/Views' import {CenteredView} from 'view/com/util/Views'
import {native, web} from '#/alf' import {atoms as a} from '#/alf'
import {ListHeaderDesktop} from '#/components/Lists' import {ListHeaderDesktop} from '#/components/Lists'
type Props = NativeStackScreenProps<CommonNavigatorParams, 'PostQuotes'> type Props = NativeStackScreenProps<CommonNavigatorParams, 'PostQuotes'>
@@ -27,16 +27,7 @@ export const PostQuotesScreen = ({route}: Props) => {
) )
return ( return (
<CenteredView <CenteredView style={a.util_screen_outer} sideBorders={true}>
style={[
web({
minHeight: '100vh',
}),
native({
height: '100%',
}),
]}
sideBorders={true}>
<ListHeaderDesktop title={_(msg`Quotes`)} /> <ListHeaderDesktop title={_(msg`Quotes`)} />
<ViewHeader title={_(msg`Quotes`)} showBorder={!isWeb} /> <ViewHeader title={_(msg`Quotes`)} showBorder={!isWeb} />
<PostQuotesComponent uri={uri} /> <PostQuotesComponent uri={uri} />
+1 -1
View File
@@ -27,7 +27,7 @@ export const PostRepostedByScreen = ({route}: Props) => {
) )
return ( return (
<CenteredView style={a.h_full_vh} sideBorders={true}> <CenteredView style={a.util_screen_outer} sideBorders={true}>
<ListHeaderDesktop title={_(msg`Reposted By`)} /> <ListHeaderDesktop title={_(msg`Reposted By`)} />
<ViewHeader title={_(msg`Reposted By`)} showBorder={!isWeb} /> <ViewHeader title={_(msg`Reposted By`)} showBorder={!isWeb} />
<PostRepostedByComponent uri={uri} /> <PostRepostedByComponent uri={uri} />
+1 -1
View File
@@ -25,7 +25,7 @@ export const ProfileFollowersScreen = ({route}: Props) => {
) )
return ( return (
<CenteredView style={a.h_full_vh} sideBorders={true}> <CenteredView style={a.util_screen_outer} sideBorders={true}>
<ListHeaderDesktop title={_(msg`Followers`)} /> <ListHeaderDesktop title={_(msg`Followers`)} />
<ViewHeader title={_(msg`Followers`)} showBorder={!isWeb} /> <ViewHeader title={_(msg`Followers`)} showBorder={!isWeb} />
<ProfileFollowersComponent name={name} /> <ProfileFollowersComponent name={name} />
+1 -1
View File
@@ -25,7 +25,7 @@ export const ProfileFollowsScreen = ({route}: Props) => {
) )
return ( return (
<CenteredView style={a.h_full_vh} sideBorders={true}> <CenteredView style={a.util_screen_outer} sideBorders={true}>
<ListHeaderDesktop title={_(msg`Following`)} /> <ListHeaderDesktop title={_(msg`Following`)} />
<ViewHeader title={_(msg`Following`)} showBorder={!isWeb} /> <ViewHeader title={_(msg`Following`)} showBorder={!isWeb} />
<ProfileFollowsComponent name={name} /> <ProfileFollowsComponent name={name} />