Skip to content

Make the accounts popup smaller by making it just an icon. #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
uliwitness wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Make the accounts popup smaller by making it just an icon. #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af5ae9d
Make the accounts popup smaller by making it just an icon.
uliwitness Nov 6, 2022
69c02b9
Make sure placeholder image is small too.
uliwitness Nov 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Mastonaut.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,7 @@
15F9F30C232EB9E900931594 /* SuggestionWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1530428122AEC64E00489F31 /* SuggestionWindowController.xib */; };
15FD4C33223870B000D699EF /* TransientWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15FD4C32223870B000D699EF /* TransientWindow.swift */; };
15FD4C34223870B000D699EF /* TransientWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15FD4C32223870B000D699EF /* TransientWindow.swift */; };
5512395A291847DB0026C1D5 /* AuthorizedAccount+Image.swift in Sources */ = {isa = PBXBuildFile; fileRef = 55123959291847DB0026C1D5 /* AuthorizedAccount+Image.swift */; };
8018496C90237DCCDED54D8E /* Pods_Mastonaut.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 092B4EA6357A3987C4DB12B9 /* Pods_Mastonaut.framework */; };
9BF0CEF5AD6BE645406760FA /* Pods_Mastonaut__Mock_.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0D2DCB52811AC15559D8AE9 /* Pods_Mastonaut__Mock_.framework */; };
BB0D8382B9BA154D27AFBC63 /* Pods_CoreTootin.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 07C7A9AB62B40D2AFDAA70E9 /* Pods_CoreTootin.framework */; };
Expand Down Expand Up @@ -933,6 +934,7 @@
39AA9CF1114711021688EDCD /* Pods-QuickToot.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QuickToot.release.xcconfig"; path = "Target Support Files/Pods-QuickToot/Pods-QuickToot.release.xcconfig"; sourceTree = "<group>"; };
451D67EA024CBB6908731041 /* Pods-CoreTootin.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CoreTootin.debug.xcconfig"; path = "Target Support Files/Pods-CoreTootin/Pods-CoreTootin.debug.xcconfig"; sourceTree = "<group>"; };
4BCC49A8ECAB04865B510BFF /* Pods_QuickToot.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_QuickToot.framework; sourceTree = BUILT_PRODUCTS_DIR; };
55123959291847DB0026C1D5 /* AuthorizedAccount+Image.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AuthorizedAccount+Image.swift"; sourceTree = "<group>"; };
613EECFE95639DB968A362BE /* Pods-QuickToot.adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QuickToot.adhoc.xcconfig"; path = "Target Support Files/Pods-QuickToot/Pods-QuickToot.adhoc.xcconfig"; sourceTree = "<group>"; };
7AEAB27D6CB6D651C5299936 /* Pods-MastonautTests.adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MastonautTests.adhoc.xcconfig"; path = "Target Support Files/Pods-MastonautTests/Pods-MastonautTests.adhoc.xcconfig"; sourceTree = "<group>"; };
8BE1B4746437CF8AAE269D73 /* Pods-Mastonaut (Mock).adhoc.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mastonaut (Mock).adhoc.xcconfig"; path = "Target Support Files/Pods-Mastonaut (Mock)/Pods-Mastonaut (Mock).adhoc.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1546,6 +1548,7 @@
15B44D59225D0D9B00EDFDC1 /* AnnotatedURL.m */,
15BCDB12221B41CF007BFFAF /* AttachmentGroup.swift */,
15CD5BE521DEBDBE00E06C2F /* AuthorizedAccount.swift */,
55123959291847DB0026C1D5 /* AuthorizedAccount+Image.swift */,
15BC41632262AB1C00C2A150 /* ColumnMode.swift */,
15D648E82275F65A00E083F7 /* CyclicIterator.swift */,
15E973C0225A6953009CE4DF /* RelationshipSet.swift */,
Expand Down Expand Up @@ -2642,6 +2645,7 @@
1596DB44235F65A100B349B7 /* GetMACAddress.m in Sources */,
1584AA5C24D4CBF00073DC60 /* StatusInteractionPresenter.swift in Sources */,
1538FB3F2218B479006B5F78 /* ComposingPreferencesController.swift in Sources */,
5512395A291847DB0026C1D5 /* AuthorizedAccount+Image.swift in Sources */,
156C115122516B1900C54592 /* ProfileFieldsController.swift in Sources */,
15570C2722025C930030DAFB /* CardView.swift in Sources */,
15398EF722272EFA00D97406 /* NSDraggingInfo+Additions.swift in Sources */,
Expand Down
1 change: 1 addition & 0 deletions Mastonaut/Extensions/AuthorizedAccount+MenuItems.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ extension Array where Element == AuthorizedAccount
menuItem.target = target
menuItem.representedObject = account.uuid
menuItem.keyEquivalentModifierMask = itemHasKeyEquivalent ? .command : []
menuItem.image = account.avatarImage
menuItems.append(menuItem)

if currentUser == account.uuid
Expand Down
43 changes: 43 additions & 0 deletions Mastonaut/Models/AuthorizedAccount+Image.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import Foundation
import CoreTootin

private var avatarImageCache = [UUID:NSImage]()
private var resourcesFetcher = ResourcesFetcher(urlSession: AppDelegate.shared.resourcesUrlSession)

extension AuthorizedAccount {
var avatarImage: NSImage {
let placeholderImg = #imageLiteral(resourceName: "missing")

if let avatarImage = avatarImageCache[uuid] {
avatarImage.size = NSSize(width: 16, height: 16)
return avatarImage
} else if let avatarURL = avatarURL {
fetchImageOrFallback(url: avatarURL) { [weak self] image in
DispatchQueue.main.async {
guard let strongSelf = self else { return }
image.size = NSSize(width: 16, height: 16)
avatarImageCache[strongSelf.uuid] = image
}
}
} else {
placeholderImg.size = NSSize(width: 16, height: 16)
avatarImageCache[uuid] = placeholderImg
}

return placeholderImg
}

private func fetchImageOrFallback(url: URL, completion: @escaping (NSImage) -> Void)
{
resourcesFetcher.fetchImage(with: url) { (result) in
if case .success(let image) = result
{
completion(image)
}
else
{
completion(#imageLiteral(resourceName: "missing"))
}
}
}
}
1 change: 1 addition & 0 deletions Mastonaut/Window Controllers/TimelinesWindowController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1056,6 +1056,7 @@ private extension TimelinesWindowController {
let popUpButton = NonVibrantPopUpButton()
popUpButton.bezelStyle = .texturedRounded
popUpButton.translatesAutoresizingMaskIntoConstraints = false
popUpButton.imagePosition = .imageOnly;
return popUpButton
}

Expand Down