This commit is contained in:
Thomas Ricouard 2023-11-20 17:20:09 +01:00
parent 94172cef27
commit 47d54fd9e6
2 changed files with 13 additions and 12 deletions

View file

@ -73,10 +73,9 @@ public struct AppAccountsSelectorView: View {
Group { Group {
if let account = currentAccount.account, !currentAccount.isLoadingAccount { if let account = currentAccount.account, !currentAccount.isLoadingAccount {
AvatarView(account: account, config: avatarConfig) AvatarView(account: account, config: avatarConfig)
.padding(.leading, 16)
} else { } else {
AvatarView(account: nil, config: avatarConfig) ProgressView()
.redacted(reason: .placeholder)
.allowsHitTesting(false)
} }
}.overlay(alignment: .topTrailing) { }.overlay(alignment: .topTrailing) {
if !currentAccount.followRequests.isEmpty || showNotificationBadge, accountCreationEnabled { if !currentAccount.followRequests.isEmpty || showNotificationBadge, accountCreationEnabled {

View file

@ -32,16 +32,18 @@ public struct StatusRowView: View {
public var body: some View { public var body: some View {
HStack(spacing: 0) { HStack(spacing: 0) {
HStack(spacing: 3) { if !isCompact {
ForEach(0..<indentationLevel, id: \.self) {_ in HStack(spacing: 3) {
Rectangle() ForEach(0..<indentationLevel, id: \.self) {_ in
.fill(theme.tintColor) Rectangle()
.frame(width: 2) .fill(theme.tintColor)
.accessibilityHidden(true) .frame(width: 2)
.accessibilityHidden(true)
}
}
if indentationLevel > 0 {
Spacer(minLength: 8)
} }
}
if indentationLevel > 0 {
Spacer(minLength: 8)
} }
VStack(alignment: .leading) { VStack(alignment: .leading) {
if viewModel.isFiltered, let filter = viewModel.filter { if viewModel.isFiltered, let filter = viewModel.filter {