Merge branch 'mauroromito/drop_ios_16' of https://github.com/vector-i…

…m/element-x-ios into mauroromito/drop_ios_16
element-hq · Oct 24, 2024 · 4ca6893 · 4ca6893
2 parents a1b09eb + c903631
commit 4ca6893
Show file tree

Hide file tree

Showing 28 changed files with 59 additions and 59 deletions.
diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
@@ -7940,7 +7940,7 @@
 			repositoryURL = "https://github.com/element-hq/compound-ios";
 			requirement = {
 				kind = revision;
-				revision = 4535fa11bba2efec8463a79deb5722b6b487d845;
+				revision = e3f9665621872f60d3652579c3f0dc7bf806e72c;
 			};
 		};
 		F76A08D0EA29A07A54F4EB4D /* XCRemoteSwiftPackageReference "swift-collections" */ = {

diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -15,7 +15,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/element-hq/compound-ios",
       "state" : {
-        "revision" : "4535fa11bba2efec8463a79deb5722b6b487d845"
+        "revision" : "e3f9665621872f60d3652579c3f0dc7bf806e72c"
       }
     },
     {

diff --git a/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift b/ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift
@@ -28,6 +28,14 @@ struct RoomScreen: View {
     var body: some View {
         timeline
             .background(Color.compound.bgCanvasDefault.ignoresSafeArea())
+            .overlay(alignment: .top) {
+                Group {
+                    if roomContext.viewState.shouldShowPinnedEventsBanner {
+                        pinnedItemsBanner
+                    }
+                }
+                .animation(.elementDefault, value: roomContext.viewState.shouldShowPinnedEventsBanner)
+            }
             .safeAreaInset(edge: .bottom, spacing: 0) {
                 VStack(spacing: 0) {
                     RoomScreenFooterView(details: roomContext.viewState.footerDetails,
@@ -52,14 +60,6 @@ struct RoomScreen: View {
                         .environment(\.shouldAutomaticallyLoadImages, !timelineContext.viewState.hideTimelineMedia)
                 }
             }
-            .overlay(alignment: .top) {
-                Group {
-                    if roomContext.viewState.shouldShowPinnedEventsBanner {
-                        pinnedItemsBanner
-                    }
-                }
-                .animation(.elementDefault, value: roomContext.viewState.shouldShowPinnedEventsBanner)
-            }
             .navigationTitle(L10n.screenRoomTitle) // Hidden but used for back button text.
             .navigationBarTitleDisplayMode(.inline)
             .navigationBarHidden(isNavigationBarHidden)

diff --git a/...es/__Snapshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Public-Room.png b/...es/__Snapshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Public-Room.png
diff --git a/...apshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Room-without-users.png b/...apshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Room-without-users.png
diff --git a/...s/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Room.png b/...s/Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-en-GB.Create-Room.png
diff --git a/...s/__Snapshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Public-Room.png b/...s/__Snapshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Public-Room.png
diff --git a/...pshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Room-without-users.png b/...pshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Room-without-users.png
diff --git a/.../Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Room.png b/.../Sources/__Snapshots__/PreviewTests/test_createRoom-iPad-pseudo.Create-Room.png
diff --git a/...Snapshots__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Public-Room.png b/...Snapshots__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Public-Room.png
diff --git a/...ts__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Room-without-users.png b/...ts__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Room-without-users.png
diff --git a/...rces/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Room.png b/...rces/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-en-GB.Create-Room.png
diff --git a/...napshots__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Public-Room.png b/...napshots__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Public-Room.png
diff --git a/...s__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Room-without-users.png b/...s__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Room-without-users.png
diff --git a/...ces/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Room.png b/...ces/__Snapshots__/PreviewTests/test_createRoom-iPhone-16-pseudo.Create-Room.png
diff --git a/.../PreviewTests/test_roomChangePermissionsScreen-iPad-en-GB.Member-moderation.png b/.../PreviewTests/test_roomChangePermissionsScreen-iPad-en-GB.Member-moderation.png
diff --git a/...eviewTests/test_roomChangePermissionsScreen-iPad-en-GB.Messages-and-Content.png b/...eviewTests/test_roomChangePermissionsScreen-iPad-en-GB.Messages-and-Content.png
diff --git a/...ots__/PreviewTests/test_roomChangePermissionsScreen-iPad-en-GB.Room-details.png b/...ots__/PreviewTests/test_roomChangePermissionsScreen-iPad-en-GB.Room-details.png
diff --git a/...PreviewTests/test_roomChangePermissionsScreen-iPad-pseudo.Member-moderation.png b/...PreviewTests/test_roomChangePermissionsScreen-iPad-pseudo.Member-moderation.png
diff --git a/...viewTests/test_roomChangePermissionsScreen-iPad-pseudo.Messages-and-Content.png b/...viewTests/test_roomChangePermissionsScreen-iPad-pseudo.Messages-and-Content.png
diff --git a/...ts__/PreviewTests/test_roomChangePermissionsScreen-iPad-pseudo.Room-details.png b/...ts__/PreviewTests/test_roomChangePermissionsScreen-iPad-pseudo.Room-details.png
diff --git a/...iewTests/test_roomChangePermissionsScreen-iPhone-16-en-GB.Member-moderation.png b/...iewTests/test_roomChangePermissionsScreen-iPhone-16-en-GB.Member-moderation.png
diff --git a/...Tests/test_roomChangePermissionsScreen-iPhone-16-en-GB.Messages-and-Content.png b/...Tests/test_roomChangePermissionsScreen-iPhone-16-en-GB.Messages-and-Content.png
diff --git a/.../PreviewTests/test_roomChangePermissionsScreen-iPhone-16-en-GB.Room-details.png b/.../PreviewTests/test_roomChangePermissionsScreen-iPhone-16-en-GB.Room-details.png
diff --git a/...ewTests/test_roomChangePermissionsScreen-iPhone-16-pseudo.Member-moderation.png b/...ewTests/test_roomChangePermissionsScreen-iPhone-16-pseudo.Member-moderation.png
diff --git a/...ests/test_roomChangePermissionsScreen-iPhone-16-pseudo.Messages-and-Content.png b/...ests/test_roomChangePermissionsScreen-iPhone-16-pseudo.Messages-and-Content.png
diff --git a/...PreviewTests/test_roomChangePermissionsScreen-iPhone-16-pseudo.Room-details.png b/...PreviewTests/test_roomChangePermissionsScreen-iPhone-16-pseudo.Room-details.png
diff --git a/project.yml b/project.yml
@@ -63,7 +63,7 @@ packages:
     # path: ../matrix-rust-sdk
   Compound:
     url: https://github.com/element-hq/compound-ios
-    revision: 4535fa11bba2efec8463a79deb5722b6b487d845
+    revision: e3f9665621872f60d3652579c3f0dc7bf806e72c
     # path: ../compound-ios
   AnalyticsEvents:
     url: https://github.com/matrix-org/matrix-analytics-events