nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-17 20:49:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Using SFSymbols where possible instead of custom icons

Browse Source
This commit is contained in:
Michael Starke
2021-02-03 20:29:57 +01:00
parent d0f8c3eafb
commit fa1094632e
1 changed files with 171 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

340
MacPass/MPIconHelper.m
View File

@@ -28,16 +28,18 @@
@implementation MPIconHelper @implementation MPIconHelper
+ (NSImage *)icon:(MPIconType)type { + (NSImage *)icon:(MPIconType)type {
static NSDictionary *symbols; if (@available(macOS 11.0, *)) {
static NSDictionary *symbols;
if(!symbols) { if(!symbols) {
symbols = MPIconHelper.availableSymbolNames; symbols = MPIconHelper.availableSymbolNames;
} }
if([symbols.allKeys containsObject:@(type)]) { if([symbols.allKeys containsObject:@(type)]) {
NSString *imageName = symbols[@(type)]; NSString *imageName = symbols[@(type)];
NSImage *image = [NSImage imageWithSystemSymbolName:imageName accessibilityDescription:nil];
if(image) { NSImage *image = [NSImage imageWithSystemSymbolName:imageName accessibilityDescription:nil];
return image; if(image) {
return image;
}
} }
} }
@@ -103,86 +105,86 @@
static dispatch_once_t onceToken; static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{ dispatch_once(&onceToken, ^{
symbolNames = @{ symbolNames = @{
@(MPIconPassword): @"ellipsis.rectangle", @(MPIconPassword) : @"ellipsis.rectangle",
@(MPIconPackageNetwork): @"globe", @(MPIconPackageNetwork) : @"globe",
@(MPIconWarning): @"exclamationmark.circle", @(MPIconWarning) : @"exclamationmark.triangle",
@(MPIconServer): @"macpro.gen3.server", @(MPIconServer) : @"server.rack",
@(MPIconKlipper): @"paperclip", @(MPIconKlipper) : @"pin",
@(MPIconLanguages): @"mouth", @(MPIconLanguages) : @"mouth",
@(MPIconBlockDevice): @"06_BlockDeviceTemplate", @(MPIconBlockDevice) : @"gearshape.2",
@(MPIconNotepad): @"07_NotepadTemplate", @(MPIconNotepad) : @"note.text",
@(MPIconSocket): @"08_SocketTemplate", @(MPIconSocket) : @"rectangle.connected.to.line.below",
@(MPIconIdentity): @"09_IdentityTemplate", @(MPIconIdentity) : @"person.crop.square.fill.and.at.rectangle",
@(MPIconContact): @"10_ContactTemplate", @(MPIconContact) : @"at",
@(MPIconCamera): @"11_CameraTemplate", @(MPIconCamera) : @"camera",
@(MPIconRemote): @"12_RemoteTemplate", @(MPIconRemote) : @"icloud.fill",
@(MPIconKeys): @"key", @(MPIconKeys) : @"key",
@(MPIconBattery): @"14_BatteryTemplate", @(MPIconBattery) : @"bolt.fill.batteryblock",
@(MPIconScanner): @"15_ScannerTemplate", @(MPIconScanner) : @"scanner",
@(MPIconBrowser): @"16_BrowserTemplate", @(MPIconBrowser) : @"safari",
@(MPIconCDRom): @"17_CDRomTemplate", @(MPIconCDRom) : @"opticaldisc",
@(MPIconDisplay): @"18_DisplayTemplate", @(MPIconDisplay) : @"display",
@(MPIconEmail): @"19_EmailTemplate", @(MPIconEmail) : @"envelope",
@(MPIconMisc): @"20_MiscTemplate", @(MPIconMisc) : @"ellipsis.circle",
@(MPIconOrganizer): @"21_OrganizerTemplate", @(MPIconOrganizer) : @"list.number",
@(MPIconASCII): @"22_ASCIITemplate", @(MPIconASCII) : @"doc.text",
@(MPIconIcons): @"23_IconsTemplate", @(MPIconIcons) : @"square.grid.3x3.fill.square",
@(MPIconEstablishedConnection): @"24_EstablishedConnectionTemplate", @(MPIconEstablishedConnection) : @"bolt",
@(MPIconMailFolder): @"25_MailFolderTemplate", @(MPIconMailFolder) : @"tray.full",
@(MPIconFileSave): @"26_FileSaveTemplate", @(MPIconFileSave) : @"square.and.arrow.down",
@(MPIconNFSUnmount) :@"27_NFSUnmountTemplate", @(MPIconNFSUnmount) : @"externaldrive.connected.to.line.below",
@(MPIconQuickTime) : @"28_QuickTimeTemplate", @(MPIconQuickTime) : @"film",
@(MPIconSecureTerminal) : @"29_SecureTerminalTemplate", @(MPIconSecureTerminal) : @"terminal",
@(MPIconTerminal) : @"30_TerminalTemplate", @(MPIconTerminal) : @"terminal",
@(MPIconPrint) : @"31_PrintTemplate", @(MPIconPrint) : @"printer",
@(MPIconFileSystemView) : @"32_FileSystemViewTemplate", @(MPIconFileSystemView) : @"square.grid.2x2",
@(MPIconRun) : @"33_RunTemplate", @(MPIconRun) : @"figure.walk.diamond",
@(MPIconConfigure) : @"34_ConfigureTemplate", @(MPIconConfigure) : @"slider.vertical.3",
@(MPIconBrowserWindow) : @"35_BrowserWindowTemplate", @(MPIconBrowserWindow) : @"macwindow",
@(MPIconArchive) : @"36_ArchiveTemplate", @(MPIconArchive) : @"doc.zipper",
@(MPIconPercentage) : @"37_PercentageTemplate", @(MPIconPercentage) : @"percent",
@(MPIconSambaUnmount) : @"38_SambaUnmountTemplate", @(MPIconSambaUnmount) : @"externaldrive.badge.xmark",
@(MPIconHistory) : @"39_HistoryTemplate", @(MPIconHistory) : @"clock.arrow.circlepath",
@(MPIconFindMail) : @"40_FindMailTemplate", @(MPIconFindMail) : @"mail.and.text.magnifyingglass",
@(MPIconVector) : @"41_VectorTemplate", @(MPIconVector) : @"skew",
@(MPIconMemory) : @"42_MemoryTemplate", @(MPIconMemory) : @"memorychip",
@(MPIconTrash): @"43_TrashTemplate", @(MPIconTrash) : @"trash",
@(MPIconNotes) : @"44_NotesTemplate", @(MPIconNotes) : @"note.text",
@(MPIconCancel) : @"45_CancelTemplate", @(MPIconCancel) : @"xmark.circle",
@(MPIconHelp) : @"46_HelpTemplate", @(MPIconHelp) : @"questionmark.circle.fill",
@(MPIconPackage) : @"47_PackageTemplate", @(MPIconPackage) : @"shippingbox",
@(MPIconFolder): @"48_FolderTemplate", @(MPIconFolder) : @"folder",
@(MPIconFolderOpen) : @"49_FolderOpenTemplate", @(MPIconFolderOpen) : @"folder",
@(MPIconFolderTar) : @"50_FolderTarTemplate", @(MPIconFolderTar) : @"archivebox",
@(MPIconDecrypted) : @"51_DecryptedTemplate", @(MPIconDecrypted) : @"lock.open",
@(MPIconEncrypted) : @"52_EncryptedTemplate", @(MPIconEncrypted) : @"lock",
@(MPIconApply) : @"53_ApplyTemplate", @(MPIconApply) : @"checkmark.square",
@(MPIconSignature) : @"54_SignatureTemplate", @(MPIconSignature) : @"signature",
@(MPIconThumbnail) : @"55_ThumbnailTemplate", @(MPIconThumbnail) : @"photo",
@(MPIconAddressBook) : @"56_AddressBookTemplate", @(MPIconAddressBook) : @"rectangle.stack.person.crop",
@(MPIconTextView) : @"57_TextViewTemplate", @(MPIconTextView) : @"text.justifyleft",
@(MPIconSecureAccount) : @"58_SecureAccountTemplate", @(MPIconSecureAccount) : @"person.fill.viewfinder",
@(MPIconDevelopment) : @"59_DevelopmentTemplate", @(MPIconDevelopment) : @"hammer",
@(MPIconHome) : @"60_HomeTemplate", @(MPIconHome) : @"house",
@(MPIconServices) : @"61_ServicesTemplate", @(MPIconServices) : @"star",
@(MPIconTux) : @"62_TuxTemplate", @(MPIconTux) : @"ladybug",
@(MPIconFeather) : @"63_FeatherTemplate", @(MPIconFeather) : @"lightbulb",
@(MPIconApple) : @"64_AppleTemplate", @(MPIconApple) : @"applelogo",
@(MPIconWiki) : @"65_WikiTemplate", @(MPIconWiki) : @"w.circle",
@(MPIconMoney) : @"66_MoneyTemplate", @(MPIconMoney) : @"dollarsign.circle",
@(MPIconCertificat) : @"67_CertificatTemplate", @(MPIconCertificat) : @"signature", // FIXME: find better icon
@(MPIconPhone): @"68_PhoneTemplate", @(MPIconPhone) : @"iphone",
/* Custom */ /* Custom */
@(MPIconInfo): @"sidebar.trailing", @(MPIconSidebar) : @"sidebar.trailing",
@(MPIconAddFolder): @"addFolderTemplate", @(MPIconAddFolder) : @"folder.badge.plus",
@(MPIconHardDisk): @"harddiskTemplate", @(MPIconHardDisk) : @"internaldrive",
@(MPIconCreated): @"createdTemplate", @(MPIconCreated) : @"staroflife", // FIXME: find better icon
@(MPIconAddEntry): @"addEntryTemplate", @(MPIconAddEntry) : @"ellipsis.rectangle", // FIXME: find better icon
@(MPIconContextTriangle): @"contextTriangleTemplate", @(MPIconContextTriangle) : @"arrowtriangle.down.fill",
@(MPIconKeyboard): @"keyboardTemplate", @(MPIconKeyboard) : @"keyboard",
@(MPIconExpiredEntry): NSImageNameCaution, @(MPIconExpiredEntry) : @"exclamationmark.octagon.fill",
@(MPIconExpiredGroup): NSImageNameCaution @(MPIconExpiredGroup) : @"exclamationmark.octagon.fill"
}; };
}); });
@@ -200,87 +202,87 @@
static dispatch_once_t onceToken; static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{ dispatch_once(&onceToken, ^{
imageNames = @{ imageNames = @{
@(MPIconPassword) : @"00_PasswordTemplate", @(MPIconPassword) : @"00_PasswordTemplate",
@(MPIconPackageNetwork) : @"01_PackageNetworkTemplate", @(MPIconPackageNetwork) : @"01_PackageNetworkTemplate",
@(MPIconWarning) : @"02_MessageBoxWarningTemplate", @(MPIconWarning) : @"02_MessageBoxWarningTemplate",
@(MPIconServer) : @"03_ServerTemplate", @(MPIconServer) : @"03_ServerTemplate",
@(MPIconKlipper) : @"04_KlipperTemplate", @(MPIconKlipper) : @"04_KlipperTemplate",
@(MPIconLanguages) : @"05_LanguagesTemplate", @(MPIconLanguages) : @"05_LanguagesTemplate",
@(MPIconBlockDevice) : @"06_BlockDeviceTemplate", @(MPIconBlockDevice) : @"06_BlockDeviceTemplate",
@(MPIconNotepad) : @"07_NotepadTemplate", @(MPIconNotepad) : @"07_NotepadTemplate",
@(MPIconSocket) : @"08_SocketTemplate", @(MPIconSocket) : @"08_SocketTemplate",
@(MPIconIdentity) : @"09_IdentityTemplate", @(MPIconIdentity) : @"09_IdentityTemplate",
@(MPIconContact) : @"10_ContactTemplate", @(MPIconContact) : @"10_ContactTemplate",
@(MPIconCamera) : @"11_CameraTemplate", @(MPIconCamera) : @"11_CameraTemplate",
@(MPIconRemote) : @"12_RemoteTemplate", @(MPIconRemote) : @"12_RemoteTemplate",
@(MPIconKeys) : @"13_KeysTemplate", @(MPIconKeys) : @"13_KeysTemplate",
@(MPIconBattery) : @"14_BatteryTemplate", @(MPIconBattery) : @"14_BatteryTemplate",
@(MPIconScanner) : @"15_ScannerTemplate", @(MPIconScanner) : @"15_ScannerTemplate",
@(MPIconBrowser) : @"16_BrowserTemplate", @(MPIconBrowser) : @"16_BrowserTemplate",
@(MPIconCDRom) : @"17_CDRomTemplate", @(MPIconCDRom) : @"17_CDRomTemplate",
@(MPIconDisplay) : @"18_DisplayTemplate", @(MPIconDisplay) : @"18_DisplayTemplate",
@(MPIconEmail) : @"19_EmailTemplate", @(MPIconEmail) : @"19_EmailTemplate",
@(MPIconMisc) : @"20_MiscTemplate", @(MPIconMisc) : @"20_MiscTemplate",
@(MPIconOrganizer) : @"21_OrganizerTemplate", @(MPIconOrganizer) : @"21_OrganizerTemplate",
@(MPIconASCII) : @"22_ASCIITemplate", @(MPIconASCII) : @"22_ASCIITemplate",
@(MPIconIcons) : @"23_IconsTemplate", @(MPIconIcons) : @"23_IconsTemplate",
@(MPIconEstablishedConnection) : @"24_EstablishedConnectionTemplate", @(MPIconEstablishedConnection) : @"24_EstablishedConnectionTemplate",
@(MPIconMailFolder) : @"25_MailFolderTemplate", @(MPIconMailFolder) : @"25_MailFolderTemplate",
@(MPIconFileSave) : @"26_FileSaveTemplate", @(MPIconFileSave) : @"26_FileSaveTemplate",
@(MPIconNFSUnmount) : @"27_NFSUnmountTemplate", @(MPIconNFSUnmount) : @"27_NFSUnmountTemplate",
@(MPIconQuickTime) : @"28_QuickTimeTemplate", @(MPIconQuickTime) : @"28_QuickTimeTemplate",
@(MPIconSecureTerminal) : @"29_SecureTerminalTemplate", @(MPIconSecureTerminal) : @"29_SecureTerminalTemplate",
@(MPIconTerminal) : @"30_TerminalTemplate", @(MPIconTerminal) : @"30_TerminalTemplate",
@(MPIconPrint) : @"31_PrintTemplate", @(MPIconPrint) : @"31_PrintTemplate",
@(MPIconFileSystemView) : @"32_FileSystemViewTemplate", @(MPIconFileSystemView) : @"32_FileSystemViewTemplate",
@(MPIconRun) : @"33_RunTemplate", @(MPIconRun) : @"33_RunTemplate",
@(MPIconConfigure) : @"34_ConfigureTemplate", @(MPIconConfigure) : @"34_ConfigureTemplate",
@(MPIconBrowserWindow) : @"35_BrowserWindowTemplate", @(MPIconBrowserWindow) : @"35_BrowserWindowTemplate",
@(MPIconArchive) : @"36_ArchiveTemplate", @(MPIconArchive) : @"36_ArchiveTemplate",
@(MPIconPercentage) : @"37_PercentageTemplate", @(MPIconPercentage) : @"37_PercentageTemplate",
@(MPIconSambaUnmount) : @"38_SambaUnmountTemplate", @(MPIconSambaUnmount) : @"38_SambaUnmountTemplate",
@(MPIconHistory) : @"39_HistoryTemplate", @(MPIconHistory) : @"39_HistoryTemplate",
@(MPIconFindMail) : @"40_FindMailTemplate", @(MPIconFindMail) : @"40_FindMailTemplate",
@(MPIconVector) : @"41_VectorTemplate", @(MPIconVector) : @"41_VectorTemplate",
@(MPIconMemory) : @"42_MemoryTemplate", @(MPIconMemory) : @"42_MemoryTemplate",
@(MPIconTrash) : @"43_TrashTemplate", @(MPIconTrash) : @"43_TrashTemplate",
@(MPIconNotes) : @"44_NotesTemplate", @(MPIconNotes) : @"44_NotesTemplate",
@(MPIconCancel) : @"45_CancelTemplate", @(MPIconCancel) : @"45_CancelTemplate",
@(MPIconHelp) : @"46_HelpTemplate", @(MPIconHelp) : @"46_HelpTemplate",
@(MPIconPackage) : @"47_PackageTemplate", @(MPIconPackage) : @"47_PackageTemplate",
@(MPIconFolder) : @"48_FolderTemplate", @(MPIconFolder) : @"48_FolderTemplate",
@(MPIconFolderOpen) : @"49_FolderOpenTemplate", @(MPIconFolderOpen) : @"49_FolderOpenTemplate",
@(MPIconFolderTar) : @"50_FolderTarTemplate", @(MPIconFolderTar) : @"50_FolderTarTemplate",
@(MPIconDecrypted) : @"51_DecryptedTemplate", @(MPIconDecrypted) : @"51_DecryptedTemplate",
@(MPIconEncrypted) : @"52_EncryptedTemplate", @(MPIconEncrypted) : @"52_EncryptedTemplate",
@(MPIconApply) : @"53_ApplyTemplate", @(MPIconApply) : @"53_ApplyTemplate",
@(MPIconSignature) : @"54_SignatureTemplate", @(MPIconSignature) : @"54_SignatureTemplate",
@(MPIconThumbnail) : @"55_ThumbnailTemplate", @(MPIconThumbnail) : @"55_ThumbnailTemplate",
@(MPIconAddressBook) : @"56_AddressBookTemplate", @(MPIconAddressBook) : @"56_AddressBookTemplate",
@(MPIconTextView) : @"57_TextViewTemplate", @(MPIconTextView) : @"57_TextViewTemplate",
@(MPIconSecureAccount) : @"58_SecureAccountTemplate", @(MPIconSecureAccount) : @"58_SecureAccountTemplate",
@(MPIconDevelopment) : @"59_DevelopmentTemplate", @(MPIconDevelopment) : @"59_DevelopmentTemplate",
@(MPIconHome) : @"60_HomeTemplate", @(MPIconHome) : @"60_HomeTemplate",
@(MPIconServices) : @"61_ServicesTemplate", @(MPIconServices) : @"61_ServicesTemplate",
@(MPIconTux) : @"62_TuxTemplate", @(MPIconTux) : @"62_TuxTemplate",
@(MPIconFeather) : @"63_FeatherTemplate", @(MPIconFeather) : @"63_FeatherTemplate",
@(MPIconApple) : @"64_AppleTemplate", @(MPIconApple) : @"64_AppleTemplate",
@(MPIconWiki) : @"65_WikiTemplate", @(MPIconWiki) : @"65_WikiTemplate",
@(MPIconMoney) : @"66_MoneyTemplate", @(MPIconMoney) : @"66_MoneyTemplate",
@(MPIconCertificat) : @"67_CertificatTemplate", @(MPIconCertificat) : @"67_CertificatTemplate",
@(MPIconPhone) : @"68_PhoneTemplate", @(MPIconPhone) : @"68_PhoneTemplate",
/* Custom */ /* Custom */
@(MPIconSidebar) : NSImageNameTouchBarGetInfoTemplate, @(MPIconSidebar) : NSImageNameTouchBarGetInfoTemplate,
@(MPIconAddFolder) : @"addFolderTemplate", @(MPIconAddFolder) : @"addFolderTemplate",
@(MPIconHardDisk) : @"harddiskTemplate", @(MPIconHardDisk) : @"harddiskTemplate",
@(MPIconCreated) : @"createdTemplate", @(MPIconCreated) : @"createdTemplate",
@(MPIconAddEntry) : @"addEntryTemplate", @(MPIconAddEntry) : @"addEntryTemplate",
@(MPIconContextTriangle) : @"contextTriangleTemplate", @(MPIconContextTriangle) : @"contextTriangleTemplate",
@(MPIconKeyboard) : @"keyboardTemplate", @(MPIconKeyboard) : @"keyboardTemplate",
@(MPIconExpiredEntry) : NSImageNameCaution, @(MPIconExpiredEntry) : NSImageNameCaution,
@(MPIconExpiredGroup) : NSImageNameCaution @(MPIconExpiredGroup) : NSImageNameCaution
}; };
}); });
return imageNames; return imageNames;
} }