Fix tvOS comments

This commit is contained in:
Arkadiusz Fal 2024-08-24 14:21:52 +02:00
parent c7365a7dc1
commit dc3492fd96
2 changed files with 15 additions and 3 deletions

View File

@ -131,7 +131,9 @@ struct CommentView: View {
Text(comment.time)
.font(.caption2)
#if !os(tvOS)
.foregroundColor(.secondary)
#endif
}
.lineLimit(1)
}
@ -159,11 +161,11 @@ struct CommentView: View {
Text("\(comment.likeCount.formattedAsAbbreviation())")
}
#if !os(tvOS)
.foregroundColor(.secondary)
.font(.system(size: 12))
#endif
}
}
.foregroundColor(.secondary)
}
private var repliesButton: some View {
@ -181,7 +183,8 @@ struct CommentView: View {
Text("Replies")
}
#if os(tvOS)
.padding(10)
.font(.system(size: 26))
.padding(.vertical, 3)
#endif
}
.buttonStyle(.plain)
@ -237,6 +240,8 @@ struct CommentView: View {
.lineSpacing(3)
.fixedSize(horizontal: false, vertical: true)
.textSelection(.enabled)
#else
Text(comment.text)
#endif
} else {
Text(rawText)

View File

@ -11,6 +11,7 @@ struct NowPlayingView: View {
var inInfoViewController = false
@State private var repliesID: Comment.ID?
@State private var availableWidth = 0.0
@FetchRequest(sortDescriptors: [.init(key: "watchedAt", ascending: false)])
var watches: FetchedResults<Watch>
@ -109,7 +110,7 @@ struct NowPlayingView: View {
} else {
Section {
ForEach(comments.all) { comment in
CommentView(comment: comment, repliesID: $repliesID)
CommentView(comment: comment, repliesID: $repliesID, availableWidth: availableWidth)
}
if comments.nextPageAvailable {
Text("Scroll to load more...")
@ -120,6 +121,12 @@ struct NowPlayingView: View {
}
}
}
.background(GeometryReader { geometry in
Color.clear
.onAppear {
self.availableWidth = Double(geometry.size.width)
}
})
}
}