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

Fix StatusRowContentView invade SwipeActions area (#2007)

Browse source 
* Fix StatusRowContentView invade SwipeActions area

* ./ add padding inside StatusRowMediaPreviewView
This commit is contained in:
tkgka 2024-04-18 02:54:46 +09:00 committed by GitHub
parent 7d47834903
commit 3782300b27
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 26 additions and 24 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,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 {

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

@ -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 {