mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-04 10:12:26 +00:00
fix meda timeline screen flipped scroll view blur being applied always
This commit is contained in:
+24
-12
@@ -47,22 +47,34 @@ struct MediaEventsTimelineScreen: View {
|
|||||||
if context.viewState.shouldShowEmptyState {
|
if context.viewState.shouldShowEmptyState {
|
||||||
emptyState
|
emptyState
|
||||||
} else {
|
} else {
|
||||||
ScrollView {
|
if #available(iOS 26, *) {
|
||||||
Group {
|
scrollView
|
||||||
switch context.viewState.bindings.screenMode {
|
// Remove the glass effect of iOS 26+
|
||||||
case .media:
|
// A flipped table view will always trigger it
|
||||||
mediaContent
|
// since the nav bar thinks is always at the bottom.
|
||||||
case .files:
|
.scrollEdgeEffectHidden()
|
||||||
filesContent
|
} else {
|
||||||
}
|
scrollView
|
||||||
|
|
||||||
header
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
.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
|
@ViewBuilder
|
||||||
private var mediaContent: some View {
|
private var mediaContent: some View {
|
||||||
let columns = [GridItem(.adaptive(minimum: 80, maximum: 150), spacing: 1)]
|
let columns = [GridItem(.adaptive(minimum: 80, maximum: 150), spacing: 1)]
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:ddf502478c371f79bbd567ed2d431b4fd076ada1185a521ef8fcd24f62546495
|
oid sha256:d8c4495841c21003736a27ccaaa2db9063fb7e539a528de258940e41ede63b32
|
||||||
size 65917
|
size 145119
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:a87b7650671cf502238ba03b9685f12fccb945bb8065125047ccc0ecd74c3e30
|
oid sha256:ea63581e157dc93a9461cf3b4172493d14ea0097c763825fdeb89dc98ace7c4d
|
||||||
size 67058
|
size 147083
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:4b73526d79f5ad054c45f5ef5dd80153de1898885e1a7356feb825f9b910faa4
|
oid sha256:cf5a10b363a7e9b2a60734ba4fb1cf05d1e109b24ca8904b83950a980318ef9f
|
||||||
size 21577
|
size 86785
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:4b73526d79f5ad054c45f5ef5dd80153de1898885e1a7356feb825f9b910faa4
|
oid sha256:e403c0b0fbfe482f21792b9ee19a970ada917a027e8d28029eb7ebfda1e9cb0b
|
||||||
size 21577
|
size 87709
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:4b73526d79f5ad054c45f5ef5dd80153de1898885e1a7356feb825f9b910faa4
|
oid sha256:04726d007194bed3efe35e12af0bf74dde9034e6b0a472df1f3f58850fe20a94
|
||||||
size 21577
|
size 810567
|
||||||
|
|||||||
+2
-2
@@ -1,3 +1,3 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
version https://git-lfs.github.com/spec/v1
|
||||||
oid sha256:4b73526d79f5ad054c45f5ef5dd80153de1898885e1a7356feb825f9b910faa4
|
oid sha256:1915a9043dc893e3b9ebb3061b7f12a67bf5886e7c97ed60c89cf44ce3afa924
|
||||||
size 21577
|
size 815253
|
||||||
|
|||||||
Reference in New Issue
Block a user