mirrors/IceCubesApp
1
0
Fork 0
mirror of https://github.com/Dimillian/IceCubesApp.git synced 2024-11-29 03:31:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

SwiftFormat

Browse source
This commit is contained in:
Thomas Ricouard 2023-12-18 08:22:59 +01:00
parent 2145bd5971
commit 8ff3e22d9f
55 changed files with 472 additions and 450 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
IceCubesApp/App/Main/IceCubesApp+Menu.swift
View file

@ -10,11 +10,11 @@ extension IceCubesApp {
} }
.keyboardShortcut("n", modifiers: .shift) .keyboardShortcut("n", modifiers: .shift)
Button("menu.new-post") { Button("menu.new-post") {
#if targetEnvironment(macCatalyst) #if targetEnvironment(macCatalyst)
openWindow(value: WindowDestinationEditor.newStatusEditor(visibility: userPreferences.postVisibility)) openWindow(value: WindowDestinationEditor.newStatusEditor(visibility: userPreferences.postVisibility))
#else #else
sidebarRouterPath.presentedSheet = .newStatusEditor(visibility: userPreferences.postVisibility) sidebarRouterPath.presentedSheet = .newStatusEditor(visibility: userPreferences.postVisibility)
#endif #endif
} }
.keyboardShortcut("n", modifiers: .command) .keyboardShortcut("n", modifiers: .command)
} }

6
IceCubesApp/App/SafariRouter.swift
View file

