mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-05-17 03:52:42 +00:00
Code Issues Packages Projects Releases 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

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

@ -83,33 +83,33 @@ public struct StatusRowView: View {
viewModel.navigateToAccountDetail(account: viewModel.finalStatus.account) viewModel.navigateToAccountDetail(account: viewModel.finalStatus.account)
} }
} }
if !isCompact { VStack(alignment: .leading, spacing: .statusComponentSpacing) {
StatusRowHeaderView(viewModel: viewModel) if !isCompact {
} StatusRowHeaderView(viewModel: viewModel)
}
VStack(alignment: .leading, spacing: .statusComponentSpacing) {
StatusRowContentView(viewModel: viewModel)
.contentShape(Rectangle())
.onTapGesture {
guard !isFocused else { return }
viewModel.navigateToDetail()
} }
.accessibilityActions { StatusRowContentView(viewModel: viewModel)
if isFocused, viewModel.showActions { .contentShape(Rectangle())
accessibilityActions .onTapGesture {
guard !isFocused else { return }
viewModel.navigateToDetail()
} }
.accessibilityActions {
if isFocused, viewModel.showActions {
accessibilityActions
}
}
if !reasons.contains(.placeholder),
viewModel.showActions, isFocused || theme.statusActionsDisplay != .none,
!isInCaptureMode
{
StatusRowActionsView(isBlockConfirmationPresented: $isBlockConfirmationPresented,
viewModel: viewModel)
.tint(isFocused ? theme.tintColor : .gray)
} }
if !reasons.contains(.placeholder),
viewModel.showActions, isFocused || theme.statusActionsDisplay != .none,
!isInCaptureMode
{
StatusRowActionsView(isBlockConfirmationPresented: $isBlockConfirmationPresented,
viewModel: viewModel)
.tint(isFocused ? theme.tintColor : .gray)
}
if isFocused, !isCompact { if isFocused, !isCompact {
StatusRowDetailView(viewModel: viewModel) StatusRowDetailView(viewModel: viewModel)
}
} }
} }
} }

4
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,11 +66,10 @@ public struct StatusRowMediaPreviewView: View {
} }
} }
.padding(.bottom, scrollBottomPadding) .padding(.bottom, scrollBottomPadding)
.padding(.horizontal, .layoutPadding)
} }
.scrollClipDisabled()
} }
} }
.padding(.horizontal, -1 * .layoutPadding)
} }
@ViewBuilder @ViewBuilder