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