Mastodon
/
IceCubes
mirror of https://github.com/Dimillian/IceCubesApp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Various fixes

This commit is contained in:
Thomas Ricouard 2023-01-09 21:13:00 +01:00
parent 39dc6dadc7
commit 75d8b9c90b
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IceCubesApp/App/IceCubesApp.swift
View File

@ -64,11 +64,14 @@ struct IceCubesApp: App {
@ViewBuilder @ViewBuilder
private var appView: some View { private var appView: some View {
/*
if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac { if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac {
splitView splitView
} else { } else {
tabBarView tabBarView
} }
*/
tabBarView
} }
private func badgeFor(tab: Tab) -> Int { private func badgeFor(tab: Tab) -> Int {
@ -169,6 +172,5 @@ class AppDelegate: NSObject, UIApplicationDelegate {
} }
func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) { func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) {
print(error)
} }
} }

1
Packages/Account/Sources/Account/AccountDetailView.swift
View File

@ -69,6 +69,7 @@ public struct AccountDetailView: View {
listsListView listsListView
} }
} }
.frame(maxWidth: .maxColumnWidth)
} }
.scrollContentBackground(.hidden) .scrollContentBackground(.hidden)
.background(theme.primaryBackgroundColor) .background(theme.primaryBackgroundColor)

1
Packages/Conversations/Sources/Conversations/List/ConversationsListRow.swift
View File

@ -31,7 +31,6 @@ struct ConversationsListRow: View {
} }
Text(conversation.lastStatus.createdAt.formatted) Text(conversation.lastStatus.createdAt.formatted)
.font(.footnote) .font(.footnote)
.foregroundColor(.gray)
} }
Text(conversation.lastStatus.content.asRawText) Text(conversation.lastStatus.content.asRawText)
.foregroundColor(.gray) .foregroundColor(.gray)

2
Packages/Status/Sources/Status/Row/StatusRowView.swift
View File

@ -163,7 +163,7 @@ public struct StatusRowView: View {
private func makeStatusContentView(status: AnyStatus) -> some View { private func makeStatusContentView(status: AnyStatus) -> some View {
Group { Group {
if !viewModel.status.spoilerText.isEmpty { if !status.spoilerText.isEmpty {
Text(status.spoilerText) Text(status.spoilerText)
.font(.body) .font(.body)
Button { Button {

2
Packages/Status/Sources/Status/Row/StatusRowViewModel.swift
View File

@ -50,7 +50,7 @@ public class StatusRowViewModel: ObservableObject {
self.favouritesCount = status.reblog?.favouritesCount ?? status.favouritesCount self.favouritesCount = status.reblog?.favouritesCount ?? status.favouritesCount
self.reblogsCount = status.reblog?.reblogsCount ?? status.reblogsCount self.reblogsCount = status.reblog?.reblogsCount ?? status.reblogsCount
self.repliesCount = status.reblog?.repliesCount ?? status.repliesCount self.repliesCount = status.reblog?.repliesCount ?? status.repliesCount
self.displaySpoiler = !status.spoilerText.isEmpty self.displaySpoiler = !(status.reblog?.spoilerText ?? status.spoilerText).isEmpty
self.isFiltered = filter != nil self.isFiltered = filter != nil
} }