@ -1,9 +1,9 @@
import DesignSystem import DesignSystem
import Env import Env
import Models
import Observation import Observation
import SafariServices import SafariServices
import SwiftUI import SwiftUI
import Models
extension View { extension View {
@MainActor func withSafariRouter() -> some View { @MainActor func withSafariRouter() -> some View {
@ -43,9 +43,9 @@ private struct SafariRouter: ViewModifier {
return .handled return .handled
} }
} }
#if !targetEnvironment(macCatalyst) #if !targetEnvironment(macCatalyst)
guard preferences.preferredBrowser == .inAppSafari else { return .systemAction } guard preferences.preferredBrowser == .inAppSafari else { return .systemAction }
#endif #endif
// SFSafariViewController only supports initial URLs with http:// or https:// schemes. // SFSafariViewController only supports initial URLs with http:// or https:// schemes.
guard let scheme = url.scheme, ["https", "http"].contains(scheme.lowercased()) else { guard let scheme = url.scheme, ["https", "http"].contains(scheme.lowercased()) else {
return .systemAction return .systemAction

6
IceCubesApp/App/SideBarView.swift
View file

@ -57,11 +57,11 @@ struct SideBarView<Content: View>: View {
private var postButton: some View { private var postButton: some View {
Button { Button {
#if targetEnvironment(macCatalyst) #if targetEnvironment(macCatalyst)
openWindow(value: WindowDestinationEditor.newStatusEditor(visibility: userPreferences.postVisibility)) openWindow(value: WindowDestinationEditor.newStatusEditor(visibility: userPreferences.postVisibility))
#else #else
routerPath.presentedSheet = .newStatusEditor(visibility: userPreferences.postVisibility) routerPath.presentedSheet = .newStatusEditor(visibility: userPreferences.postVisibility)
#endif #endif
} label: { } label: {
Image(systemName: "square.and.pencil") Image(systemName: "square.and.pencil")
.resizable() .resizable()

12
IceCubesApp/App/Tabs/Settings/AboutView.swift
View file

@ -1,9 +1,9 @@
import Account
import DesignSystem import DesignSystem
import Env import Env
import SwiftUI
import Account
import Network
import Models import Models
import Network
import SwiftUI
@MainActor @MainActor
struct AboutView: View { struct AboutView: View {
@ -59,7 +59,6 @@ struct AboutView: View {
} }
.listRowBackground(theme.primaryBackgroundColor) .listRowBackground(theme.primaryBackgroundColor)
followAccountsSection followAccountsSection
Section { Section {
@ -110,7 +109,6 @@ struct AboutView: View {
}) })
} }
@ViewBuilder @ViewBuilder
private var followAccountsSection: some View { private var followAccountsSection: some View {
if let iceCubesAccount, let dimillianAccount { if let iceCubesAccount, let dimillianAccount {
@ -132,13 +130,13 @@ struct AboutView: View {
group.addTask { group.addTask {
let viewModel = try await fetchAccountViewModel(account: "dimillian@mastodon.social") let viewModel = try await fetchAccountViewModel(account: "dimillian@mastodon.social")
await MainActor.run { await MainActor.run {
self.dimillianAccount = viewModel dimillianAccount = viewModel
} }
} }
group.addTask { group.addTask {
let viewModel = try await fetchAccountViewModel(account: "icecubesapp@mastodon.online") let viewModel = try await fetchAccountViewModel(account: "icecubesapp@mastodon.online")
await MainActor.run { await MainActor.run {
self.iceCubesAccount = viewModel iceCubesAccount = viewModel
} }
} }
} }

3
IceCubesApp/App/Tabs/Settings/AddAccountsView.swift
View file

@ -218,7 +218,8 @@ struct AddAccountView: View {
signInClient = .init(server: sanitizedName) signInClient = .init(server: sanitizedName)
if let oauthURL = try? await signInClient?.oauthURL(), if let oauthURL = try? await signInClient?.oauthURL(),
let url = try? await webAuthenticationSession.authenticate(using: oauthURL, let url = try? await webAuthenticationSession.authenticate(using: oauthURL,
callbackURLScheme: AppInfo.scheme.replacingOccurrences(of: "://", with: "")){ callbackURLScheme: AppInfo.scheme.replacingOccurrences(of: "://", with: ""))
{
await continueSignIn(url: url) await continueSignIn(url: url)
} else { } else {
isSigninIn = false isSigninIn = false

2
IceCubesApp/App/Tabs/Settings/DisplaySettingsView.swift
View file

@ -212,7 +212,7 @@ struct DisplaySettingsView: View {
Double(userPreferences.maxReplyIndentation) Double(userPreferences.maxReplyIndentation)
}, set: { newVal in }, set: { newVal in
userPreferences.maxReplyIndentation = UInt(newVal) userPreferences.maxReplyIndentation = UInt(newVal)
}), in: 1...20, step: 1) }), in: 1 ... 20, step: 1)
Text("settings.display.max-reply-indentation-\(String(userPreferences.maxReplyIndentation))") Text("settings.display.max-reply-indentation-\(String(userPreferences.maxReplyIndentation))")
.font(.scaledBody) .font(.scaledBody)
} }

8
IceCubesApp/App/Tabs/Settings/SettingsTab.swift
View file

@ -173,7 +173,7 @@ struct SettingsTabs: View {
private var otherSections: some View { private var otherSections: some View {
@Bindable var preferences = preferences @Bindable var preferences = preferences
Section("settings.section.other") { Section("settings.section.other") {
#if !targetEnvironment(macCatalyst) #if !targetEnvironment(macCatalyst)
Picker(selection: $preferences.preferredBrowser) { Picker(selection: $preferences.preferredBrowser) {
ForEach(PreferredBrowser.allCases, id: \.rawValue) { browser in ForEach(PreferredBrowser.allCases, id: \.rawValue) { browser in
switch browser { switch browser {
@ -190,7 +190,7 @@ struct SettingsTabs: View {
Label("settings.general.browser.in-app.readerview", systemImage: "doc.plaintext") Label("settings.general.browser.in-app.readerview", systemImage: "doc.plaintext")
} }
.disabled(preferences.preferredBrowser != PreferredBrowser.inAppSafari) .disabled(preferences.preferredBrowser != PreferredBrowser.inAppSafari)
#endif #endif
Toggle(isOn: $preferences.isOpenAIEnabled) { Toggle(isOn: $preferences.isOpenAIEnabled) {
Label("settings.other.hide-openai", systemImage: "faxmachine") Label("settings.other.hide-openai", systemImage: "faxmachine")
} }
@ -209,7 +209,7 @@ struct SettingsTabs: View {
private var appSection: some View { private var appSection: some View {
Section { Section {
#if !targetEnvironment(macCatalyst) #if !targetEnvironment(macCatalyst)
NavigationLink(destination: IconSelectorView()) { NavigationLink(destination: IconSelectorView()) {
Label { Label {
Text("settings.app.icon") Text("settings.app.icon")
@ -221,7 +221,7 @@ struct SettingsTabs: View {
.cornerRadius(4) .cornerRadius(4)
} }
} }
#endif #endif
Link(destination: URL(string: "https://github.com/Dimillian/IceCubesApp")!) { Link(destination: URL(string: "https://github.com/Dimillian/IceCubesApp")!) {
Label("settings.app.source", systemImage: "link") Label("settings.app.source", systemImage: "link")

4
IceCubesApp/App/Tabs/Tabs.swift
View file

@ -21,9 +21,9 @@ enum Tab: Int, Identifiable, Hashable {
static func loggedInTabs() -> [Tab] { static func loggedInTabs() -> [Tab] {
if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac { if UIDevice.current.userInterfaceIdiom == .pad || UIDevice.current.userInterfaceIdiom == .mac {
return [.timeline, .trending, .federated, .local, .notifications, .mentions, .explore, .messages, .settings] [.timeline, .trending, .federated, .local, .notifications, .mentions, .explore, .messages, .settings]
} else { } else {
return [.timeline, .notifications, .explore, .messages, .profile] [.timeline, .notifications, .explore, .messages, .profile]
} }
} }

35
IceCubesApp/App/Tabs/TagGroup/EditTagGroupView.swift
View file

@ -4,10 +4,10 @@ import Env
import Models import Models
import Network import Network
import NukeUI import NukeUI
import Shimmer
import SwiftUI
import SwiftData
import SFSafeSymbols import SFSafeSymbols
import Shimmer
import SwiftData
import SwiftUI
@MainActor @MainActor
struct EditTagGroupView: View { struct EditTagGroupView: View {
@ -76,9 +76,9 @@ struct EditTagGroupView: View {
} }
init(tagGroup: TagGroup = .emptyGroup(), onSaved: ((TagGroup) -> Void)? = nil) { init(tagGroup: TagGroup = .emptyGroup(), onSaved: ((TagGroup) -> Void)? = nil) {
self._tagGroup = State(wrappedValue: tagGroup) _tagGroup = State(wrappedValue: tagGroup)
self.onSaved = onSaved self.onSaved = onSaved
self.isNewGroup = tagGroup.title.isEmpty isNewGroup = tagGroup.title.isEmpty
} }
private func save() { private func save() {
@ -320,7 +320,7 @@ private struct SymbolSearchResultsView: View {
.onAppear { .onAppear {
results = TagGroup.searchSymbol(for: symbolQuery, exclude: selectedSymbol) results = TagGroup.searchSymbol(for: symbolQuery, exclude: selectedSymbol)
} }
case .invalid(let description): case let .invalid(description):
Text(description) Text(description)
.font(.subheadline) .font(.subheadline)
.foregroundStyle(.secondary) .foregroundStyle(.secondary)
@ -335,6 +335,7 @@ private struct SymbolSearchResultsView: View {
} }
// MARK: search results validation // MARK: search results validation
enum ValidationStatus: Equatable { enum ValidationStatus: Equatable {
case valid case valid
case invalid(description: LocalizedStringKey) case invalid(description: LocalizedStringKey)
@ -342,22 +343,23 @@ private struct SymbolSearchResultsView: View {
var validationStatus: ValidationStatus { var validationStatus: ValidationStatus {
if results.isEmpty { if results.isEmpty {
if symbolQuery == selectedSymbol if symbolQuery == selectedSymbol,
&& !symbolQuery.isEmpty !symbolQuery.isEmpty,
&& results.count == 0 results.count == 0
{ {
return .invalid(description: "\(symbolQuery) add-tag-groups.edit.tags.field.warning.search-results.already-selected") .invalid(description: "\(symbolQuery) add-tag-groups.edit.tags.field.warning.search-results.already-selected")
} else { } else {
return .invalid(description: "add-tag-groups.edit.tags.field.warning.search-results.no-symbol-found") .invalid(description: "add-tag-groups.edit.tags.field.warning.search-results.no-symbol-found")
} }
} else { } else {
return .valid .valid
} }
} }
} }
extension TagGroup { extension TagGroup {
// MARK: title validation // MARK: title validation
enum TitleValidationStatus: Equatable { enum TitleValidationStatus: Equatable {
case valid case valid
case invalid(description: LocalizedStringKey) case invalid(description: LocalizedStringKey)
@ -370,6 +372,7 @@ extension TagGroup {
} }
// MARK: symbolName validation // MARK: symbolName validation
enum SymbolNameValidationStatus: Equatable { enum SymbolNameValidationStatus: Equatable {
case valid case valid
case invalid(description: LocalizedStringKey) case invalid(description: LocalizedStringKey)
@ -386,6 +389,7 @@ extension TagGroup {
} }
// MARK: tags validation // MARK: tags validation
enum TagsValidationStatus: Equatable { enum TagsValidationStatus: Equatable {
case valid case valid
case invalid(description: LocalizedStringKey) case invalid(description: LocalizedStringKey)
@ -399,6 +403,7 @@ extension TagGroup {
} }
// MARK: TagGroup validation // MARK: TagGroup validation
var isValid: Bool { var isValid: Bool {
titleValidationStatus == .valid titleValidationStatus == .valid
&& symbolNameValidationStatus == .valid && symbolNameValidationStatus == .valid
@ -406,12 +411,14 @@ extension TagGroup {
} }
// MARK: format // MARK: format
func format() { func format() {
title = title.trimmingCharacters(in: .whitespacesAndNewlines) title = title.trimmingCharacters(in: .whitespacesAndNewlines)
tags = tags.map { $0.lowercased() } tags = tags.map { $0.lowercased() }
} }
// MARK: static members // MARK: static members
static func emptyGroup() -> TagGroup { static func emptyGroup() -> TagGroup {
TagGroup(title: "", symbolName: "", tags: []) TagGroup(title: "", symbolName: "", tags: [])
} }
@ -419,7 +426,7 @@ extension TagGroup {
static func searchSymbol(for query: String, exclude excludedSymbol: String) -> [String] { static func searchSymbol(for query: String, exclude excludedSymbol: String) -> [String] {
guard !query.isEmpty else { return [] } guard !query.isEmpty else { return [] }
return Self.allSymbols.filter { return allSymbols.filter {
$0.contains(query) && $0.contains(query) &&
$0 != excludedSymbol $0 != excludedSymbol
} }
@ -432,7 +439,7 @@ extension TagGroup {
extension Text { extension Text {
func warningLabel() -> Text { func warningLabel() -> Text {
self.font(.caption) font(.caption)
.foregroundStyle(.red) .foregroundStyle(.red)
} }
} }

15
Packages/Account/Sources/Account/AccountDetailHeaderView.swift
View file

@ -81,13 +81,14 @@ struct AccountDetailHeaderView: View {
return return
} }
let attachement = MediaAttachment.imageWith(url: account.header) let attachement = MediaAttachment.imageWith(url: account.header)
#if targetEnvironment(macCatalyst) #if targetEnvironment(macCatalyst)
openWindow(value: WindowDestinationMedia.mediaViewer( openWindow(value: WindowDestinationMedia.mediaViewer(
attachments: [attachement], attachments: [attachement],
selectedAttachment: attachement)) selectedAttachment: attachement
#else ))
#else
quickLook.prepareFor(selectedMediaAttachment: attachement, mediaAttachments: [attachement]) quickLook.prepareFor(selectedMediaAttachment: attachement, mediaAttachments: [attachement])
#endif #endif
} }
.accessibilityElement(children: .combine) .accessibilityElement(children: .combine)
.accessibilityAddTraits([.isImage, .isButton]) .accessibilityAddTraits([.isImage, .isButton])
@ -117,12 +118,12 @@ struct AccountDetailHeaderView: View {
return return
} }
let attachement = MediaAttachment.imageWith(url: account.avatar) let attachement = MediaAttachment.imageWith(url: account.avatar)
#if targetEnvironment(macCatalyst) #if targetEnvironment(macCatalyst)
openWindow(value: WindowDestinationMedia.mediaViewer(attachments: [attachement], openWindow(value: WindowDestinationMedia.mediaViewer(attachments: [attachement],
selectedAttachment: attachement)) selectedAttachment: attachement))
#else #else
quickLook.prepareFor(selectedMediaAttachment: attachement, mediaAttachments: [attachement]) quickLook.prepareFor(selectedMediaAttachment: attachement, mediaAttachments: [attachement])
#endif #endif
} }
.accessibilityElement(children: .combine) .accessibilityElement(children: .combine)
.accessibilityAddTraits([.isImage, .isButton]) .accessibilityAddTraits([.isImage, .isButton])

4
Packages/Account/Sources/Account/Edit/EditAccountView.swift
View file

@ -1,7 +1,7 @@
import DesignSystem import DesignSystem
import Env
import Models import Models
import Network import Network
import Env
import SwiftUI import SwiftUI
@MainActor @MainActor
@ -16,7 +16,7 @@ public struct EditAccountView: View {
public init() {} public init() {}
public var body: some View { public var body: some View {
NavigationStack{ NavigationStack {
Form { Form {
if viewModel.isLoading { if viewModel.isLoading {
loadingSection loadingSection

6
Packages/DesignSystem/Sources/DesignSystem/Font.swift
View file

@ -6,21 +6,21 @@ public extension Font {
// See https://gist.github.com/zacwest/916d31da5d03405809c4 for iOS values // See https://gist.github.com/zacwest/916d31da5d03405809c4 for iOS values
// Custom values for Mac // Custom values for Mac
private static let title = 28.0 private static let title = 28.0
#if targetEnvironment(macCatalyst) #if targetEnvironment(macCatalyst)
private static let headline = 20.0 private static let headline = 20.0
private static let body = 19.0 private static let body = 19.0
private static let callout = 17.0 private static let callout = 17.0
private static let subheadline = 16.0 private static let subheadline = 16.0
private static let footnote = 15.0 private static let footnote = 15.0
private static let caption = 14.0 private static let caption = 14.0
#else #else
private static let headline = 17.0 private static let headline = 17.0
private static let body = 17.0 private static let body = 17.0
private static let callout = 16.0 private static let callout = 16.0
private static let subheadline = 15.0 private static let subheadline = 15.0
private static let footnote = 13.0 private static let footnote = 13.0
private static let caption = 12.0 private static let caption = 12.0
#endif #endif
private static func customFont(size: CGFloat, relativeTo textStyle: TextStyle) -> Font { private static func customFont(size: CGFloat, relativeTo textStyle: TextStyle) -> Font {
if let chosenFont = Theme.shared.chosenFont { if let chosenFont = Theme.shared.chosenFont {

6
Packages/DesignSystem/Sources/DesignSystem/SceneDelegate.swift
View file

@ -22,10 +22,10 @@ public class SceneDelegate: NSObject, UIWindowSceneDelegate, Sendable {
#endif #endif
} }
public override init() { override public init() {
super.init() super.init()
self.windowWidth = self.window?.bounds.size.width ?? UIScreen.main.bounds.size.width windowWidth = window?.bounds.size.width ?? UIScreen.main.bounds.size.width
self.windowHeight = self.window?.bounds.size.height ?? UIScreen.main.bounds.size.height windowHeight = window?.bounds.size.height ?? UIScreen.main.bounds.size.height
Self.observedSceneDelegate.insert(self) Self.observedSceneDelegate.insert(self)
_ = Self.observer // just for activating the lazy static property _ = Self.observer // just for activating the lazy static property
} }

17
Packages/DesignSystem/Sources/DesignSystem/Views/AccountPopoverView.swift
View file

@ -1,9 +1,9 @@
import Env import Env
import Models
import Nuke import Nuke
import NukeUI import NukeUI
import Shimmer import Shimmer
import SwiftUI import SwiftUI
import Models
struct AccountPopoverView: View { struct AccountPopoverView: View {
let account: Account let account: Account
@ -36,7 +36,7 @@ struct AccountPopoverView: View {
} }
.frame(height: adaptiveConfig.height / 2, alignment: .bottom) .frame(height: adaptiveConfig.height / 2, alignment: .bottom)
EmojiTextApp(.init(stringValue: account.safeDisplayName ), emojis: account.emojis) EmojiTextApp(.init(stringValue: account.safeDisplayName), emojis: account.emojis)
.font(.headline) .font(.headline)
.foregroundColor(theme.labelColor) .foregroundColor(theme.labelColor)
.emojiSize(Font.scaledHeadlineFont.emojiSize) .emojiSize(Font.scaledHeadlineFont.emojiSize)
@ -122,11 +122,10 @@ struct AccountPopoverView: View {
} }
private var adaptiveConfig: AvatarView.FrameConfig { private var adaptiveConfig: AvatarView.FrameConfig {
var cornerRadius: CGFloat var cornerRadius: CGFloat = if config == .badge || theme.avatarShape == .circle {
if config == .badge || theme.avatarShape == .circle { config.width / 2
cornerRadius = config.width / 2
} else { } else {
cornerRadius = config.cornerRadius config.cornerRadius
} }
return AvatarView.FrameConfig(width: config.width, height: config.height, cornerRadius: cornerRadius) return AvatarView.FrameConfig(width: config.width, height: config.height, cornerRadius: cornerRadius)
} }
@ -142,7 +141,7 @@ extension VerticalAlignment {
static let bottomAvatar = VerticalAlignment(BottomAvatarAlignment.self) static let bottomAvatar = VerticalAlignment(BottomAvatarAlignment.self)
} }
public struct AccountPopoverModifier : ViewModifier { public struct AccountPopoverModifier: ViewModifier {
@Environment(Theme.self) private var theme @Environment(Theme.self) private var theme
@Environment(UserPreferences.self) private var userPreferences @Environment(UserPreferences.self) private var userPreferences
@ -191,8 +190,8 @@ public struct AccountPopoverModifier : ViewModifier {
} }
} }
extension View { public extension View {
public func accountPopover(_ account: Account) -> some View { func accountPopover(_ account: Account) -> some View {
modifier(AccountPopoverModifier(account)) modifier(AccountPopoverModifier(account))
} }
} }

24
Packages/DesignSystem/Sources/DesignSystem/Views/AvatarView.swift
View file

@ -1,8 +1,8 @@
import Models
import Nuke import Nuke
import NukeUI import NukeUI
import Shimmer import Shimmer
import SwiftUI import SwiftUI
import Models
@MainActor @MainActor
public struct AvatarView: View { public struct AvatarView: View {
@ -21,11 +21,10 @@ public struct AvatarView: View {
} }
private var adaptiveConfig: FrameConfig { private var adaptiveConfig: FrameConfig {
var cornerRadius: CGFloat var cornerRadius: CGFloat = if config == .badge || theme.avatarShape == .circle {
if config == .badge || theme.avatarShape == .circle { config.width / 2
cornerRadius = config.width / 2
} else { } else {
cornerRadius = config.cornerRadius config.cornerRadius
} }
return FrameConfig(width: config.width, height: config.height, cornerRadius: cornerRadius) return FrameConfig(width: config.width, height: config.height, cornerRadius: cornerRadius)
} }
@ -42,16 +41,16 @@ public struct AvatarView: View {
let cornerRadius: CGFloat let cornerRadius: CGFloat
init(width: CGFloat, height: CGFloat, cornerRadius: CGFloat = 4) { init(width: CGFloat, height: CGFloat, cornerRadius: CGFloat = 4) {
self.size = CGSize(width: width, height: height) size = CGSize(width: width, height: height)
self.cornerRadius = cornerRadius self.cornerRadius = cornerRadius
} }
public static let account = FrameConfig(width: 80, height: 80) public static let account = FrameConfig(width: 80, height: 80)
#if targetEnvironment(macCatalyst) #if targetEnvironment(macCatalyst)
public static let status = FrameConfig(width: 48, height: 48) public static let status = FrameConfig(width: 48, height: 48)
#else #else
public static let status = FrameConfig(width: 40, height: 40) public static let status = FrameConfig(width: 40, height: 40)
#endif #endif
public static let embed = FrameConfig(width: 34, height: 34) public static let embed = FrameConfig(width: 34, height: 34)
public static let badge = FrameConfig(width: 28, height: 28, cornerRadius: 14) public static let badge = FrameConfig(width: 28, height: 28, cornerRadius: 14)
public static let list = FrameConfig(width: 20, height: 20, cornerRadius: 10) public static let list = FrameConfig(width: 20, height: 20, cornerRadius: 10)
@ -77,10 +76,10 @@ struct PreviewWrapper: View {
Toggle("Avatar Shape", isOn: $isCircleAvatar) Toggle("Avatar Shape", isOn: $isCircleAvatar)
} }
.onChange(of: isCircleAvatar) { .onChange(of: isCircleAvatar) {
Theme.shared.avatarShape = self.isCircleAvatar ? .circle : .rounded Theme.shared.avatarShape = isCircleAvatar ? .circle : .rounded
} }
.onAppear { .onAppear {
Theme.shared.avatarShape = self.isCircleAvatar ? .circle : .rounded Theme.shared.avatarShape = isCircleAvatar ? .circle : .rounded
} }
} }
@ -103,7 +102,8 @@ struct PreviewWrapper: View {
url: URL(string: "https://nondot.org/sabre/")!, url: URL(string: "https://nondot.org/sabre/")!,
source: nil, source: nil,
bot: false, bot: false,
discoverable: true) discoverable: true
)
} }
struct AvatarImage: View { struct AvatarImage: View {

6
Packages/DesignSystem/Sources/DesignSystem/Views/StatusEditorToolbarItem.swift
View file

@ -26,12 +26,12 @@ public struct StatusEditorToolbarItem: ToolbarContent {
ToolbarItem(placement: .navigationBarTrailing) { ToolbarItem(placement: .navigationBarTrailing) {
Button { Button {
Task { @MainActor in Task { @MainActor in
#if targetEnvironment(macCatalyst) #if targetEnvironment(macCatalyst)
openWindow(value: WindowDestinationEditor.newStatusEditor(visibility: visibility)) openWindow(value: WindowDestinationEditor.newStatusEditor(visibility: visibility))
#else #else
routerPath.presentedSheet = .newStatusEditor(visibility: visibility) routerPath.presentedSheet = .newStatusEditor(visibility: visibility)
HapticManager.shared.fireHaptic(.buttonPress) HapticManager.shared.fireHaptic(.buttonPress)
#endif #endif
} }
} label: { } label: {
Image(systemName: "square.and.pencil") Image(systemName: "square.and.pencil")

2
Packages/DesignSystem/Sources/DesignSystem/Views/TagChartView.swift
View file

@ -1,6 +1,6 @@
import SwiftUI
import Charts import Charts
import Models import Models
import SwiftUI
public struct TagChartView: View { public struct TagChartView: View {
@State private var sortedHistory: [Tag.History] = [] @State private var sortedHistory: [Tag.History] = []

9
Packages/Lists/Sources/Lists/Create/ListCreateView.swift
View file

@ -1,9 +1,9 @@
import DesignSystem import DesignSystem
import EmojiText import EmojiText
import Env
import Models import Models
import Network import Network
import SwiftUI import SwiftUI
import Env
@MainActor @MainActor
public struct ListCreateView: View { public struct ListCreateView: View {
@ -17,7 +17,7 @@ public struct ListCreateView: View {
@State private var isExclusive: Bool = false @State private var isExclusive: Bool = false
@State private var isSaving: Bool = false @State private var isSaving: Bool = false
public init() { } public init() {}
public var body: some View { public var body: some View {
NavigationStack { NavigationStack {
@ -25,7 +25,8 @@ public struct ListCreateView: View {
Section("lists.edit.settings") { Section("lists.edit.settings") {
TextField("list.edit.title", text: $title) TextField("list.edit.title", text: $title)
Picker("list.edit.repliesPolicy", Picker("list.edit.repliesPolicy",
selection: $repliesPolicy) { selection: $repliesPolicy)
{
ForEach(Models.List.RepliesPolicy.allCases) { policy in ForEach(Models.List.RepliesPolicy.allCases) { policy in
Text(policy.title) Text(policy.title)
.tag(policy) .tag(policy)
@ -44,7 +45,7 @@ public struct ListCreateView: View {
isSaving = true isSaving = true
let _: Models.List = try await client.post(endpoint: Lists.createList(title: title, let _: Models.List = try await client.post(endpoint: Lists.createList(title: title,
repliesPolicy: repliesPolicy, repliesPolicy: repliesPolicy,
exclusive: isExclusive )) exclusive: isExclusive))
await currentAccount.fetchLists() await currentAccount.fetchLists()
isSaving = false isSaving = false
dismiss() dismiss()

6
Packages/Lists/Sources/Lists/Edit/ListEditView.swift
View file

@ -1,9 +1,9 @@
import Account
import DesignSystem import DesignSystem
import EmojiText import EmojiText
import Models import Models
import Network import Network
import SwiftUI import SwiftUI
import Account
@MainActor @MainActor
public struct ListEditView: View { public struct ListEditView: View {
@ -25,7 +25,8 @@ public struct ListEditView: View {
Task { await viewModel.update() } Task { await viewModel.update() }
} }
Picker("list.edit.repliesPolicy", Picker("list.edit.repliesPolicy",
selection: $viewModel.repliesPolicy) { selection: $viewModel.repliesPolicy)
{
ForEach(Models.List.RepliesPolicy.allCases) { policy in ForEach(Models.List.RepliesPolicy.allCases) { policy in
Text(policy.title) Text(policy.title)
.tag(policy) .tag(policy)
@ -176,5 +177,4 @@ public struct ListEditView: View {
} }
} }
} }
} }

26
Packages/Lists/Sources/Lists/Edit/ListEditViewModel.swift
View file

@ -1,9 +1,9 @@
import Combine import Combine
import Env
import Models import Models
import Network import Network
import Observation import Observation
import SwiftUI import SwiftUI
import Env
@MainActor @MainActor
@Observable public class ListEditViewModel { @Observable public class ListEditViewModel {
@ -27,9 +27,9 @@ import Env
init(list: Models.List) { init(list: Models.List) {
self.list = list self.list = list
self.title = list.title title = list.title
self.repliesPolicy = list.repliesPolicy ?? .list repliesPolicy = list.repliesPolicy ?? .list
self.isExclusive = list.exclusive ?? false isExclusive = list.exclusive ?? false
} }
func fetchAccounts() async { func fetchAccounts() async {
@ -51,12 +51,12 @@ import Env
Lists.updateList(id: list.id, Lists.updateList(id: list.id,
title: title, title: title,
repliesPolicy: repliesPolicy, repliesPolicy: repliesPolicy,
exclusive: isExclusive )) exclusive: isExclusive))
self.list = list self.list = list
self.title = list.title title = list.title
self.repliesPolicy = list.repliesPolicy ?? .list repliesPolicy = list.repliesPolicy ?? .list
self.isExclusive = list.exclusive ?? false isExclusive = list.exclusive ?? false
self.isUpdating = false isUpdating = false
await CurrentAccount.shared.fetchLists() await CurrentAccount.shared.fetchLists()
} catch { } catch {
isUpdating = false isUpdating = false
@ -107,7 +107,7 @@ import Env
} }
searchedAccounts = results.accounts searchedAccounts = results.accounts
isSearching = false isSearching = false
} catch { } } catch {}
} }
} }
@ -115,11 +115,11 @@ extension Models.List.RepliesPolicy {
var title: LocalizedStringKey { var title: LocalizedStringKey {
switch self { switch self {
case .followed: case .followed:
return "list.repliesPolicy.followed" "list.repliesPolicy.followed"
case .list: case .list:
return "list.repliesPolicy.list" "list.repliesPolicy.list"
case .none: case .none:
return "list.repliesPolicy.none" "list.repliesPolicy.none"
} }
} }
} }

2
Packages/MediaUI/Sources/MediaUI/MediaUIView.swift
View file

@ -64,7 +64,7 @@ public struct MediaUIView: View, @unchecked Sendable {
} }
private func scrollToNext() { private func scrollToNext() {
if let scrolledItem, let index = data.firstIndex(of: scrolledItem), index < data.count - 1{ if let scrolledItem, let index = data.firstIndex(of: scrolledItem), index < data.count - 1 {
withAnimation { withAnimation {
self.scrolledItem = data[index + 1] self.scrolledItem = data[index + 1]
} }

2
Packages/Models/Sources/Models/List.swift
View file

@ -11,7 +11,7 @@ public struct List: Codable, Identifiable, Equatable, Hashable {
rawValue rawValue
} }
case followed, list, `none` case followed, list, none
} }
} }

1
Packages/Models/Sources/Models/Tag.swift
View file

@ -5,6 +5,7 @@ public struct Tag: Codable, Identifiable, Equatable, Hashable {
public var id: String { public var id: String {
day day
} }
public let day: String public let day: String
public let accounts: String public let accounts: String
public let uses: String public let uses: String

2
Packages/Network/Sources/Network/Endpoint/Apps.swift
View file

@ -14,7 +14,7 @@ public enum Apps: Endpoint {
public func queryItems() -> [URLQueryItem]? { public func queryItems() -> [URLQueryItem]? {
switch self { switch self {
case .registerApp: case .registerApp:
return [ [
.init(name: "client_name", value: AppInfo.clientName), .init(name: "client_name", value: AppInfo.clientName),
.init(name: "redirect_uris", value: AppInfo.scheme), .init(name: "redirect_uris", value: AppInfo.scheme),
.init(name: "scopes", value: AppInfo.scopes), .init(name: "scopes", value: AppInfo.scopes),

4
Packages/Network/Sources/Network/Endpoint/Oauth.swift
View file

@ -35,14 +35,14 @@ public enum Oauth: Endpoint {
public func queryItems() -> [URLQueryItem]? { public func queryItems() -> [URLQueryItem]? {
switch self { switch self {
case let .authorize(clientId): case let .authorize(clientId):
return [ [
.init(name: "response_type", value: "code"), .init(name: "response_type", value: "code"),
.init(name: "client_id", value: clientId), .init(name: "client_id", value: clientId),
.init(name: "redirect_uri", value: AppInfo.scheme), .init(name: "redirect_uri", value: AppInfo.scheme),
.init(name: "scope", value: AppInfo.scopes), .init(name: "scope", value: AppInfo.scopes),
] ]
default: default:
return nil nil
} }
} }
} }

4
Packages/Network/Sources/Network/Endpoint/ServerFilters.swift
View file

@ -29,10 +29,10 @@ public enum ServerFilters: Endpoint {
public func queryItems() -> [URLQueryItem]? { public func queryItems() -> [URLQueryItem]? {
switch self { switch self {
case let .addKeyword(_, keyword, wholeWord): case let .addKeyword(_, keyword, wholeWord):
return [.init(name: "keyword", value: keyword), [.init(name: "keyword", value: keyword),
.init(name: "whole_word", value: wholeWord ? "true" : "false")] .init(name: "whole_word", value: wholeWord ? "true" : "false")]
default: default:
return nil nil
} }
} }

5
Packages/Network/Sources/Network/OpenAIClient.swift
View file

@ -42,6 +42,7 @@ public struct OpenAIClient {
public struct ImageUrl: Encodable { public struct ImageUrl: Encodable {
public let url: URL public let url: URL
} }
public let type: String public let type: String
public let text: String? public let text: String?
public let imageUrl: ImageUrl? public let imageUrl: ImageUrl?
@ -77,8 +78,8 @@ public struct OpenAIClient {
case let .emphasize(input): case let .emphasize(input):
ChatRequest(content: "Make this text catchy, more fun: \(input)", temperature: 1) ChatRequest(content: "Make this text catchy, more fun: \(input)", temperature: 1)
case let .imageDescription(image): case let .imageDescription(image):
VisionRequest(messages: [.init(content: [.init(type: "text", text: "What’s in this image? Be brief, it's for image alt description on a social network. Don't write in the first person.", imageUrl: nil) VisionRequest(messages: [.init(content: [.init(type: "text", text: "What’s in this image? Be brief, it's for image alt description on a social network. Don't write in the first person.", imageUrl: nil),
, .init(type: "image_url", text: nil, imageUrl: .init(url: image))])]) .init(type: "image_url", text: nil, imageUrl: .init(url: image))])])
} }
} }
} }

2
Packages/Notifications/Sources/Notifications/NotificationsViewModel.swift
View file

@ -54,7 +54,7 @@ import SwiftUI
} }
func loadSelectedType() { func loadSelectedType() {
self.client = client client = client
guard let value = UserDefaults.standard.string(forKey: filterKey) guard let value = UserDefaults.standard.string(forKey: filterKey)
else { else {

3
Packages/Status/Sources/Status/Detail/StatusDetailViewModel.swift
View file

@ -114,7 +114,8 @@ import SwiftUI
indentationLevelPreviousCache = [:] indentationLevelPreviousCache = [:]
for status in statuses { for status in statuses {
if let inReplyToId = status.inReplyToId, if let inReplyToId = status.inReplyToId,
let prevIndent = indentationLevelPreviousCache[inReplyToId] { let prevIndent = indentationLevelPreviousCache[inReplyToId]
{
indentationLevelPreviousCache[status.id] = prevIndent + 1 indentationLevelPreviousCache[status.id] = prevIndent + 1
} else { } else {
indentationLevelPreviousCache[status.id] = 0 indentationLevelPreviousCache[status.id] = 0

16
Packages/Status/Sources/Status/Editor/Components/GIF/GIFPickerView.swift
View file

@ -1,12 +1,12 @@
import SwiftUI
import GiphyUISDK
import UIKit
import DesignSystem import DesignSystem
import GiphyUISDK
import SwiftUI
import UIKit
struct GifPickerView: UIViewControllerRepresentable { struct GifPickerView: UIViewControllerRepresentable {
@Environment(Theme.self) private var theme @Environment(Theme.self) private var theme
var completion: ((String) -> Void) var completion: (String) -> Void
var onShouldDismissGifPicker: () -> Void var onShouldDismissGifPicker: () -> Void
func makeUIViewController(context: Context) -> GiphyViewController { func makeUIViewController(context: Context) -> GiphyViewController {
@ -26,7 +26,7 @@ struct GifPickerView: UIViewControllerRepresentable {
return controller return controller
} }
func updateUIViewController(_ uiViewController: UIViewControllerType, context: Context) { } func updateUIViewController(_: UIViewControllerType, context _: Context) {}
func makeCoordinator() -> Coordinator { func makeCoordinator() -> Coordinator {
GifPickerView.Coordinator(parent: self) GifPickerView.Coordinator(parent: self)
@ -39,11 +39,11 @@ struct GifPickerView: UIViewControllerRepresentable {
self.parent = parent self.parent = parent
} }
func didDismiss(controller: GiphyViewController?) { func didDismiss(controller _: GiphyViewController?) {
self.parent.onShouldDismissGifPicker() parent.onShouldDismissGifPicker()
} }
func didSelectMedia(giphyViewController: GiphyViewController, media: GPHMedia) { func didSelectMedia(giphyViewController _: GiphyViewController, media: GPHMedia) {
let url = media.url(rendition: .fixedWidth, fileType: .gif) let url = media.url(rendition: .fixedWidth, fileType: .gif)
parent.completion(url ?? "") parent.completion(url ?? "")
} }

11
Packages/Status/Sources/Status/Editor/Components/StatusEditorAccessoryView.swift
View file

@ -1,10 +1,10 @@
import DesignSystem import DesignSystem
import Env import Env
import GiphyUISDK
import Models import Models
import NukeUI import NukeUI
import PhotosUI import PhotosUI
import SwiftUI import SwiftUI
import GiphyUISDK
@MainActor @MainActor
struct StatusEditorAccessoryView: View { struct StatusEditorAccessoryView: View {
@ -41,13 +41,13 @@ struct StatusEditorAccessoryView: View {
} label: { } label: {
Label("status.editor.photo-library", systemImage: "photo") Label("status.editor.photo-library", systemImage: "photo")
} }
#if !targetEnvironment(macCatalyst) #if !targetEnvironment(macCatalyst)
Button { Button {
isCameraPickerPresented = true isCameraPickerPresented = true
} label: { } label: {
Label("status.editor.camera-picker", systemImage: "camera") Label("status.editor.camera-picker", systemImage: "camera")
} }
#endif #endif
Button { Button {
isFileImporterPresented = true isFileImporterPresented = true
} label: { } label: {
@ -70,8 +70,7 @@ struct StatusEditorAccessoryView: View {
selection: $viewModel.mediaPickers, selection: $viewModel.mediaPickers,
maxSelectionCount: 4, maxSelectionCount: 4,
matching: .any(of: [.images, .videos]), matching: .any(of: [.images, .videos]),
photoLibrary: .shared() photoLibrary: .shared())
)
.fileImporter(isPresented: $isFileImporterPresented, .fileImporter(isPresented: $isFileImporterPresented,
allowedContentTypes: [.image, .video], allowedContentTypes: [.image, .video],
allowsMultipleSelection: true) allowsMultipleSelection: true)
@ -92,7 +91,7 @@ struct StatusEditorAccessoryView: View {
}) })
.sheet(isPresented: $isGIFPickerPresented, content: { .sheet(isPresented: $isGIFPickerPresented, content: {
GifPickerView { url in GifPickerView { url in
GPHCache.shared.downloadAssetData(url) { data, error in GPHCache.shared.downloadAssetData(url) { data, _ in
guard let data else { return } guard let data else { return }
viewModel.processGIFData(data: data) viewModel.processGIFData(data: data)
} }

3
Packages/Status/Sources/Status/Editor/Components/StatusEditorMediaEditView.swift
View file

@ -1,9 +1,9 @@
import DesignSystem import DesignSystem
import Env import Env
import Models import Models
import Network
import Shimmer import Shimmer
import SwiftUI import SwiftUI
import Network
@MainActor @MainActor
struct StatusEditorMediaEditView: View { struct StatusEditorMediaEditView: View {
@ -153,7 +153,6 @@ struct StatusEditorMediaEditView: View {
Text("status.action.translate") Text("status.action.translate")
} }
} }
} }
} }

18
Packages/Status/Sources/Status/Editor/Components/StatusEditorMediaView.swift
View file

@ -1,10 +1,10 @@
import AVKit import AVKit
import DesignSystem import DesignSystem
import Env import Env
import MediaUI
import Models import Models
import NukeUI import NukeUI
import SwiftUI import SwiftUI
import MediaUI
@MainActor @MainActor
struct StatusEditorMediaView: View { struct StatusEditorMediaView: View {
@ -49,17 +49,17 @@ struct StatusEditorMediaView: View {
private let containerHeight: CGFloat = 300 private let containerHeight: CGFloat = 300
private var containerWidth: CGFloat { containerHeight / 1.5 } private var containerWidth: CGFloat { containerHeight / 1.5 }
#if targetEnvironment(macCatalyst) #if targetEnvironment(macCatalyst)
private var showsScrollIndicators : Bool { count > 1 } private var showsScrollIndicators: Bool { count > 1 }
private var scrollBottomPadding : CGFloat? = nil private var scrollBottomPadding: CGFloat?
#else #else
private var showsScrollIndicators : Bool = false private var showsScrollIndicators: Bool = false
private var scrollBottomPadding : CGFloat? = 0 private var scrollBottomPadding: CGFloat? = 0
#endif #endif
init(viewModel: StatusEditorViewModel, editingMediaContainer: Binding<StatusEditorMediaContainer?>) { init(viewModel: StatusEditorViewModel, editingMediaContainer: Binding<StatusEditorMediaContainer?>) {
self.viewModel = viewModel self.viewModel = viewModel
self._editingMediaContainer = editingMediaContainer _editingMediaContainer = editingMediaContainer
} }
private func pixel(at index: Int) -> some View { private func pixel(at index: Int) -> some View {

20
Packages/Status/Sources/Status/Editor/StatusEditorCoreView.swift
View file

@ -1,10 +1,10 @@
import SwiftUI
import Models
import Env
import DesignSystem
import Accounts import Accounts
import AppAccount import AppAccount
import DesignSystem
import Env
import Models
import Network import Network
import SwiftUI
@MainActor @MainActor
struct StatusEditorCoreView: View { struct StatusEditorCoreView: View {
@ -22,11 +22,11 @@ struct StatusEditorCoreView: View {
@Environment(CurrentAccount.self) private var currentAccount @Environment(CurrentAccount.self) private var currentAccount
@Environment(AppAccountsManager.self) private var appAccounts @Environment(AppAccountsManager.self) private var appAccounts
@Environment(Client.self) private var client @Environment(Client.self) private var client
#if targetEnvironment(macCatalyst) #if targetEnvironment(macCatalyst)
@Environment(\.dismissWindow) private var dismissWindow @Environment(\.dismissWindow) private var dismissWindow
#else #else
@Environment(\.dismiss) private var dismiss @Environment(\.dismiss) private var dismiss
#endif #endif
var body: some View { var body: some View {
HStack(spacing: 0) { HStack(spacing: 0) {
@ -145,11 +145,11 @@ struct StatusEditorCoreView: View {
viewModel.preferences = preferences viewModel.preferences = preferences
viewModel.prepareStatusText() viewModel.prepareStatusText()
if !client.isAuth { if !client.isAuth {
#if targetEnvironment(macCatalyst) #if targetEnvironment(macCatalyst)
dismissWindow() dismissWindow()
#else #else
dismiss() dismiss()
#endif #endif
NotificationCenter.default.post(name: .shareSheetClose, object: nil) NotificationCenter.default.post(name: .shareSheetClose, object: nil)
} }

5
Packages/Status/Sources/Status/Editor/StatusEditorPrivacyMenu.swift
View file

@ -1,5 +1,5 @@
import SwiftUI
import Models import Models
import SwiftUI
struct StatusEditorPrivacyMenu: View { struct StatusEditorPrivacyMenu: View {
@Binding var visibility: Models.Visibility @Binding var visibility: Models.Visibility
@ -8,7 +8,7 @@ struct StatusEditorPrivacyMenu: View {
var body: some View { var body: some View {
Menu { Menu {
ForEach(Models.Visibility.allCases, id: \.self) { vis in ForEach(Models.Visibility.allCases, id: \.self) { vis in
Button { self.visibility = vis } label: { Button { visibility = vis } label: {
Label(vis.title, systemImage: vis.iconName) Label(vis.title, systemImage: vis.iconName)
} }
} }
@ -29,4 +29,3 @@ struct StatusEditorPrivacyMenu: View {
} }
} }
} }

20
Packages/Status/Sources/Status/Editor/StatusEditorToolbarItems.swift
View file

@ -1,7 +1,7 @@
import SwiftUI
import Env import Env
import Models import Models
import StoreKit import StoreKit
import SwiftUI
@MainActor @MainActor
struct StatusEditorToolbarItems: ToolbarContent { struct StatusEditorToolbarItems: ToolbarContent {
@ -12,11 +12,11 @@ struct StatusEditorToolbarItems: ToolbarContent {
@Environment(\.modelContext) private var context @Environment(\.modelContext) private var context
@Environment(UserPreferences.self) private var preferences @Environment(UserPreferences.self) private var preferences
#if targetEnvironment(macCatalyst) #if targetEnvironment(macCatalyst)
@Environment(\.dismissWindow) private var dismissWindow @Environment(\.dismissWindow) private var dismissWindow
#else #else
@Environment(\.dismiss) private var dismiss @Environment(\.dismiss) private var dismiss
#endif #endif
var body: some ToolbarContent { var body: some ToolbarContent {
ToolbarItem(placement: .navigationBarTrailing) { ToolbarItem(placement: .navigationBarTrailing) {
@ -81,18 +81,18 @@ struct StatusEditorToolbarItems: ToolbarContent {
private func postStatus(with model: StatusEditorViewModel, isMainPost: Bool) async -> Status? { private func postStatus(with model: StatusEditorViewModel, isMainPost: Bool) async -> Status? {
let status = await model.postStatus() let status = await model.postStatus()
if status != nil && isMainPost { if status != nil, isMainPost {
close() close()
SoundEffectManager.shared.playSound(.tootSent) SoundEffectManager.shared.playSound(.tootSent)
NotificationCenter.default.post(name: .shareSheetClose, object: nil) NotificationCenter.default.post(name: .shareSheetClose, object: nil)
#if !targetEnvironment(macCatalyst) #if !targetEnvironment(macCatalyst)
if !mainSEVM.mode.isInShareExtension, !preferences.requestedReview { if !mainSEVM.mode.isInShareExtension, !preferences.requestedReview {
if let scene = UIApplication.shared.connectedScenes.first(where: { $0.activationState == .foregroundActive }) as? UIWindowScene { if let scene = UIApplication.shared.connectedScenes.first(where: { $0.activationState == .foregroundActive }) as? UIWindowScene {
SKStoreReviewController.requestReview(in: scene) SKStoreReviewController.requestReview(in: scene)
} }
preferences.requestedReview = true preferences.requestedReview = true
} }
#endif #endif
} }
return status return status
@ -109,11 +109,11 @@ struct StatusEditorToolbarItems: ToolbarContent {
} }
} }
#if targetEnvironment(macCatalyst) #if targetEnvironment(macCatalyst)
private func close() { dismissWindow() } private func close() { dismissWindow() }
#else #else
private func close() { dismiss() } private func close() { dismiss() }
#endif #endif
@ViewBuilder @ViewBuilder
private var languageConfirmationDialog: some View { private var languageConfirmationDialog: some View {

5
Packages/Status/Sources/Status/Editor/StatusEditorView.swift
View file

@ -38,7 +38,7 @@ public struct StatusEditorView: View {
} }
public var body: some View { public var body: some View {
@Bindable var focusedSEVM = self.focusedSEVM @Bindable var focusedSEVM = focusedSEVM
NavigationStack { NavigationStack {
ScrollView { ScrollView {
@ -93,7 +93,8 @@ public struct StatusEditorView: View {
Button("OK") {} Button("OK") {}
}, message: { }, message: {
Text(mainSEVM.postingError ?? "") Text(mainSEVM.postingError ?? "")
}) }
)
.interactiveDismissDisabled(mainSEVM.shouldDisplayDismissWarning) .interactiveDismissDisabled(mainSEVM.shouldDisplayDismissWarning)
.onChange(of: appAccounts.currentClient) { _, newValue in .onChange(of: appAccounts.currentClient) { _, newValue in
if mainSEVM.mode.isInShareExtension { if mainSEVM.mode.isInShareExtension {

56
Packages/Status/Sources/Status/Editor/StatusEditorViewModel.swift
View file

@ -94,7 +94,7 @@ import SwiftUI
let removedIDs = oldValue let removedIDs = oldValue
.filter { !mediaPickers.contains($0) } .filter { !mediaPickers.contains($0) }
.compactMap { $0.itemIdentifier } .compactMap(\.itemIdentifier)
mediaContainers.removeAll { removedIDs.contains($0.id) } mediaContainers.removeAll { removedIDs.contains($0.id) }
let newPickerItems = mediaPickers.filter { !oldValue.contains($0) } let newPickerItems = mediaPickers.filter { !oldValue.contains($0) }
@ -297,7 +297,8 @@ import SwiftUI
movieTransferable: nil, movieTransferable: nil,
gifTransferable: nil, gifTransferable: nil,
mediaAttachment: $0, mediaAttachment: $0,
error: nil) error: nil
)
} }
case let .quote(status): case let .quote(status):
embeddedStatus = status embeddedStatus = status
@ -405,7 +406,8 @@ import SwiftUI
movieTransferable: nil, movieTransferable: nil,
gifTransferable: nil, gifTransferable: nil,
mediaAttachment: nil, mediaAttachment: nil,
error: nil) error: nil
)
prepareToPost(for: container) prepareToPost(for: container)
} }
@ -428,7 +430,8 @@ import SwiftUI
movieTransferable: nil, movieTransferable: nil,
gifTransferable: nil, gifTransferable: nil,
mediaAttachment: nil, mediaAttachment: nil,
error: nil) error: nil
)
prepareToPost(for: container) prepareToPost(for: container)
} else if let content = content as? ImageFileTranseferable, } else if let content = content as? ImageFileTranseferable,
let compressedData = await compressor.compressImageFrom(url: content.url), let compressedData = await compressor.compressImageFrom(url: content.url),
@ -440,7 +443,8 @@ import SwiftUI
movieTransferable: nil, movieTransferable: nil,
gifTransferable: nil, gifTransferable: nil,
mediaAttachment: nil, mediaAttachment: nil,
error: nil) error: nil
)
prepareToPost(for: container) prepareToPost(for: container)
} else if let video = content as? MovieFileTranseferable { } else if let video = content as? MovieFileTranseferable {
let container = StatusEditorMediaContainer( let container = StatusEditorMediaContainer(
@ -449,7 +453,8 @@ import SwiftUI
movieTransferable: video, movieTransferable: video,
gifTransferable: nil, gifTransferable: nil,
mediaAttachment: nil, mediaAttachment: nil,
error: nil) error: nil
)
prepareToPost(for: container) prepareToPost(for: container)
} else if let gif = content as? GifFileTranseferable { } else if let gif = content as? GifFileTranseferable {
let container = StatusEditorMediaContainer( let container = StatusEditorMediaContainer(
@ -458,7 +463,8 @@ import SwiftUI
movieTransferable: nil, movieTransferable: nil,
gifTransferable: gif, gifTransferable: gif,
mediaAttachment: nil, mediaAttachment: nil,
error: nil) error: nil
)
prepareToPost(for: container) prepareToPost(for: container)
} }
} catch { } catch {
@ -619,7 +625,8 @@ import SwiftUI
movieTransferable: nil, movieTransferable: nil,
gifTransferable: gifFile, gifTransferable: gifFile,
mediaAttachment: nil, mediaAttachment: nil,
error: nil) error: nil
)
} }
private static func makeMovieContainer(from pickerItem: PhotosPickerItem) async -> StatusEditorMediaContainer? { private static func makeMovieContainer(from pickerItem: PhotosPickerItem) async -> StatusEditorMediaContainer? {
@ -631,7 +638,8 @@ import SwiftUI
movieTransferable: movieFile, movieTransferable: movieFile,
gifTransferable: nil, gifTransferable: nil,
mediaAttachment: nil, mediaAttachment: nil,
error: nil) error: nil
)
} }
private static func makeImageContainer(from pickerItem: PhotosPickerItem) async -> StatusEditorMediaContainer? { private static func makeImageContainer(from pickerItem: PhotosPickerItem) async -> StatusEditorMediaContainer? {
@ -649,7 +657,8 @@ import SwiftUI
movieTransferable: nil, movieTransferable: nil,
gifTransferable: nil, gifTransferable: nil,
mediaAttachment: nil, mediaAttachment: nil,
error: nil) error: nil
)
} }
func upload(container: StatusEditorMediaContainer) async { func upload(container: StatusEditorMediaContainer) async {
@ -662,7 +671,8 @@ import SwiftUI
movieTransferable: originalContainer.movieTransferable, movieTransferable: originalContainer.movieTransferable,
gifTransferable: nil, gifTransferable: nil,
mediaAttachment: nil, mediaAttachment: nil,
error: nil) error: nil
)
mediaContainers[index] = newContainer mediaContainers[index] = newContainer
do { do {
let compressor = StatusEditorCompressor() let compressor = StatusEditorCompressor()
@ -676,7 +686,8 @@ import SwiftUI
movieTransferable: nil, movieTransferable: nil,
gifTransferable: nil, gifTransferable: nil,
mediaAttachment: uploadedMedia, mediaAttachment: uploadedMedia,
error: nil) error: nil
)
} }
if let uploadedMedia, uploadedMedia.url == nil { if let uploadedMedia, uploadedMedia.url == nil {
scheduleAsyncMediaRefresh(mediaAttachement: uploadedMedia) scheduleAsyncMediaRefresh(mediaAttachement: uploadedMedia)
@ -693,7 +704,8 @@ import SwiftUI
movieTransferable: originalContainer.movieTransferable, movieTransferable: originalContainer.movieTransferable,
gifTransferable: nil, gifTransferable: nil,
mediaAttachment: uploadedMedia, mediaAttachment: uploadedMedia,
error: nil) error: nil
)
} }
if let uploadedMedia, uploadedMedia.url == nil { if let uploadedMedia, uploadedMedia.url == nil {
scheduleAsyncMediaRefresh(mediaAttachement: uploadedMedia) scheduleAsyncMediaRefresh(mediaAttachement: uploadedMedia)
@ -707,7 +719,8 @@ import SwiftUI
movieTransferable: nil, movieTransferable: nil,
gifTransferable: originalContainer.gifTransferable, gifTransferable: originalContainer.gifTransferable,
mediaAttachment: uploadedMedia, mediaAttachment: uploadedMedia,
error: nil) error: nil
)
} }
if let uploadedMedia, uploadedMedia.url == nil { if let uploadedMedia, uploadedMedia.url == nil {
scheduleAsyncMediaRefresh(mediaAttachement: uploadedMedia) scheduleAsyncMediaRefresh(mediaAttachement: uploadedMedia)
@ -721,7 +734,8 @@ import SwiftUI
movieTransferable: nil, movieTransferable: nil,
gifTransferable: nil, gifTransferable: nil,
mediaAttachment: nil, mediaAttachment: nil,
error: error) error: error
)
} }
} }
} }
@ -747,7 +761,8 @@ import SwiftUI
movieTransferable: oldContainer.movieTransferable, movieTransferable: oldContainer.movieTransferable,
gifTransferable: oldContainer.gifTransferable, gifTransferable: oldContainer.gifTransferable,
mediaAttachment: newAttachement, mediaAttachment: newAttachement,
error: nil) error: nil
)
} }
} catch { } catch {
print(error.localizedDescription) print(error.localizedDescription)
@ -770,7 +785,8 @@ import SwiftUI
movieTransferable: nil, movieTransferable: nil,
gifTransferable: nil, gifTransferable: nil,
mediaAttachment: media, mediaAttachment: media,
error: nil) error: nil
)
} catch { print(error) } } catch { print(error) }
} }
} }
@ -815,9 +831,9 @@ import SwiftUI
return dict return dict
}.sorted(by: { lhs, rhs in }.sorted(by: { lhs, rhs in
if rhs.key == "Uncategorized" { return false } if rhs.key == "Uncategorized" { false }
else if lhs.key == "Uncategorized" { return true } else if lhs.key == "Uncategorized" { true }
else { return lhs.key < rhs.key } else { lhs.key < rhs.key }
}).forEach { key, value in }).forEach { key, value in
emojiContainers.append(.init(categoryName: key, emojis: value)) emojiContainers.append(.init(categoryName: key, emojis: value))
} }

5
Packages/Status/Sources/Status/Editor/UITextView/Coordinator.swift
View file

@ -45,10 +45,9 @@ extension TextView.Representable {
textView.allowsEditingTextAttributes = false textView.allowsEditingTextAttributes = false
textView.returnKeyType = .default textView.returnKeyType = .default
textView.allowsEditingTextAttributes = true textView.allowsEditingTextAttributes = true
#if targetEnvironment(macCatalyst) #if targetEnvironment(macCatalyst)
textView.inlinePredictionType = .no textView.inlinePredictionType = .no
#endif #endif
self.getTextView?(textView) self.getTextView?(textView)
} }

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

@ -36,7 +36,7 @@ public struct StatusRowView: View {
HStack(spacing: 0) { HStack(spacing: 0) {
if !isCompact { if !isCompact {
HStack(spacing: 3) { HStack(spacing: 3) {
ForEach(0..<indentationLevel, id: \.self) { level in ForEach(0 ..< indentationLevel, id: \.self) { level in
Rectangle() Rectangle()
.fill(theme.tintColor) .fill(theme.tintColor)
.frame(width: 2) .frame(width: 2)
@ -225,13 +225,14 @@ public struct StatusRowView: View {
Button("accessibility.status.media-viewer-action.label") { Button("accessibility.status.media-viewer-action.label") {
HapticManager.shared.fireHaptic(.notification(.success)) HapticManager.shared.fireHaptic(.notification(.success))
let attachments = viewModel.finalStatus.mediaAttachments let attachments = viewModel.finalStatus.mediaAttachments
#if targetEnvironment(macCatalyst) #if targetEnvironment(macCatalyst)
openWindow(value: WindowDestinationMedia.mediaViewer( openWindow(value: WindowDestinationMedia.mediaViewer(
attachments: attachments, attachments: attachments,
selectedAttachment: attachments[0])) selectedAttachment: attachments[0]
#else ))
#else
quickLook.prepareFor(selectedMediaAttachment: attachments[0], mediaAttachments: attachments) quickLook.prepareFor(selectedMediaAttachment: attachments[0], mediaAttachments: attachments)
#endif #endif
} }
} }

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

@ -201,7 +201,7 @@ import SwiftUI
} }
func goToParent() { func goToParent() {
guard let id = status.inReplyToId else {return} guard let id = status.inReplyToId else { return }
if let _ = scrollToId { if let _ = scrollToId {
scrollToId?.wrappedValue = id scrollToId?.wrappedValue = id
} else { } else {

6
Packages/Status/Sources/Status/Row/Subviews/StatusRowActionsView.swift
View file

@ -205,11 +205,11 @@ struct StatusRowActionsView: View {
switch action { switch action {
case .respond: case .respond:
SoundEffectManager.shared.playSound(.share) SoundEffectManager.shared.playSound(.share)
#if targetEnvironment(macCatalyst) #if targetEnvironment(macCatalyst)
openWindow(value: WindowDestinationEditor.replyToStatusEditor(status: viewModel.localStatus ?? viewModel.status)) openWindow(value: WindowDestinationEditor.replyToStatusEditor(status: viewModel.localStatus ?? viewModel.status))
#else #else
viewModel.routerPath.presentedSheet = .replyToStatusEditor(status: viewModel.localStatus ?? viewModel.status) viewModel.routerPath.presentedSheet = .replyToStatusEditor(status: viewModel.localStatus ?? viewModel.status)
#endif #endif
case .favorite: case .favorite:
SoundEffectManager.shared.playSound(.favorite) SoundEffectManager.shared.playSound(.favorite)
await statusDataController.toggleFavorite(remoteStatus: viewModel.localStatusId) await statusDataController.toggleFavorite(remoteStatus: viewModel.localStatusId)

10
Packages/Status/Sources/Status/Row/Subviews/StatusRowCardView.swift
View file

@ -5,6 +5,7 @@ import NukeUI
import Shimmer import Shimmer
import SwiftUI import SwiftUI
@MainActor
public struct StatusRowCardView: View { public struct StatusRowCardView: View {
@Environment(\.openURL) private var openURL @Environment(\.openURL) private var openURL
@Environment(\.isInCaptureMode) private var isInCaptureMode: Bool @Environment(\.isInCaptureMode) private var isInCaptureMode: Bool
@ -46,7 +47,7 @@ public struct StatusRowCardView: View {
} label: { } label: {
if let title = card.title, let url = URL(string: card.url) { if let title = card.title, let url = URL(string: card.url) {
VStack(alignment: .leading) { VStack(alignment: .leading) {
let sitesWithIcons = [ "apps.apple.com", "music.apple.com", "open.spotify.com" ] let sitesWithIcons = ["apps.apple.com", "music.apple.com", "open.spotify.com"]
if let host = url.host(), sitesWithIcons.contains(host) { if let host = url.host(), sitesWithIcons.contains(host) {
iconLinkPreview(title, url) iconLinkPreview(title, url)
} else { } else {
@ -83,9 +84,8 @@ public struct StatusRowCardView: View {
.buttonStyle(.plain) .buttonStyle(.plain)
} }
@MainActor @ViewBuilder
private func defaultLinkPreview(_ title: String, _ url: URL) -> some View { private func defaultLinkPreview(_ title: String, _ url: URL) -> some View {
Group {
if let imageURL = card.image, !isInCaptureMode { if let imageURL = card.image, !isInCaptureMode {
LazyResizableImage(url: imageURL) { state, proxy in LazyResizableImage(url: imageURL) { state, proxy in
let width = imageWidthFor(proxy: proxy) let width = imageWidthFor(proxy: proxy)
@ -125,14 +125,12 @@ public struct StatusRowCardView: View {
Spacer() Spacer()
}.padding(16) }.padding(16)
} }
}
@MainActor
private func iconLinkPreview(_ title: String, _ url: URL) -> some View { private func iconLinkPreview(_ title: String, _ url: URL) -> some View {
// ..where the image is known to be a square icon // ..where the image is known to be a square icon
HStack { HStack {
if let imageURL = card.image, !isInCaptureMode { if let imageURL = card.image, !isInCaptureMode {
LazyResizableImage(url: imageURL) { state, proxy in LazyResizableImage(url: imageURL) { state, _ in
if let image = state.image { if let image = state.image {
image image
.resizable() .resizable()

24
Packages/Status/Sources/Status/Row/Subviews/StatusRowContextMenu.swift
View file

@ -55,20 +55,20 @@ struct StatusRowContextMenu: View {
systemImage: "bookmark") systemImage: "bookmark")
} }
Button { Button {
#if targetEnvironment(macCatalyst) #if targetEnvironment(macCatalyst)
openWindow(value: WindowDestinationEditor.replyToStatusEditor(status: viewModel.status)) openWindow(value: WindowDestinationEditor.replyToStatusEditor(status: viewModel.status))
#else #else
viewModel.routerPath.presentedSheet = .replyToStatusEditor(status: viewModel.status) viewModel.routerPath.presentedSheet = .replyToStatusEditor(status: viewModel.status)
#endif #endif
} label: { } label: {
Label("status.action.reply", systemImage: "arrowshape.turn.up.left") Label("status.action.reply", systemImage: "arrowshape.turn.up.left")
} }
Button { Button {
#if targetEnvironment(macCatalyst) #if targetEnvironment(macCatalyst)
openWindow(value: WindowDestinationEditor.quoteStatusEditor(status: viewModel.status)) openWindow(value: WindowDestinationEditor.quoteStatusEditor(status: viewModel.status))
#else #else
viewModel.routerPath.presentedSheet = .quoteStatusEditor(status: viewModel.status) viewModel.routerPath.presentedSheet = .quoteStatusEditor(status: viewModel.status)
#endif #endif
} label: { } label: {
Label("status.action.quote", systemImage: "quote.bubble") Label("status.action.quote", systemImage: "quote.bubble")
} }
@ -171,11 +171,11 @@ struct StatusRowContextMenu: View {
} }
if currentInstance.isEditSupported { if currentInstance.isEditSupported {
Button { Button {
#if targetEnvironment(macCatalyst) #if targetEnvironment(macCatalyst)
openWindow(value: WindowDestinationEditor.editStatusEditor(status: viewModel.status.reblogAsAsStatus ?? viewModel.status)) openWindow(value: WindowDestinationEditor.editStatusEditor(status: viewModel.status.reblogAsAsStatus ?? viewModel.status))
#else #else
viewModel.routerPath.presentedSheet = .editStatusEditor(status: viewModel.status.reblogAsAsStatus ?? viewModel.status) viewModel.routerPath.presentedSheet = .editStatusEditor(status: viewModel.status.reblogAsAsStatus ?? viewModel.status)
#endif #endif
} label: { } label: {
Label("status.action.edit", systemImage: "pencil") Label("status.action.edit", systemImage: "pencil")
} }
@ -307,7 +307,7 @@ struct SelectTextView: View {
struct SelectableText: UIViewRepresentable { struct SelectableText: UIViewRepresentable {
let content: AttributedString let content: AttributedString
func makeUIView(context: Context) -> UITextView { func makeUIView(context _: Context) -> UITextView {
let attributedText = NSMutableAttributedString(content) let attributedText = NSMutableAttributedString(content)
attributedText.addAttribute( attributedText.addAttribute(
.font, .font,
@ -323,6 +323,6 @@ struct SelectableText: UIViewRepresentable {
return textView return textView
} }
func updateUIView(_ uiView: UITextView, context: Context) {} func updateUIView(_: UITextView, context _: Context) {}
func makeCoordinator() -> Void {} func makeCoordinator() {}
} }

12
Packages/Status/Sources/Status/Row/Subviews/StatusRowMediaPreviewView.swift
View file

@ -102,19 +102,19 @@ public struct StatusRowMediaPreviewView: View {
} }
private func tabAction(for index: Int) { private func tabAction(for index: Int) {
#if targetEnvironment(macCatalyst) #if targetEnvironment(macCatalyst)
openWindow( openWindow(
value: WindowDestinationMedia.mediaViewer( value: WindowDestinationMedia.mediaViewer(
attachments: attachments, attachments: attachments,
selectedAttachment: attachments[index] selectedAttachment: attachments[index]
) )
) )
#else #else
quickLook.prepareFor( quickLook.prepareFor(
selectedMediaAttachment: attachments[index], selectedMediaAttachment: attachments[index],
mediaAttachments: attachments mediaAttachments: attachments
) )
#endif #endif
} }
private static func accessibilityLabel(for attachment: MediaAttachment) -> Text { private static func accessibilityLabel(for attachment: MediaAttachment) -> Text {
@ -137,10 +137,10 @@ private struct MediaPreview: View {
@Environment(\.isCompact) private var isCompact: Bool @Environment(\.isCompact) private var isCompact: Bool
var body: some View { var body: some View {
GeometryReader { proxy in GeometryReader { _ in
switch displayData.type { switch displayData.type {
case .image: case .image:
LazyResizableImage(url: displayData.previewUrl) { state, proxy in LazyResizableImage(url: displayData.previewUrl) { state, _ in
if let image = state.image { if let image = state.image {
image image
.resizable() .resizable()
@ -247,7 +247,7 @@ private struct FeaturedImagePreView: View {
let boxWidth = availableWidth - appLayoutWidth let boxWidth = availableWidth - appLayoutWidth
let boxHeight = availableHeight * 0.8 // use only 80% of window height to leave room for text let boxHeight = availableHeight * 0.8 // use only 80% of window height to leave room for text
if from.width <= boxWidth && from.height <= boxHeight { if from.width <= boxWidth, from.height <= boxHeight {
// intrinsic size of image fits just fine // intrinsic size of image fits just fine
return from return from
} }

2
Packages/Status/Sources/Status/Row/Subviews/StatusRowReplyView.swift
View file

@ -17,7 +17,7 @@ struct StatusRowReplyView: View {
.accessibilityLabel( .accessibilityLabel(
Text("status.row.was-reply \(mention.username)") Text("status.row.was-reply \(mention.username)")
) )
} else if viewModel.isThread && accountId == viewModel.status.account.id { } else if viewModel.isThread, accountId == viewModel.status.account.id {
HStack(spacing: 2) { HStack(spacing: 2) {
Image(systemName: "quote.opening") Image(systemName: "quote.opening")
Text("status.row.is-thread") Text("status.row.is-thread")

2
Packages/Status/Sources/Status/Row/Subviews/StatusRowTagView.swift
View file

@ -1,6 +1,6 @@
import DesignSystem import DesignSystem
import SwiftUI
import Env import Env
import SwiftUI
struct StatusRowTagView: View { struct StatusRowTagView: View {
@Environment(CurrentAccount.self) private var currentAccount @Environment(CurrentAccount.self) private var currentAccount

2
Packages/Timeline/Sources/Timeline/TimelineView.swift
View file

@ -1,3 +1,4 @@
import Charts
import DesignSystem import DesignSystem
import Env import Env
import Models import Models
@ -7,7 +8,6 @@ import Status
import SwiftData import SwiftData
import SwiftUI import SwiftUI
import SwiftUIIntrospect import SwiftUIIntrospect
import Charts
@MainActor @MainActor
public struct TimelineView: View { public struct TimelineView: View {

2
Packages/Timeline/Sources/Timeline/TimelineViewModel.swift
View file

@ -202,7 +202,7 @@ extension TimelineViewModel: StatusesFetcher {
// Else we fetch top most page from the API. // Else we fetch top most page from the API.
if let cachedStatuses = await getCachedStatuses(), if let cachedStatuses = await getCachedStatuses(),
!cachedStatuses.isEmpty, !cachedStatuses.isEmpty,
timeline == .home && !UserPreferences.shared.fastRefreshEnabled timeline == .home, !UserPreferences.shared.fastRefreshEnabled
{ {
await datasource.set(cachedStatuses) await datasource.set(cachedStatuses)
if let latestSeenId = await cache.getLatestSeenStatus(for: client)?.last, if let latestSeenId = await cache.getLatestSeenStatus(for: client)?.last,