diff --git a/CodeGenerators/CodeGenerator.rb b/CodeGenerators/CodeGenerator.rb index f7440cf..4dba152 100644 --- a/CodeGenerators/CodeGenerator.rb +++ b/CodeGenerators/CodeGenerator.rb @@ -52,7 +52,7 @@ def generate_icon_map icon_map = '' @iconNames.each_with_index do |iconName, index| icon_map_template = <", - @"zocial.rss" : @"R", - @"zocial.scribd" : @"}", - @"zocial.skype" : @"S", - @"zocial.smashing" : @"*", - @"zocial.songkick" : @"k", - @"zocial.soundcloud" : @"s", - @"zocial.spotify" : @"=", - @"zocial.stackoverflow" : @"\u00EC", - @"zocial.statusnet" : @"\u00E2", - @"zocial.steam" : @"b", - @"zocial.stripe" : @"\u00A3", - @"zocial.stumbleupon" : @"/", - @"zocial.tumblr" : @"t", - @"zocial.twitter" : @"T", - @"zocial.viadeo" : @"H", - @"zocial.vimeo" : @"V", - @"zocial.vk" : @"N", - @"zocial.weibo" : @"J", - @"zocial.wikipedia" : @",", - @"zocial.windows" : @"W", - @"zocial.wordpress" : @"w", - @"zocial.xing" : @"X", - @"zocial.yahoo" : @"Y", - @"zocial.ycombinator" : @"\u00ED", - @"zocial.yelp" : @"y", - @"zocial.youtube" : @"U", + @"\u00E3" : @"zocial.acrobat", + @"a" : @"zocial.amazon", + @"&" : @"zocial.android", + @"\u00D6" : @"zocial.angellist", + @"\"" : @"zocial.aol", + @"\u00E1" : @"zocial.appnet", + @"A" : @"zocial.appstore", + @"\u00E9" : @"zocial.bitbucket", + @"2" : @"zocial.bitcoin", + @"B" : @"zocial.blogger", + @"\u00E5" : @"zocial.buffer", + @"7" : @"zocial.call", + @"." : @"zocial.cal", + @"\u00C9" : @"zocial.cart", + @"[" : @"zocial.chrome", + @"c" : @"zocial.cloudapp", + @"C" : @"zocial.creativecommons", + @"#" : @"zocial.delicious", + @";" : @"zocial.digg", + @"Q" : @"zocial.disqus", + @"D" : @"zocial.dribbble", + @"d" : @"zocial.dropbox", + @"\u00E4" : @"zocial.drupal", + @"\u00E0" : @"zocial.dwolla", + @"]" : @"zocial.email", + @"v" : @"zocial.eventasaurus", + @"|" : @"zocial.eventbrite", + @"'" : @"zocial.eventful", + @"E" : @"zocial.evernote", + @"f" : @"zocial.facebook", + @"0" : @"zocial.fivehundredpx", + @"%" : @"zocial.flattr", + @"F" : @"zocial.flickr", + @":" : @"zocial.forrst", + @"4" : @"zocial.foursquare", + @"\u00E8" : @"zocial.github", + @"m" : @"zocial.gmail", + @"G" : @"zocial.google", + @"h" : @"zocial.googleplay", + @"+" : @"zocial.googleplus", + @"@" : @"zocial.gowalla", + @"8" : @"zocial.grooveshark", + @"?" : @"zocial.guest", + @"5" : @"zocial.html5", + @"6" : @"zocial.ie", + @"\u00DC" : @"zocial.instagram", + @"I" : @"zocial.instapaper", + @"{" : @"zocial.intensedebate", + @"i" : @"zocial.itunes", + @"K" : @"zocial.klout", + @"-" : @"zocial.lanyrd", + @"l" : @"zocial.lastfm", + @"\u00EA" : @"zocial.lego", + @"L" : @"zocial.linkedin", + @"\u00EE" : @"zocial.lkdto", + @"\u00EB" : @"zocial.logmein", + @"^" : @"zocial.macstore", + @"M" : @"zocial.meetup", + @"_" : @"zocial.myspace", + @"9" : @"zocial.ninetyninedesigns", + @"o" : @"zocial.openid", + @"\u00C7" : @"zocial.opentable", + @"$" : @"zocial.paypal", + @"n" : @"zocial.pinboard", + @"1" : @"zocial.pinterest", + @"P" : @"zocial.plancast", + @"j" : @"zocial.plurk", + @"\u00E7" : @"zocial.pocket", + @"`" : @"zocial.podcast", + @"~" : @"zocial.posterous", + @"\u00D1" : @"zocial.print", + @"q" : @"zocial.quora", + @">" : @"zocial.reddit", + @"R" : @"zocial.rss", + @"}" : @"zocial.scribd", + @"S" : @"zocial.skype", + @"*" : @"zocial.smashing", + @"k" : @"zocial.songkick", + @"s" : @"zocial.soundcloud", + @"=" : @"zocial.spotify", + @"\u00EC" : @"zocial.stackoverflow", + @"\u00E2" : @"zocial.statusnet", + @"b" : @"zocial.steam", + @"\u00A3" : @"zocial.stripe", + @"/" : @"zocial.stumbleupon", + @"t" : @"zocial.tumblr", + @"T" : @"zocial.twitter", + @"H" : @"zocial.viadeo", + @"V" : @"zocial.vimeo", + @"N" : @"zocial.vk", + @"J" : @"zocial.weibo", + @"," : @"zocial.wikipedia", + @"W" : @"zocial.windows", + @"w" : @"zocial.wordpress", + @"X" : @"zocial.xing", + @"Y" : @"zocial.yahoo", + @"\u00ED" : @"zocial.ycombinator", + @"y" : @"zocial.yelp", + @"U" : @"zocial.youtube", }; } - @end diff --git a/FontAwesomeKit/FontAwesome.otf b/FontAwesomeKit/FontAwesome.otf index 3ed7f8b..d4de13e 100644 Binary files a/FontAwesomeKit/FontAwesome.otf and b/FontAwesomeKit/FontAwesome.otf differ diff --git a/FontAwesomeKit/Material-Design-Iconic-Font.ttf b/FontAwesomeKit/Material-Design-Iconic-Font.ttf deleted file mode 100644 index 863e246..0000000 Binary files a/FontAwesomeKit/Material-Design-Iconic-Font.ttf and /dev/null differ diff --git a/FontAwesomeKit/MaterialIcons-Regular.ttf b/FontAwesomeKit/MaterialIcons-Regular.ttf new file mode 100755 index 0000000..7015564 Binary files /dev/null and b/FontAwesomeKit/MaterialIcons-Regular.ttf differ diff --git a/FontAwesomeKit/octicons.ttf b/FontAwesomeKit/octicons.ttf index 9e09105..3dab5b6 100644 Binary files a/FontAwesomeKit/octicons.ttf and b/FontAwesomeKit/octicons.ttf differ diff --git a/FontAwesomeKitExample/FontAwesomeKitExample.xcodeproj/project.pbxproj b/FontAwesomeKitExample/FontAwesomeKitExample.xcodeproj/project.pbxproj index cbf7b86..97c22c1 100644 --- a/FontAwesomeKitExample/FontAwesomeKitExample.xcodeproj/project.pbxproj +++ b/FontAwesomeKitExample/FontAwesomeKitExample.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 2F615A2B1B69884E004A7B1D /* Material-Design-Iconic-Font.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2F615A291B69884E004A7B1D /* Material-Design-Iconic-Font.ttf */; }; 63C94B331BD6DDB400C5EFE5 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C94B321BD6DDB400C5EFE5 /* main.m */; }; 63C94B361BD6DDB400C5EFE5 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C94B351BD6DDB400C5EFE5 /* AppDelegate.m */; }; 63C94B391BD6DDB400C5EFE5 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 63C94B381BD6DDB400C5EFE5 /* ViewController.m */; }; @@ -16,7 +15,6 @@ 63C94B431BD6DDD800C5EFE5 /* FAKOcticons.m in Sources */ = {isa = PBXBuildFile; fileRef = CC785E121BB31140001A143F /* FAKOcticons.m */; }; 63C94B441BD6DDD800C5EFE5 /* octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CC785E131BB31140001A143F /* octicons.ttf */; }; 63C94B451BD6DDD800C5EFE5 /* FAKMaterialIcons.m in Sources */ = {isa = PBXBuildFile; fileRef = 2F615A271B69884E004A7B1D /* FAKMaterialIcons.m */; }; - 63C94B461BD6DDD800C5EFE5 /* Material-Design-Iconic-Font.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2F615A291B69884E004A7B1D /* Material-Design-Iconic-Font.ttf */; }; 63C94B471BD6DDD800C5EFE5 /* FAKFontAwesome.m in Sources */ = {isa = PBXBuildFile; fileRef = CC0334E318151CED00CFB044 /* FAKFontAwesome.m */; }; 63C94B481BD6DDD800C5EFE5 /* FAKFoundationIcons.m in Sources */ = {isa = PBXBuildFile; fileRef = CC0334E518151CED00CFB044 /* FAKFoundationIcons.m */; }; 63C94B491BD6DDD800C5EFE5 /* FAKIcon.m in Sources */ = {isa = PBXBuildFile; fileRef = CC0334E718151CED00CFB044 /* FAKIcon.m */; }; @@ -26,6 +24,7 @@ 63C94B4D1BD6DDD800C5EFE5 /* foundation-icons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CC0334EC18151CED00CFB044 /* foundation-icons.ttf */; }; 63C94B4E1BD6DDD800C5EFE5 /* FontAwesome.otf in Resources */ = {isa = PBXBuildFile; fileRef = CC2144B119433643004051F6 /* FontAwesome.otf */; }; 63C94B4F1BD6DDD800C5EFE5 /* zocial-regular-webfont.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CC0334ED18151CED00CFB044 /* zocial-regular-webfont.ttf */; }; + ACDD3B661CFFFA3400CD8B98 /* MaterialIcons-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = ACDD3B651CFFFA3400CD8B98 /* MaterialIcons-Regular.ttf */; }; CC0334EE18151CED00CFB044 /* FAKFontAwesome.m in Sources */ = {isa = PBXBuildFile; fileRef = CC0334E318151CED00CFB044 /* FAKFontAwesome.m */; }; CC0334EF18151CED00CFB044 /* FAKFoundationIcons.m in Sources */ = {isa = PBXBuildFile; fileRef = CC0334E518151CED00CFB044 /* FAKFoundationIcons.m */; }; CC0334F018151CED00CFB044 /* FAKIcon.m in Sources */ = {isa = PBXBuildFile; fileRef = CC0334E718151CED00CFB044 /* FAKIcon.m */; }; @@ -62,7 +61,6 @@ /* Begin PBXFileReference section */ 2F615A271B69884E004A7B1D /* FAKMaterialIcons.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FAKMaterialIcons.m; sourceTree = ""; }; 2F615A281B69884E004A7B1D /* FAKMaterialIcons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FAKMaterialIcons.h; sourceTree = ""; }; - 2F615A291B69884E004A7B1D /* Material-Design-Iconic-Font.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Material-Design-Iconic-Font.ttf"; sourceTree = ""; }; 63C94B2F1BD6DDB400C5EFE5 /* FontAwesome tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "FontAwesome tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 63C94B321BD6DDB400C5EFE5 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 63C94B341BD6DDB400C5EFE5 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; @@ -73,6 +71,7 @@ 63C94B3D1BD6DDB400C5EFE5 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 63C94B3F1BD6DDB400C5EFE5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 9FE9E62E8A19471282938E14 /* libPods-FontAwesomeKitExample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FontAwesomeKitExample.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + ACDD3B651CFFFA3400CD8B98 /* MaterialIcons-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "MaterialIcons-Regular.ttf"; sourceTree = ""; }; CC0334E218151CED00CFB044 /* FAKFontAwesome.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FAKFontAwesome.h; sourceTree = ""; }; CC0334E318151CED00CFB044 /* FAKFontAwesome.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FAKFontAwesome.m; sourceTree = ""; }; CC0334E418151CED00CFB044 /* FAKFoundationIcons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FAKFoundationIcons.h; sourceTree = ""; }; @@ -173,12 +172,12 @@ CC0334E118151CED00CFB044 /* FontAwesomeKit */ = { isa = PBXGroup; children = ( + ACDD3B651CFFFA3400CD8B98 /* MaterialIcons-Regular.ttf */, CC785E111BB31140001A143F /* FAKOcticons.h */, CC785E121BB31140001A143F /* FAKOcticons.m */, CC785E131BB31140001A143F /* octicons.ttf */, 2F615A271B69884E004A7B1D /* FAKMaterialIcons.m */, 2F615A281B69884E004A7B1D /* FAKMaterialIcons.h */, - 2F615A291B69884E004A7B1D /* Material-Design-Iconic-Font.ttf */, CC0334E218151CED00CFB044 /* FAKFontAwesome.h */, CC0334E318151CED00CFB044 /* FAKFontAwesome.m */, CC0334E418151CED00CFB044 /* FAKFoundationIcons.h */, @@ -387,7 +386,6 @@ 63C94B4E1BD6DDD800C5EFE5 /* FontAwesome.otf in Resources */, 63C94B3C1BD6DDB400C5EFE5 /* Main.storyboard in Resources */, 63C94B4D1BD6DDD800C5EFE5 /* foundation-icons.ttf in Resources */, - 63C94B461BD6DDD800C5EFE5 /* Material-Design-Iconic-Font.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -398,11 +396,11 @@ CCDC73461A3ED9D9006B3E68 /* ionicons.ttf in Resources */, CC0334F318151CED00CFB044 /* foundation-icons.ttf in Resources */, CC44A86316CD9B3F0039E101 /* InfoPlist.strings in Resources */, - 2F615A2B1B69884E004A7B1D /* Material-Design-Iconic-Font.ttf in Resources */, CC44A86B16CD9B3F0039E101 /* Default.png in Resources */, CCFF2D2A181144E80003CFE3 /* Main.storyboard in Resources */, CC785E151BB31140001A143F /* octicons.ttf in Resources */, CC44A86D16CD9B3F0039E101 /* Default@2x.png in Resources */, + ACDD3B661CFFFA3400CD8B98 /* MaterialIcons-Regular.ttf in Resources */, CC2144B219433643004051F6 /* FontAwesome.otf in Resources */, CC44A86F16CD9B3F0039E101 /* Default-568h@2x.png in Resources */, CC0334F418151CED00CFB044 /* zocial-regular-webfont.ttf in Resources */, @@ -626,6 +624,7 @@ 63C94B411BD6DDB400C5EFE5 /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; CC44A85016CD9B3F0039E101 /* Build configuration list for PBXProject "FontAwesomeKitExample" */ = { isa = XCConfigurationList; diff --git a/FontAwesomeKitExample/FontAwesomeKitExample/IconMapCell.m b/FontAwesomeKitExample/FontAwesomeKitExample/IconMapCell.m index 6fa4821..311f699 100644 --- a/FontAwesomeKitExample/FontAwesomeKitExample/IconMapCell.m +++ b/FontAwesomeKitExample/FontAwesomeKitExample/IconMapCell.m @@ -13,7 +13,7 @@ @implementation IconMapCell - (void)configureCellWithIcon:(FAKIcon *)icon { self.iconLabel.attributedText = [icon attributedString]; - self.iconNameLabel.text = [icon iconName]; + self.iconNameLabel.text = [[icon iconName] stringByReplacingOccurrencesOfString:@"-" withString:@" "]; } @end diff --git a/FontAwesomeKitExample/FontAwesomeKitExample/IconMapViewController.m b/FontAwesomeKitExample/FontAwesomeKitExample/IconMapViewController.m index 49556e6..83dfdb5 100644 --- a/FontAwesomeKitExample/FontAwesomeKitExample/IconMapViewController.m +++ b/FontAwesomeKitExample/FontAwesomeKitExample/IconMapViewController.m @@ -76,7 +76,7 @@ -(void)searchResult:(NSString*)keyword{ - (IBAction)segmentChanged:(UISegmentedControl *)sender { [self.icons removeAllObjects]; - NSArray *groups = @[@"FAKFontAwesome",@"FAKFoundationIcons",@"FAKZocial",@"FAKIonIcons", @"FAKOcticons"]; + NSArray *groups = @[@"FAKFontAwesome",@"FAKFoundationIcons",@"FAKZocial",@"FAKIonIcons", @"FAKOcticons", @"FAKMaterialIcons"]; if (sender.selectedSegmentIndex == 0) { [self loadFontAwesome]; } else if (sender.selectedSegmentIndex == 1) { @@ -88,6 +88,8 @@ - (IBAction)segmentChanged:(UISegmentedControl *)sender [self loadIonIcons]; } else if (sender.selectedSegmentIndex == 4) { [self loadOcticons]; + } else if (sender.selectedSegmentIndex == 5) { + [self loadMaterialIcons]; } if (!sender) { [self loadFontAwesome]; @@ -102,7 +104,7 @@ - (void)loadFontAwesome { NSArray *keys = [[[FAKFontAwesome allIcons] allKeys] sortedArrayUsingSelector:@selector(compare:)]; for (NSString *key in keys) { - [self.icons addObject:[FAKFontAwesome iconWithCode:key size:50]]; + [self.icons addObject:[FAKFontAwesome iconWithCode:key size:44]]; } } @@ -110,7 +112,7 @@ - (void)loadFoundation { NSArray *keys = [[[FAKFoundationIcons allIcons] allKeys] sortedArrayUsingSelector:@selector(compare:)]; for (NSString *key in keys) { - [self.icons addObject:[FAKFoundationIcons iconWithCode:key size:50]]; + [self.icons addObject:[FAKFoundationIcons iconWithCode:key size:44]]; } } @@ -118,7 +120,7 @@ - (void)loadZocial { NSArray *keys = [[[FAKZocial allIcons] allKeys] sortedArrayUsingSelector:@selector(compare:)]; for (NSString *key in keys) { - [self.icons addObject:[FAKZocial iconWithCode:key size:40]]; + [self.icons addObject:[FAKZocial iconWithCode:key size:44]]; } } @@ -126,7 +128,7 @@ - (void)loadIonIcons { NSArray *keys = [[[FAKIonIcons allIcons] allKeys] sortedArrayUsingSelector:@selector(compare:)]; for (NSString *key in keys) { - [self.icons addObject:[FAKIonIcons iconWithCode:key size:50]]; + [self.icons addObject:[FAKIonIcons iconWithCode:key size:44]]; } } @@ -134,7 +136,15 @@ - (void)loadOcticons { NSArray *keys = [[[FAKOcticons allIcons] allKeys] sortedArrayUsingSelector:@selector(compare:)]; for (NSString *key in keys) { - [self.icons addObject:[FAKOcticons iconWithCode:key size:48]]; + [self.icons addObject:[FAKOcticons iconWithCode:key size:44]]; + } +} + +- (void)loadMaterialIcons +{ + NSArray *keys = [[[FAKMaterialIcons allIcons] allKeys] sortedArrayUsingSelector:@selector(compare:)]; + for (NSString *key in keys) { + [self.icons addObject:[FAKMaterialIcons iconWithCode:key size:44]]; } } diff --git a/FontAwesomeKitExample/FontAwesomeKitExample/Main.storyboard b/FontAwesomeKitExample/FontAwesomeKitExample/Main.storyboard index 18342b1..946b0f0 100644 --- a/FontAwesomeKitExample/FontAwesomeKitExample/Main.storyboard +++ b/FontAwesomeKitExample/FontAwesomeKitExample/Main.storyboard @@ -1,8 +1,8 @@ - + - + @@ -41,12 +41,11 @@ - + -