shadowfacts/Tusker
1
10
Fork 2
Code Issues 74 Pull Requests Releases Wiki Activity

Cache images for MenuPickers, minor perf optimization when opening compose screen

Browse Source
This commit is contained in:
Shadowfacts 2025-02-26 00:12:34 -05:00
parent dc7eaf5ada
commit c5cc959014
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Packages/ComposeUI/Sources/ComposeUI/Views/ComposeToolbarView.swift
View File

@ -118,6 +118,12 @@ private struct ContentWarningButton: View {
} }
private struct VisibilityButton: View { private struct VisibilityButton: View {
private static var allOptions: [MenuPicker<Pachyderm.Visibility>.Option] {
Pachyderm.Visibility.allCases.map { vis in
.init(value: vis, title: vis.displayName, subtitle: vis.subtitle, image: UIImage(systemName: vis.unfilledImageName), accessibilityLabel: "Visibility: \(vis.displayName)")
}
}
@ObservedObject var draft: Draft @ObservedObject var draft: Draft
@ObservedObject var instanceFeatures: InstanceFeatures @ObservedObject var instanceFeatures: InstanceFeatures
@ -133,14 +139,10 @@ private struct VisibilityButton: View {
} }
private var visibilityOptions: [MenuPicker<Pachyderm.Visibility>.Option] { private var visibilityOptions: [MenuPicker<Pachyderm.Visibility>.Option] {
let visibilities: [Pachyderm.Visibility]
if !instanceFeatures.composeDirectStatuses { if !instanceFeatures.composeDirectStatuses {
visibilities = [.public, .unlisted, .private] Self.allOptions.filter { $0.value != .direct }
} else { } else {
visibilities = Pachyderm.Visibility.allCases Self.allOptions
}
return visibilities.map { vis in
.init(value: vis, title: vis.displayName, subtitle: vis.subtitle, image: UIImage(systemName: vis.unfilledImageName), accessibilityLabel: "Visibility: \(vis.displayName)")
} }
} }
@ -152,6 +154,9 @@ private struct VisibilityButton: View {
} }
private struct LocalOnlyButton: View { private struct LocalOnlyButton: View {
private static let localOnlyImage = UIImage(named: "link.broken")!
private static let federatedImage = UIImage(systemName: "link")!
@Binding var enabled: Bool @Binding var enabled: Bool
var mastodonController: any ComposeMastodonContext var mastodonController: any ComposeMastodonContext
@ObservedObject private var instanceFeatures: InstanceFeatures @ObservedObject private var instanceFeatures: InstanceFeatures
@ -165,8 +170,8 @@ private struct LocalOnlyButton: View {
private var options: [MenuPicker<Bool>.Option] { private var options: [MenuPicker<Bool>.Option] {
let domain = mastodonController.accountInfo!.instanceURL.host! let domain = mastodonController.accountInfo!.instanceURL.host!
return [ return [
.init(value: true, title: "Local-only", subtitle: "Only \(domain)", image: UIImage(named: "link.broken")), .init(value: true, title: "Local-only", subtitle: "Only \(domain)", image: Self.localOnlyImage),
.init(value: false, title: "Federated", image: UIImage(systemName: "link")), .init(value: false, title: "Federated", image: Self.federatedImage),
] ]
} }