mirror of
https://github.com/Dimillian/IceCubesApp.git
synced 2024-12-16 12:16:42 +00:00
New media carrousel
This commit is contained in:
parent
51656794fc
commit
052afd5931
1 changed files with 4 additions and 18 deletions
|
@ -54,10 +54,7 @@ public struct StatusRowMediaPreviewView: View {
|
||||||
}
|
}
|
||||||
return 100
|
return 100
|
||||||
}
|
}
|
||||||
if attachments.count == 1 {
|
return 300
|
||||||
return 300
|
|
||||||
}
|
|
||||||
return attachments.count > 2 ? 150 : 200
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public var body: some View {
|
public var body: some View {
|
||||||
|
@ -76,25 +73,15 @@ public struct StatusRowMediaPreviewView: View {
|
||||||
.accessibilityAddTraits([.isButton, .isImage])
|
.accessibilityAddTraits([.isButton, .isImage])
|
||||||
.onTapGesture { tabAction(for: 0) }
|
.onTapGesture { tabAction(for: 0) }
|
||||||
} else {
|
} else {
|
||||||
if isCompact || theme.statusDisplayStyle == .compact {
|
ScrollView(.horizontal, showsIndicators: false) {
|
||||||
HStack {
|
HStack {
|
||||||
makeAttachmentView(for: 0)
|
makeAttachmentView(for: 0)
|
||||||
makeAttachmentView(for: 1)
|
makeAttachmentView(for: 1)
|
||||||
makeAttachmentView(for: 2)
|
makeAttachmentView(for: 2)
|
||||||
makeAttachmentView(for: 3)
|
makeAttachmentView(for: 3)
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
VStack {
|
|
||||||
HStack {
|
|
||||||
makeAttachmentView(for: 0)
|
|
||||||
makeAttachmentView(for: 1)
|
|
||||||
}
|
|
||||||
HStack {
|
|
||||||
makeAttachmentView(for: 2)
|
|
||||||
makeAttachmentView(for: 3)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
.scrollClipDisabled()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -183,8 +170,7 @@ private struct MediaPreview: View {
|
||||||
.accessibilityAddTraits(.startsMediaSession)
|
.accessibilityAddTraits(.startsMediaSession)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.frame(maxWidth: isCompact ? imageMaxHeight : nil)
|
.frame(width: imageMaxHeight / 1.5, height: imageMaxHeight)
|
||||||
.frame(height: imageMaxHeight)
|
|
||||||
.clipped()
|
.clipped()
|
||||||
.cornerRadius(4)
|
.cornerRadius(4)
|
||||||
// #965: do not create overlapping tappable areas, when multiple images are shown
|
// #965: do not create overlapping tappable areas, when multiple images are shown
|
||||||
|
|
Loading…
Reference in a new issue