Various fixes
This commit is contained in:
parent
39dc6dadc7
commit
75d8b9c90b
|
@ -64,11 +64,14 @@ struct IceCubesApp: App {
|
|||
|
||||
@ViewBuilder
|
||||
private var appView: some View {
|
||||
/*
|
||||
if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac {
|
||||
splitView
|
||||
} else {
|
||||
tabBarView
|
||||
}
|
||||
*/
|
||||
tabBarView
|
||||
}
|
||||
|
||||
private func badgeFor(tab: Tab) -> Int {
|
||||
|
@ -169,6 +172,5 @@ class AppDelegate: NSObject, UIApplicationDelegate {
|
|||
}
|
||||
|
||||
func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) {
|
||||
print(error)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -69,6 +69,7 @@ public struct AccountDetailView: View {
|
|||
listsListView
|
||||
}
|
||||
}
|
||||
.frame(maxWidth: .maxColumnWidth)
|
||||
}
|
||||
.scrollContentBackground(.hidden)
|
||||
.background(theme.primaryBackgroundColor)
|
||||
|
|
|
@ -31,7 +31,6 @@ struct ConversationsListRow: View {
|
|||
}
|
||||
Text(conversation.lastStatus.createdAt.formatted)
|
||||
.font(.footnote)
|
||||
.foregroundColor(.gray)
|
||||
}
|
||||
Text(conversation.lastStatus.content.asRawText)
|
||||
.foregroundColor(.gray)
|
||||
|
|
|
@ -163,7 +163,7 @@ public struct StatusRowView: View {
|
|||
|
||||
private func makeStatusContentView(status: AnyStatus) -> some View {
|
||||
Group {
|
||||
if !viewModel.status.spoilerText.isEmpty {
|
||||
if !status.spoilerText.isEmpty {
|
||||
Text(status.spoilerText)
|
||||
.font(.body)
|
||||
Button {
|
||||
|
|
|
@ -50,7 +50,7 @@ public class StatusRowViewModel: ObservableObject {
|
|||
self.favouritesCount = status.reblog?.favouritesCount ?? status.favouritesCount
|
||||
self.reblogsCount = status.reblog?.reblogsCount ?? status.reblogsCount
|
||||
self.repliesCount = status.reblog?.repliesCount ?? status.repliesCount
|
||||
self.displaySpoiler = !status.spoilerText.isEmpty
|
||||
self.displaySpoiler = !(status.reblog?.spoilerText ?? status.spoilerText).isEmpty
|
||||
|
||||
self.isFiltered = filter != nil
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue