mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-06-18 13:10:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore / Fix embed status view

Browse source
This commit is contained in:
Thomas Ricouard 2023-01-22 09:51:43 +01:00
parent 987f259130
commit 2df40ff543
1 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,14 +57,16 @@ public struct StatusRowView: View {
}
}
.onAppear {
viewModel.client = client
if !viewModel.isCompact, viewModel.embeddedStatus == nil {
Task {
await viewModel.loadEmbeddedStatus()
if reasons.isEmpty {
viewModel.client = client
if !viewModel.isCompact, viewModel.embeddedStatus == nil {
Task {
await viewModel.loadEmbeddedStatus()
}
}
if preferences.serverPreferences?.autoExpandSpoilers == true {
viewModel.displaySpoiler = false
}
}
if preferences.serverPreferences?.autoExpandSpoilers == true {
viewModel.displaySpoiler = false
}
}
.contextMenu {
@ -241,7 +243,9 @@ public struct StatusRowView: View {
if let poll = status.poll {
StatusPollView(poll: poll, status: status)
}
embedStatusView
makeMediasView(status: status)
.accessibilityHidden(!viewModel.isFocused)
makeCardView(status: status)
@ -350,4 +354,18 @@ public struct StatusRowView: View {
StatusCardView(card: card)
}
}
@ViewBuilder
private var embedStatusView: some View {
if !reasons.contains(.placeholder) {
if !viewModel.isCompact, !viewModel.isEmbedLoading,
let embed = viewModel.embeddedStatus {
StatusEmbeddedView(status: embed)
} else if viewModel.isEmbedLoading, !viewModel.isCompact {
StatusEmbeddedView(status: .placeholder())
.redacted(reason: .placeholder)
.shimmering()
}
}
}
}