mirror of
https://github.com/Dimillian/IceCubesApp.git
synced 2024-06-15 03:30:35 +00:00
Fix StatusRowContentView invade SwipeActions area (#2007)
* Fix StatusRowContentView invade SwipeActions area * ./ add padding inside StatusRowMediaPreviewView
This commit is contained in:
parent
7d47834903
commit
3782300b27
|
@ -83,10 +83,11 @@ public struct StatusRowView: View {
|
||||||
viewModel.navigateToAccountDetail(account: viewModel.finalStatus.account)
|
viewModel.navigateToAccountDetail(account: viewModel.finalStatus.account)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
VStack(alignment: .leading, spacing: .statusComponentSpacing) {
|
|
||||||
if !isCompact {
|
if !isCompact {
|
||||||
StatusRowHeaderView(viewModel: viewModel)
|
StatusRowHeaderView(viewModel: viewModel)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
VStack(alignment: .leading, spacing: .statusComponentSpacing) {
|
||||||
StatusRowContentView(viewModel: viewModel)
|
StatusRowContentView(viewModel: viewModel)
|
||||||
.contentShape(Rectangle())
|
.contentShape(Rectangle())
|
||||||
.onTapGesture {
|
.onTapGesture {
|
||||||
|
@ -113,7 +114,6 @@ public struct StatusRowView: View {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
.padding(.init(top: isCompact ? 6 : 12, leading: 0, bottom: isFocused ? 12 : 6, trailing: 0))
|
.padding(.init(top: isCompact ? 6 : 12, leading: 0, bottom: isFocused ? 12 : 6, trailing: 0))
|
||||||
}
|
}
|
||||||
.onAppear {
|
.onAppear {
|
||||||
|
|
|
@ -54,6 +54,7 @@ public struct StatusRowMediaPreviewView: View {
|
||||||
: CGSize(width: imageMaxHeight, height: imageMaxHeight),
|
: CGSize(width: imageMaxHeight, height: imageMaxHeight),
|
||||||
sensitive: sensitive
|
sensitive: sensitive
|
||||||
)
|
)
|
||||||
|
.padding(.horizontal, .layoutPadding)
|
||||||
.accessibilityElement(children: .ignore)
|
.accessibilityElement(children: .ignore)
|
||||||
.accessibilityLabel(Self.accessibilityLabel(for: attachments[0]))
|
.accessibilityLabel(Self.accessibilityLabel(for: attachments[0]))
|
||||||
.accessibilityAddTraits([.isButton, .isImage])
|
.accessibilityAddTraits([.isButton, .isImage])
|
||||||
|
@ -66,11 +67,12 @@ public struct StatusRowMediaPreviewView: View {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.padding(.bottom, scrollBottomPadding)
|
.padding(.bottom, scrollBottomPadding)
|
||||||
}
|
.padding(.horizontal, .layoutPadding)
|
||||||
.scrollClipDisabled()
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.padding(.horizontal, -1 * .layoutPadding)
|
||||||
|
}
|
||||||
|
|
||||||
@ViewBuilder
|
@ViewBuilder
|
||||||
private func makeAttachmentView(_ attachement: MediaAttachment) -> some View {
|
private func makeAttachmentView(_ attachement: MediaAttachment) -> some View {
|
||||||
|
|
Loading…
Reference in a new issue