Invert web border logic for easier migration
This commit is contained in:
@@ -26,6 +26,7 @@ const LayoutContext = React.createContext({
|
|||||||
export type ScreenProps = React.ComponentProps<typeof View> & {
|
export type ScreenProps = React.ComponentProps<typeof View> & {
|
||||||
disableTopPadding?: boolean
|
disableTopPadding?: boolean
|
||||||
style?: StyleProp<ViewStyle>
|
style?: StyleProp<ViewStyle>
|
||||||
|
temp__enableWebBorders?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -36,6 +37,7 @@ export type ScreenProps = React.ComponentProps<typeof View> & {
|
|||||||
export const Screen = React.memo(function Screen({
|
export const Screen = React.memo(function Screen({
|
||||||
disableTopPadding = false,
|
disableTopPadding = false,
|
||||||
style,
|
style,
|
||||||
|
temp__enableWebBorders,
|
||||||
...props
|
...props
|
||||||
}: ScreenProps) {
|
}: ScreenProps) {
|
||||||
const {top} = useSafeAreaInsets()
|
const {top} = useSafeAreaInsets()
|
||||||
@@ -49,7 +51,7 @@ export const Screen = React.memo(function Screen({
|
|||||||
)
|
)
|
||||||
return (
|
return (
|
||||||
<LayoutContext.Provider value={context}>
|
<LayoutContext.Provider value={context}>
|
||||||
{isWeb && <WebCenterBorders />}
|
{isWeb && temp__enableWebBorders && <WebCenterBorders />}
|
||||||
<View
|
<View
|
||||||
style={[
|
style={[
|
||||||
{paddingTop: disableTopPadding ? 0 : top},
|
{paddingTop: disableTopPadding ? 0 : top},
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ export function AboutSettingsScreen({}: Props) {
|
|||||||
const {_} = useLingui()
|
const {_} = useLingui()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Layout.Screen>
|
<Layout.Screen temp__enableWebBorders>
|
||||||
<Layout.Content>
|
<Layout.Content>
|
||||||
<Layout.Header.Outer>
|
<Layout.Header.Outer>
|
||||||
<Layout.Header.BackButton />
|
<Layout.Header.BackButton />
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ export function AccessibilitySettingsScreen({}: Props) {
|
|||||||
const setLargeAltBadgeEnabled = useSetLargeAltBadgeEnabled()
|
const setLargeAltBadgeEnabled = useSetLargeAltBadgeEnabled()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Layout.Screen>
|
<Layout.Screen temp__enableWebBorders>
|
||||||
<Layout.Content>
|
<Layout.Content>
|
||||||
<Layout.Header.Outer>
|
<Layout.Header.Outer>
|
||||||
<Layout.Header.BackButton />
|
<Layout.Header.BackButton />
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ export function AccountSettingsScreen({}: Props) {
|
|||||||
const deactivateAccountControl = useDialogControl()
|
const deactivateAccountControl = useDialogControl()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Layout.Screen>
|
<Layout.Screen temp__enableWebBorders>
|
||||||
<Layout.Content>
|
<Layout.Content>
|
||||||
<Layout.Header.Outer>
|
<Layout.Header.Outer>
|
||||||
<Layout.Header.BackButton />
|
<Layout.Header.BackButton />
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ export function AppIconSettingsScreen({}: Props) {
|
|||||||
const sets = useAppIconSets()
|
const sets = useAppIconSets()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Layout.Screen>
|
<Layout.Screen temp__enableWebBorders>
|
||||||
<Layout.Content
|
<Layout.Content
|
||||||
contentContainerStyle={[a.py_2xl, a.px_xl, {paddingBottom: 100}]}>
|
contentContainerStyle={[a.py_2xl, a.px_xl, {paddingBottom: 100}]}>
|
||||||
<Layout.Header.Outer>
|
<Layout.Header.Outer>
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ export function AppPasswordsScreen({}: Props) {
|
|||||||
const createAppPasswordControl = useDialogControl()
|
const createAppPasswordControl = useDialogControl()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Layout.Screen testID="AppPasswordsScreen">
|
<Layout.Screen testID="AppPasswordsScreen" temp__enableWebBorders>
|
||||||
<Layout.Content>
|
<Layout.Content>
|
||||||
<Layout.Header.Outer>
|
<Layout.Header.Outer>
|
||||||
<Layout.Header.BackButton />
|
<Layout.Header.BackButton />
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ export function AppearanceSettingsScreen({}: Props) {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<LayoutAnimationConfig skipExiting skipEntering>
|
<LayoutAnimationConfig skipExiting skipEntering>
|
||||||
<Layout.Screen testID="preferencesThreadsScreen">
|
<Layout.Screen testID="preferencesThreadsScreen" temp__enableWebBorders>
|
||||||
<Layout.Content>
|
<Layout.Content>
|
||||||
<Layout.Header.Outer>
|
<Layout.Header.Outer>
|
||||||
<Layout.Header.BackButton />
|
<Layout.Header.BackButton />
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ export function ContentAndMediaSettingsScreen({}: Props) {
|
|||||||
const setUseInAppBrowser = useSetInAppBrowser()
|
const setUseInAppBrowser = useSetInAppBrowser()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Layout.Screen>
|
<Layout.Screen temp__enableWebBorders>
|
||||||
<Layout.Content>
|
<Layout.Content>
|
||||||
<Layout.Header.Outer>
|
<Layout.Header.Outer>
|
||||||
<Layout.Header.BackButton />
|
<Layout.Header.BackButton />
|
||||||
|
|||||||
@@ -23,7 +23,9 @@ type Props = NativeStackScreenProps<
|
|||||||
>
|
>
|
||||||
export function ExternalMediaPreferencesScreen({}: Props) {
|
export function ExternalMediaPreferencesScreen({}: Props) {
|
||||||
return (
|
return (
|
||||||
<Layout.Screen testID="externalMediaPreferencesScreen">
|
<Layout.Screen
|
||||||
|
testID="externalMediaPreferencesScreen"
|
||||||
|
temp__enableWebBorders>
|
||||||
<Layout.Content>
|
<Layout.Content>
|
||||||
<Layout.Header.Outer>
|
<Layout.Header.Outer>
|
||||||
<Layout.Header.BackButton />
|
<Layout.Header.BackButton />
|
||||||
|
|||||||
@@ -45,7 +45,9 @@ export function FollowingFeedPreferencesScreen({}: Props) {
|
|||||||
)
|
)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Layout.Screen testID="followingFeedPreferencesScreen">
|
<Layout.Screen
|
||||||
|
testID="followingFeedPreferencesScreen"
|
||||||
|
temp__enableWebBorders>
|
||||||
<Layout.Content>
|
<Layout.Content>
|
||||||
<Layout.Header.Outer>
|
<Layout.Header.Outer>
|
||||||
<Layout.Header.BackButton />
|
<Layout.Header.BackButton />
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ export function LanguageSettingsScreen({}: Props) {
|
|||||||
}, [langPrefs.contentLanguages])
|
}, [langPrefs.contentLanguages])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Layout.Screen testID="PreferencesLanguagesScreen">
|
<Layout.Screen testID="PreferencesLanguagesScreen" temp__enableWebBorders>
|
||||||
<Layout.Content>
|
<Layout.Content>
|
||||||
<Layout.Header.Outer>
|
<Layout.Header.Outer>
|
||||||
<Layout.Header.BackButton />
|
<Layout.Header.BackButton />
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ export function NotificationSettingsScreen({}: Props) {
|
|||||||
: serverPriority
|
: serverPriority
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Layout.Screen>
|
<Layout.Screen temp__enableWebBorders>
|
||||||
<Layout.Content>
|
<Layout.Content>
|
||||||
<Layout.Header.Outer>
|
<Layout.Header.Outer>
|
||||||
<Layout.Header.BackButton />
|
<Layout.Header.BackButton />
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ export function PrivacyAndSecuritySettingsScreen({}: Props) {
|
|||||||
const {currentAccount} = useSession()
|
const {currentAccount} = useSession()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Layout.Screen>
|
<Layout.Screen temp__enableWebBorders>
|
||||||
<Layout.Content>
|
<Layout.Content>
|
||||||
<Layout.Header.Outer>
|
<Layout.Header.Outer>
|
||||||
<Layout.Header.BackButton />
|
<Layout.Header.BackButton />
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ export function SettingsScreen({}: Props) {
|
|||||||
const [showDevOptions, setShowDevOptions] = useState(false)
|
const [showDevOptions, setShowDevOptions] = useState(false)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Layout.Screen>
|
<Layout.Screen temp__enableWebBorders>
|
||||||
<Layout.Content>
|
<Layout.Content>
|
||||||
<Layout.Header.Outer>
|
<Layout.Header.Outer>
|
||||||
<Layout.Header.BackButton />
|
<Layout.Header.BackButton />
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ export function ThreadPreferencesScreen({}: Props) {
|
|||||||
)
|
)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Layout.Screen testID="threadPreferencesScreen">
|
<Layout.Screen testID="threadPreferencesScreen" temp__enableWebBorders>
|
||||||
<Layout.Content>
|
<Layout.Content>
|
||||||
<Layout.Header.Outer>
|
<Layout.Header.Outer>
|
||||||
<Layout.Header.BackButton />
|
<Layout.Header.BackButton />
|
||||||
|
|||||||
Reference in New Issue
Block a user