Mastodon/IceCubes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix leading avatar incorrect position close #249

Browse Source
This commit is contained in:
Thomas Ricouard 2023-01-24 19:07:55 +01:00
parent a0ef5048fa
commit d9cf9ea59a
1 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Packages/Status/Sources/Status/Row/StatusRowView.swift
View File

@ -28,31 +28,37 @@ public struct StatusRowView: View {
EmptyView() EmptyView()
} }
} else { } else {
HStack(alignment: .top, spacing: .statusColumnsSpacing) { VStack(alignment: .leading) {
if !viewModel.isCompact, if !viewModel.isCompact, theme.avatarPosition == .leading {
theme.avatarPosition == .leading, reblogView
let status: AnyStatus = viewModel.status.reblog ?? viewModel.status replyView
{
Button {
routerPath.navigate(to: .accountDetailWithAccount(account: status.account))
} label: {
AvatarView(url: status.account.avatar, size: .status)
}
} }
VStack(alignment: .leading) { HStack(alignment: .top, spacing: .statusColumnsSpacing) {
if !viewModel.isCompact { if !viewModel.isCompact,
reblogView theme.avatarPosition == .leading,
replyView let status: AnyStatus = viewModel.status.reblog ?? viewModel.status
{
Button {
routerPath.navigate(to: .accountDetailWithAccount(account: status.account))
} label: {
AvatarView(url: status.account.avatar, size: .status)
}
} }
statusView VStack(alignment: .leading) {
if viewModel.showActions && !viewModel.isRemote, theme.statusActionsDisplay != .none { if !viewModel.isCompact, theme.avatarPosition == .top {
StatusActionsView(viewModel: viewModel) reblogView
.padding(.top, 8) replyView
.tint(viewModel.isFocused ? theme.tintColor : .gray) }
.contentShape(Rectangle()) statusView
.onTapGesture { if viewModel.showActions && !viewModel.isRemote, theme.statusActionsDisplay != .none {
viewModel.navigateToDetail(routerPath: routerPath) StatusActionsView(viewModel: viewModel)
} .padding(.top, 8)
.tint(viewModel.isFocused ? theme.tintColor : .gray)
.contentShape(Rectangle())
.onTapGesture {
viewModel.navigateToDetail(routerPath: routerPath)
}
}
} }
} }
} }