From 0aa1a0ff917da1b6ca588371a16f8f630b679006 Mon Sep 17 00:00:00 2001
From: Eric Bailey <git@esb.lol>
Date: Mon, 2 Dec 2024 17:15:57 -0600
Subject: [PATCH] Invert web border logic for easier migration

---
 src/components/Layout/index.tsx                     | 4 +++-
 src/screens/Settings/AboutSettings.tsx              | 2 +-
 src/screens/Settings/AccessibilitySettings.tsx      | 2 +-
 src/screens/Settings/AccountSettings.tsx            | 2 +-
 src/screens/Settings/AppIconSettings.tsx            | 2 +-
 src/screens/Settings/AppPasswords.tsx               | 2 +-
 src/screens/Settings/AppearanceSettings.tsx         | 2 +-
 src/screens/Settings/ContentAndMediaSettings.tsx    | 2 +-
 src/screens/Settings/ExternalMediaPreferences.tsx   | 4 +++-
 src/screens/Settings/FollowingFeedPreferences.tsx   | 4 +++-
 src/screens/Settings/LanguageSettings.tsx           | 2 +-
 src/screens/Settings/NotificationSettings.tsx       | 2 +-
 src/screens/Settings/PrivacyAndSecuritySettings.tsx | 2 +-
 src/screens/Settings/Settings.tsx                   | 2 +-
 src/screens/Settings/ThreadPreferences.tsx          | 2 +-
 15 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/components/Layout/index.tsx b/src/components/Layout/index.tsx
