From cd5198ce4967de1b961eb111455ac5f6805f8dfc Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Tue, 30 Sep 2025 11:04:11 +0200 Subject: [PATCH] fix meda timeline screen flipped scroll view blur being applied always --- .../View/MediaEventsTimelineScreen.swift | 36 ++++++++++++------- ...aEventsTimelineScreen.Files-iPad-en-GB.png | 4 +-- ...EventsTimelineScreen.Files-iPad-pseudo.png | 4 +-- ...tsTimelineScreen.Files-iPhone-16-en-GB.png | 4 +-- ...sTimelineScreen.Files-iPhone-16-pseudo.png | 4 +-- ...tsTimelineScreen.Media-iPhone-16-en-GB.png | 4 +-- ...sTimelineScreen.Media-iPhone-16-pseudo.png | 4 +-- 7 files changed, 36 insertions(+), 24 deletions(-) diff --git a/ElementX/Sources/Screens/MediaEventsTimelineScreen/View/MediaEventsTimelineScreen.swift b/ElementX/Sources/Screens/MediaEventsTimelineScreen/View/MediaEventsTimelineScreen.swift index 11831dbe6..04ebd0b46 100644 --- a/ElementX/Sources/Screens/MediaEventsTimelineScreen/View/MediaEventsTimelineScreen.swift +++ b/ElementX/Sources/Screens/MediaEventsTimelineScreen/View/MediaEventsTimelineScreen.swift @@ -47,22 +47,34 @@ struct MediaEventsTimelineScreen: View { if context.viewState.shouldShowEmptyState { emptyState } else { - ScrollView { - Group { - switch context.viewState.bindings.screenMode { - case .media: - mediaContent - case .files: - filesContent - } - - header - } + if #available(iOS 26, *) { + scrollView + // Remove the glass effect of iOS 26+ + // A flipped table view will always trigger it + // since the nav bar thinks is always at the bottom. + .scrollEdgeEffectHidden() + } else { + scrollView } - .scaleEffect(.init(width: 1, height: -1)) } } + private var scrollView: some View { + ScrollView { + Group { + switch context.viewState.bindings.screenMode { + case .media: + mediaContent + case .files: + filesContent + } + + header + } + } + .scaleEffect(.init(width: 1, height: -1)) + } + @ViewBuilder private var mediaContent: some View { let columns = [GridItem(.adaptive(minimum: 80, maximum: 150), spacing: 1)] diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPad-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPad-en-GB.png index 16df55070..acc36e117 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPad-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPad-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ddf502478c371f79bbd567ed2d431b4fd076ada1185a521ef8fcd24f62546495 -size 65917 +oid sha256:d8c4495841c21003736a27ccaaa2db9063fb7e539a528de258940e41ede63b32 +size 145119 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPad-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPad-pseudo.png index 626fb8d1f..87983528f 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPad-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPad-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a87b7650671cf502238ba03b9685f12fccb945bb8065125047ccc0ecd74c3e30 -size 67058 +oid sha256:ea63581e157dc93a9461cf3b4172493d14ea0097c763825fdeb89dc98ace7c4d +size 147083 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPhone-16-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPhone-16-en-GB.png index a3f7d61db..360fe5213 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPhone-16-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPhone-16-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b73526d79f5ad054c45f5ef5dd80153de1898885e1a7356feb825f9b910faa4 -size 21577 +oid sha256:cf5a10b363a7e9b2a60734ba4fb1cf05d1e109b24ca8904b83950a980318ef9f +size 86785 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPhone-16-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPhone-16-pseudo.png index a3f7d61db..bab64e72a 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPhone-16-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Files-iPhone-16-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b73526d79f5ad054c45f5ef5dd80153de1898885e1a7356feb825f9b910faa4 -size 21577 +oid sha256:e403c0b0fbfe482f21792b9ee19a970ada917a027e8d28029eb7ebfda1e9cb0b +size 87709 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPhone-16-en-GB.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPhone-16-en-GB.png index a3f7d61db..4db08ed04 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPhone-16-en-GB.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPhone-16-en-GB.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b73526d79f5ad054c45f5ef5dd80153de1898885e1a7356feb825f9b910faa4 -size 21577 +oid sha256:04726d007194bed3efe35e12af0bf74dde9034e6b0a472df1f3f58850fe20a94 +size 810567 diff --git a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPhone-16-pseudo.png b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPhone-16-pseudo.png index a3f7d61db..02a3d3ab7 100644 --- a/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPhone-16-pseudo.png +++ b/PreviewTests/Sources/__Snapshots__/PreviewTests/mediaEventsTimelineScreen.Media-iPhone-16-pseudo.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b73526d79f5ad054c45f5ef5dd80153de1898885e1a7356feb825f9b910faa4 -size 21577 +oid sha256:1915a9043dc893e3b9ebb3061b7f12a67bf5886e7c97ed60c89cf44ce3afa924 +size 815253