mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-12-16 04:06:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix reasons check

Browse source
This commit is contained in:
Thomas Ricouard 2023-12-27 17:12:48 +01:00
parent 2b16b10987
commit e53a3d0f61
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Packages/Notifications/Sources/Notifications/NotificationRowView.swift
View file

@ -94,7 +94,7 @@ struct NotificationRowView: View {
.frame(height: AvatarView.FrameConfig.status.size.height + 2) .frame(height: AvatarView.FrameConfig.status.size.height + 2)
}.offset(y: -1) }.offset(y: -1)
} }
if reasons.isEmpty { if !reasons.contains(.placeholder) {
HStack(spacing: 0) { HStack(spacing: 0) {
EmojiTextApp(.init(stringValue: notification.accounts[0].safeDisplayName), EmojiTextApp(.init(stringValue: notification.accounts[0].safeDisplayName),
emojis: notification.accounts[0].emojis, emojis: notification.accounts[0].emojis,

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

@ -96,7 +96,7 @@ public struct StatusRowView: View {
accessibilityActions accessibilityActions
} }
} }
if reasons.isEmpty, if !reasons.contains(.placeholder),
viewModel.showActions, isFocused || theme.statusActionsDisplay != .none, viewModel.showActions, isFocused || theme.statusActionsDisplay != .none,
!isInCaptureMode { !isInCaptureMode {
StatusRowActionsView(viewModel: viewModel) StatusRowActionsView(viewModel: viewModel)
@ -115,7 +115,7 @@ public struct StatusRowView: View {
} }
.onAppear { .onAppear {
viewModel.markSeen() viewModel.markSeen()
if reasons.isEmpty { if !reasons.contains(.placeholder) {
if !isCompact, viewModel.embeddedStatus == nil { if !isCompact, viewModel.embeddedStatus == nil {
Task { Task {
await viewModel.loadEmbeddedStatus() await viewModel.loadEmbeddedStatus()

2
Packages/Status/Sources/Status/Row/Subviews/StatusRowContentView.swift
View file

@ -20,7 +20,7 @@ struct StatusRowContentView: View {
if !viewModel.displaySpoiler { if !viewModel.displaySpoiler {
StatusRowTextView(viewModel: viewModel) StatusRowTextView(viewModel: viewModel)
if reasons.isEmpty { if !reasons.contains(.placeholder) {
StatusRowTranslateView(viewModel: viewModel) StatusRowTranslateView(viewModel: viewModel)
} }
if let poll = viewModel.finalStatus.poll { if let poll = viewModel.finalStatus.poll {

4
Packages/Status/Sources/Status/Row/Subviews/StatusRowHeaderView.swift
View file

@ -53,13 +53,13 @@ struct StatusRowHeaderView: View {
.lineLimit(1) .lineLimit(1)
.accountPopover(viewModel.finalStatus.account) .accountPopover(viewModel.finalStatus.account)
if redactionReasons.isEmpty { if !redactionReasons.contains(.placeholder) {
accountBadgeView accountBadgeView
.font(.footnote) .font(.footnote)
} }
} }
.layoutPriority(1) .layoutPriority(1)
if redactionReasons.isEmpty { if !redactionReasons.contains(.placeholder) {
if theme.avatarPosition == .leading { if theme.avatarPosition == .leading {
dateView dateView
} else { } else {