index 26308a54c0..c28808473b 100644
--- a/src/components/Layout/index.tsx
+++ b/src/components/Layout/index.tsx
@@ -26,6 +26,7 @@ const LayoutContext = React.createContext({
 export type ScreenProps = React.ComponentProps<typeof View> & {
   disableTopPadding?: boolean
   style?: StyleProp<ViewStyle>
+  temp__enableWebBorders?: boolean
 }
 
 /**
@@ -36,6 +37,7 @@ export type ScreenProps = React.ComponentProps<typeof View> & {
 export const Screen = React.memo(function Screen({
   disableTopPadding = false,
   style,
+  temp__enableWebBorders,
   ...props
 }: ScreenProps) {
   const {top} = useSafeAreaInsets()
@@ -49,7 +51,7 @@ export const Screen = React.memo(function Screen({
   )
   return (
     <LayoutContext.Provider value={context}>
-      {isWeb && <WebCenterBorders />}
+      {isWeb && temp__enableWebBorders && <WebCenterBorders />}
       <View
         style={[
           {paddingTop: disableTopPadding ? 0 : top},
diff --git a/src/screens/Settings/AboutSettings.tsx b/src/screens/Settings/AboutSettings.tsx
index 957dd334e0..d24f5756e6 100644
--- a/src/screens/Settings/AboutSettings.tsx
+++ b/src/screens/Settings/AboutSettings.tsx
@@ -20,7 +20,7 @@ export function AboutSettingsScreen({}: Props) {
   const {_} = useLingui()
 
   return (
-    <Layout.Screen>
+    <Layout.Screen temp__enableWebBorders>
       <Layout.Content>
         <Layout.Header.Outer>
           <Layout.Header.BackButton />
diff --git a/src/screens/Settings/AccessibilitySettings.tsx b/src/screens/Settings/AccessibilitySettings.tsx
index 4db372dd8e..ab076a44b5 100644
--- a/src/screens/Settings/AccessibilitySettings.tsx
+++ b/src/screens/Settings/AccessibilitySettings.tsx
@@ -38,7 +38,7 @@ export function AccessibilitySettingsScreen({}: Props) {
   const setLargeAltBadgeEnabled = useSetLargeAltBadgeEnabled()
 
   return (
-    <Layout.Screen>
+    <Layout.Screen temp__enableWebBorders>
       <Layout.Content>
         <Layout.Header.Outer>
           <Layout.Header.BackButton />
diff --git a/src/screens/Settings/AccountSettings.tsx b/src/screens/Settings/AccountSettings.tsx
index 935e701e96..0fffb10388 100644
--- a/src/screens/Settings/AccountSettings.tsx
+++ b/src/screens/Settings/AccountSettings.tsx
@@ -37,7 +37,7 @@ export function AccountSettingsScreen({}: Props) {
   const deactivateAccountControl = useDialogControl()
 
   return (
-    <Layout.Screen>
+    <Layout.Screen temp__enableWebBorders>
       <Layout.Content>
         <Layout.Header.Outer>
           <Layout.Header.BackButton />
diff --git a/src/screens/Settings/AppIconSettings.tsx b/src/screens/Settings/AppIconSettings.tsx
index 392a67bfb2..c108edc8fb 100644
--- a/src/screens/Settings/AppIconSettings.tsx
+++ b/src/screens/Settings/AppIconSettings.tsx
@@ -19,7 +19,7 @@ export function AppIconSettingsScreen({}: Props) {
   const sets = useAppIconSets()
 
   return (
-    <Layout.Screen>
+    <Layout.Screen temp__enableWebBorders>
       <Layout.Content
         contentContainerStyle={[a.py_2xl, a.px_xl, {paddingBottom: 100}]}>
         <Layout.Header.Outer>
diff --git a/src/screens/Settings/AppPasswords.tsx b/src/screens/Settings/AppPasswords.tsx
index 320017111f..2d8b192b39 100644
--- a/src/screens/Settings/AppPasswords.tsx
+++ b/src/screens/Settings/AppPasswords.tsx
@@ -43,7 +43,7 @@ export function AppPasswordsScreen({}: Props) {
   const createAppPasswordControl = useDialogControl()
 
   return (
-    <Layout.Screen testID="AppPasswordsScreen">
+    <Layout.Screen testID="AppPasswordsScreen" temp__enableWebBorders>
       <Layout.Content>
         <Layout.Header.Outer>
           <Layout.Header.BackButton />
diff --git a/src/screens/Settings/AppearanceSettings.tsx b/src/screens/Settings/AppearanceSettings.tsx
index 0b0e14df08..4bbc46f5dc 100644
--- a/src/screens/Settings/AppearanceSettings.tsx
+++ b/src/screens/Settings/AppearanceSettings.tsx
@@ -78,7 +78,7 @@ export function AppearanceSettingsScreen({}: Props) {
 
   return (
     <LayoutAnimationConfig skipExiting skipEntering>
-      <Layout.Screen testID="preferencesThreadsScreen">
+      <Layout.Screen testID="preferencesThreadsScreen" temp__enableWebBorders>
         <Layout.Content>
           <Layout.Header.Outer>
             <Layout.Header.BackButton />
diff --git a/src/screens/Settings/ContentAndMediaSettings.tsx b/src/screens/Settings/ContentAndMediaSettings.tsx
index 1f23b38a22..69abe31650 100644
--- a/src/screens/Settings/ContentAndMediaSettings.tsx
+++ b/src/screens/Settings/ContentAndMediaSettings.tsx
@@ -31,7 +31,7 @@ export function ContentAndMediaSettingsScreen({}: Props) {
   const setUseInAppBrowser = useSetInAppBrowser()
 
   return (
-    <Layout.Screen>
+    <Layout.Screen temp__enableWebBorders>
       <Layout.Content>
         <Layout.Header.Outer>
           <Layout.Header.BackButton />
diff --git a/src/screens/Settings/ExternalMediaPreferences.tsx b/src/screens/Settings/ExternalMediaPreferences.tsx
index 6f87c6e126..882bfbb5cd 100644
--- a/src/screens/Settings/ExternalMediaPreferences.tsx
+++ b/src/screens/Settings/ExternalMediaPreferences.tsx
@@ -23,7 +23,9 @@ type Props = NativeStackScreenProps<
 >
 export function ExternalMediaPreferencesScreen({}: Props) {
   return (
-    <Layout.Screen testID="externalMediaPreferencesScreen">
+    <Layout.Screen
+      testID="externalMediaPreferencesScreen"
+      temp__enableWebBorders>
       <Layout.Content>
         <Layout.Header.Outer>
           <Layout.Header.BackButton />
diff --git a/src/screens/Settings/FollowingFeedPreferences.tsx b/src/screens/Settings/FollowingFeedPreferences.tsx
index 0e79f1fd3d..0681f2f4f0 100644
--- a/src/screens/Settings/FollowingFeedPreferences.tsx
+++ b/src/screens/Settings/FollowingFeedPreferences.tsx
@@ -45,7 +45,9 @@ export function FollowingFeedPreferencesScreen({}: Props) {
   )
 
   return (
-    <Layout.Screen testID="followingFeedPreferencesScreen">
+    <Layout.Screen
+      testID="followingFeedPreferencesScreen"
+      temp__enableWebBorders>
       <Layout.Content>
         <Layout.Header.Outer>
           <Layout.Header.BackButton />
diff --git a/src/screens/Settings/LanguageSettings.tsx b/src/screens/Settings/LanguageSettings.tsx
index 88bde14255..d03ff8b7dd 100644
--- a/src/screens/Settings/LanguageSettings.tsx
+++ b/src/screens/Settings/LanguageSettings.tsx
@@ -63,7 +63,7 @@ export function LanguageSettingsScreen({}: Props) {
   }, [langPrefs.contentLanguages])
 
   return (
-    <Layout.Screen testID="PreferencesLanguagesScreen">
+    <Layout.Screen testID="PreferencesLanguagesScreen" temp__enableWebBorders>
       <Layout.Content>
         <Layout.Header.Outer>
           <Layout.Header.BackButton />
diff --git a/src/screens/Settings/NotificationSettings.tsx b/src/screens/Settings/NotificationSettings.tsx
index 9ca34853c0..c0180b7fd9 100644
--- a/src/screens/Settings/NotificationSettings.tsx
+++ b/src/screens/Settings/NotificationSettings.tsx
@@ -32,7 +32,7 @@ export function NotificationSettingsScreen({}: Props) {
     : serverPriority
 
   return (
-    <Layout.Screen>
+    <Layout.Screen temp__enableWebBorders>
       <Layout.Content>
         <Layout.Header.Outer>
           <Layout.Header.BackButton />
diff --git a/src/screens/Settings/PrivacyAndSecuritySettings.tsx b/src/screens/Settings/PrivacyAndSecuritySettings.tsx
index a110f66e02..b0b54251d8 100644
--- a/src/screens/Settings/PrivacyAndSecuritySettings.tsx
+++ b/src/screens/Settings/PrivacyAndSecuritySettings.tsx
@@ -28,7 +28,7 @@ export function PrivacyAndSecuritySettingsScreen({}: Props) {
   const {currentAccount} = useSession()
 
   return (
-    <Layout.Screen>
+    <Layout.Screen temp__enableWebBorders>
       <Layout.Content>
         <Layout.Header.Outer>
           <Layout.Header.BackButton />
diff --git a/src/screens/Settings/Settings.tsx b/src/screens/Settings/Settings.tsx
index 0054da1a50..9c1cad8e89 100644
--- a/src/screens/Settings/Settings.tsx
+++ b/src/screens/Settings/Settings.tsx
@@ -72,7 +72,7 @@ export function SettingsScreen({}: Props) {
   const [showDevOptions, setShowDevOptions] = useState(false)
 
   return (
-    <Layout.Screen>
+    <Layout.Screen temp__enableWebBorders>
       <Layout.Content>
         <Layout.Header.Outer>
           <Layout.Header.BackButton />
diff --git a/src/screens/Settings/ThreadPreferences.tsx b/src/screens/Settings/ThreadPreferences.tsx
index 409f797d59..de0b270747 100644
--- a/src/screens/Settings/ThreadPreferences.tsx
+++ b/src/screens/Settings/ThreadPreferences.tsx
@@ -37,7 +37,7 @@ export function ThreadPreferencesScreen({}: Props) {
   )
 
   return (
-    <Layout.Screen testID="threadPreferencesScreen">
+    <Layout.Screen testID="threadPreferencesScreen" temp__enableWebBorders>
       <Layout.Content>
         <Layout.Header.Outer>
           <Layout.Header.BackButton />