diff --git a/Packages/Network/Sources/Network/Models/Account.swift b/Packages/Network/Sources/Network/Models/Account.swift index d3be0434..55ca5ce9 100644 --- a/Packages/Network/Sources/Network/Models/Account.swift +++ b/Packages/Network/Sources/Network/Models/Account.swift @@ -5,4 +5,5 @@ public struct Account: Codable, Identifiable { public let username: String public let displayName: String public let avatar: URL + public let acct: String } diff --git a/Packages/Timeline/Sources/Timeline/Status/StatusRowView.swift b/Packages/Timeline/Sources/Timeline/Status/StatusRowView.swift index 9c90184f..f55e9144 100644 --- a/Packages/Timeline/Sources/Timeline/Status/StatusRowView.swift +++ b/Packages/Timeline/Sources/Timeline/Status/StatusRowView.swift @@ -12,14 +12,21 @@ struct StatusRowView: View { content: { image in image.resizable() .aspectRatio(contentMode: .fit) - .cornerRadius(13) - .frame(maxWidth: 26, maxHeight: 26) + .cornerRadius(4) + .frame(maxWidth: 40, maxHeight: 40) }, placeholder: { ProgressView() + .frame(maxWidth: 40, maxHeight: 40) } ) - Text(status.account.username) + VStack(alignment: .leading) { + Text(status.account.displayName) + .font(.headline) + Text("@\(status.account.acct)") + .font(.footnote) + .foregroundColor(.gray) + } } Text(status.content) }