From 08a5f7a0bd2934f91b0e7c04df215f9e3ca92f37 Mon Sep 17 00:00:00 2001
From: Barry Pollard <barrypollard@google.com>
Date: Mon, 23 Dec 2024 17:41:00 +0000
Subject: [PATCH 1/3] Correct font preload (#7249)

---
 bskyweb/templates/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bskyweb/templates/base.html b/bskyweb/templates/base.html
index 1ddd291718..43ab379d57 100644
--- a/bskyweb/templates/base.html
+++ b/bskyweb/templates/base.html
@@ -13,7 +13,7 @@
 
   <!-- Hello Humans! API docs at https://atproto.com -->
 
-  <link rel="preload" as="font" type="font/ttf" href="{{ staticCDNHost }}/static/media/InterVariable.c504db5c06caaf7cdfba.woff2">
+  <link rel="preload" as="font" type="font/woff2" href="{{ staticCDNHost }}/static/media/InterVariable.c504db5c06caaf7cdfba.woff2" crossorigin>
 
   <style>
     /**

From 1e4ea1a2717dc88484820cb4f4ad0e21eb79bc5f Mon Sep 17 00:00:00 2001
From: Ahmed Soliman <ahmed.h.soliman@outlook.com>
Date: Mon, 23 Dec 2024 12:42:10 -0500
Subject: [PATCH 2/3] checking list/feed owner on empty state when prompting to
 add users (#7247)

---
 src/view/screens/ProfileList.tsx | 58 ++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/src/view/screens/ProfileList.tsx b/src/view/screens/ProfileList.tsx
index 788f41c559..4558a907b0 100644
--- a/src/view/screens/ProfileList.tsx
+++ b/src/view/screens/ProfileList.tsx
@@ -222,6 +222,7 @@ function ProfileListScreenLoaded({
                   scrollElRef={scrollElRef as ListRef}
                   headerHeight={headerHeight}
                   isFocused={isScreenFocused && isFocused}
+                  isOwner={isOwner}
                   onPressAddUser={onPressAddUser}
                 />
               )}
@@ -774,11 +775,12 @@ interface FeedSectionProps {
   headerHeight: number
   scrollElRef: ListRef
   isFocused: boolean
+  isOwner: boolean
   onPressAddUser: () => void
 }
 const FeedSection = React.forwardRef<SectionRef, FeedSectionProps>(
   function FeedSectionImpl(
-    {feed, scrollElRef, headerHeight, isFocused, onPressAddUser},
+    {feed, scrollElRef, headerHeight, isFocused, isOwner, onPressAddUser},
     ref,
   ) {
     const queryClient = useQueryClient()
@@ -810,20 +812,22 @@ const FeedSection = React.forwardRef<SectionRef, FeedSectionProps>(
       return (
         <View style={[a.gap_xl, a.align_center]}>
           <EmptyState icon="hashtag" message={_(msg`This feed is empty.`)} />
-          <NewButton
-            label={_(msg`Start adding people`)}
-            onPress={onPressAddUser}
-            color="primary"
-            size="small"
-            variant="solid">
-            <ButtonIcon icon={PersonPlusIcon} />
-            <ButtonText>
-              <Trans>Start adding people!</Trans>
-            </ButtonText>
-          </NewButton>
+          {isOwner && (
+            <NewButton
+              label={_(msg`Start adding people`)}
+              onPress={onPressAddUser}
+              color="primary"
+              size="small"
+              variant="solid">
+              <ButtonIcon icon={PersonPlusIcon} />
+              <ButtonText>
+                <Trans>Start adding people!</Trans>
+              </ButtonText>
+            </NewButton>
+          )}
         </View>
       )
-    }, [_, onPressAddUser])
+    }, [_, onPressAddUser, isOwner])
 
     return (
       <View>
@@ -928,21 +932,23 @@ const AboutSection = React.forwardRef<SectionRef, AboutSectionProps>(
             icon="users-slash"
             message={_(msg`This list is empty.`)}
           />
-          <NewButton
-            testID="emptyStateAddUserBtn"
-            label={_(msg`Start adding people`)}
-            onPress={onPressAddUser}
-            color="primary"
-            size="small"
-            variant="solid">
-            <ButtonIcon icon={PersonPlusIcon} />
-            <ButtonText>
-              <Trans>Start adding people!</Trans>
-            </ButtonText>
-          </NewButton>
+          {isOwner && (
+            <NewButton
+              testID="emptyStateAddUserBtn"
+              label={_(msg`Start adding people`)}
+              onPress={onPressAddUser}
+              color="primary"
+              size="small"
+              variant="solid">
+              <ButtonIcon icon={PersonPlusIcon} />
+              <ButtonText>
+                <Trans>Start adding people!</Trans>
+              </ButtonText>
+            </NewButton>
+          )}
         </View>
       )
-    }, [_, onPressAddUser])
+    }, [_, onPressAddUser, isOwner])
 
     return (
       <View>

From 2b28c85b43c81ab89a3e7df0c46baa9130c6f2d1 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Mon, 23 Dec 2024 18:17:09 +0000
Subject: [PATCH 3/3] Cropper - opt out of edge-to-edge enforcement on Android
 15 (#7254)

* opt out of edge-to-edge enforcement

* revert unintended change
---
 ...eact-native-image-crop-picker+0.41.6.patch | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/patches/react-native-image-crop-picker+0.41.6.patch b/patches/react-native-image-crop-picker+0.41.6.patch
index 7017ac80ea..57589931a3 100644
--- a/patches/react-native-image-crop-picker+0.41.6.patch
+++ b/patches/react-native-image-crop-picker+0.41.6.patch
@@ -1,3 +1,36 @@
+diff --git a/node_modules/react-native-image-crop-picker/android/src/main/AndroidManifest.xml b/node_modules/react-native-image-crop-picker/android/src/main/AndroidManifest.xml
+index 391f303..8e2c3db 100644
+--- a/node_modules/react-native-image-crop-picker/android/src/main/AndroidManifest.xml
++++ b/node_modules/react-native-image-crop-picker/android/src/main/AndroidManifest.xml
+@@ -24,7 +24,7 @@
+ 
+         <activity
+             android:name="com.yalantis.ucrop.UCropActivity"
+-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
++            android:theme="@style/Theme.UCropNoEdgeToEdge" />
+     </application>
+ 
+ </manifest>
+diff --git a/node_modules/react-native-image-crop-picker/android/src/main/res/values-v35/styles.xml b/node_modules/react-native-image-crop-picker/android/src/main/res/values-v35/styles.xml
+new file mode 100644
+index 0000000..396d5a8
+--- /dev/null
++++ b/node_modules/react-native-image-crop-picker/android/src/main/res/values-v35/styles.xml
+@@ -0,0 +1,5 @@
++<resources>
++    <style name="Theme.UCropNoEdgeToEdge" parent="Theme.AppCompat.Light.NoActionBar">
++        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
++    </style>
++</resources>
+diff --git a/node_modules/react-native-image-crop-picker/android/src/main/res/values/styles.xml b/node_modules/react-native-image-crop-picker/android/src/main/res/values/styles.xml
+new file mode 100644
+index 0000000..50129b6
+--- /dev/null
++++ b/node_modules/react-native-image-crop-picker/android/src/main/res/values/styles.xml
+@@ -0,0 +1,3 @@
++<resources>
++    <style name="Theme.UCropNoEdgeToEdge" parent="Theme.AppCompat.Light.NoActionBar"/>
++</resources>
 diff --git a/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m b/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m
 index 9f20973..68d4766 100644
 --- a/node_modules/react-native-image-crop-picker/ios/src/ImageCropPicker.m