mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-11-29 03:31:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Fix StatusRowContentView invade SwipeActions area (#2007)"

Browse source 
This reverts commit 3782300b27.
This commit is contained in:
Thomas Ricouard 2024-04-19 06:46:56 -07:00
parent e71c55b488
commit 899b92e390
2 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Packages/StatusKit/Sources/StatusKit/Row/StatusRowView.swift
View file

@ -83,11 +83,10 @@ 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 {
@ -114,6 +113,7 @@ 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 {

6
Packages/StatusKit/Sources/StatusKit/Row/Subviews/StatusRowMediaPreviewView.swift
View file

@ -54,7 +54,6 @@ 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])
@ -67,12 +66,11 @@ 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 {