Skip to content

Commit

Permalink
Adding the missing icon (Suitcase). Also added searching to the table…
Browse files Browse the repository at this point in the history
… view and made it the default view controller in the demo.
  • Loading branch information
runmad committed Jan 13, 2013
1 parent be5a39b commit 6206eb3
Show file tree
Hide file tree
Showing 7 changed files with 334 additions and 267 deletions.
2 changes: 1 addition & 1 deletion Demo/FontAwesome-iOS Demo/FAAppDelegate.m
Expand Up @@ -19,7 +19,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
FATableViewController *tableViewController = [[FATableViewController alloc] init];
UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:tableViewController];
FAViewController *viewController = [[FAViewController alloc] init];
[self.tabBarController setViewControllers:@[viewController, navigationController]];
[self.tabBarController setViewControllers:@[navigationController, viewController]];
self.window.rootViewController = self.tabBarController;
[self.window makeKeyAndVisible];
return YES;
Expand Down
3 changes: 2 additions & 1 deletion Demo/FontAwesome-iOS Demo/FATableViewCell.h
Expand Up @@ -3,7 +3,8 @@
// FontAwesome-iOS Demo
//
// Created by Rune Madsen on 2013-01-09.
// Copyright (c) 2013 Alex Usbergo. All rights reserved.
// Copyright (c) 2013 Rune Madsen. All rights reserved.
// runmad.com
//

#import <UIKit/UIKit.h>
Expand Down
3 changes: 2 additions & 1 deletion Demo/FontAwesome-iOS Demo/FATableViewCell.m
Expand Up @@ -3,7 +3,8 @@
// FontAwesome-iOS Demo
//
// Created by Rune Madsen on 2013-01-09.
// Copyright (c) 2013 Alex Usbergo. All rights reserved.
// Copyright (c) 2013 Rune Madsen. All rights reserved.
// runmad.com
//

#import "FATableViewCell.h"
Expand Down
8 changes: 7 additions & 1 deletion Demo/FontAwesome-iOS Demo/FATableViewController.h
Expand Up @@ -4,10 +4,16 @@
//
// Created by Rune Madsen on 2013-01-09.
// Copyright (c) 2013 Rune Madsen. All rights reserved.
// runmad.com
//

#import <UIKit/UIKit.h>

@interface FATableViewController : UITableViewController
@interface FATableViewController : UITableViewController <UISearchBarDelegate, UISearchDisplayDelegate>

@property (nonatomic, strong) NSArray *iconIdentiferArray;
@property (nonatomic, strong) NSArray *iconSearchArray;
@property (nonatomic, strong) UISearchDisplayController *searchDisplayController;
@property (nonatomic, strong) UISearchBar *searchBar;

@end
579 changes: 318 additions & 261 deletions Demo/FontAwesome-iOS Demo/FATableViewController.m

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion NSString+FontAwesome.h
Expand Up @@ -274,7 +274,8 @@ typedef NS_ENUM(NSInteger, FAIcon) {
FAIconReply,
FAIconGithubAlt,
FAIconFolderCloseAlt,
FAIconFolderOpenAlt
FAIconFolderOpenAlt,
FAIconSuitcase,
};

@interface NSString (FontAwesome)
Expand Down
3 changes: 2 additions & 1 deletion NSString+FontAwesome.m
Expand Up @@ -58,7 +58,7 @@ + (NSArray*)fontAwesomeIcons
{
static NSArray *fontAwesomeIcons;
if (nil == fontAwesomeIcons) {
fontAwesomeIcons = @[@"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @""];
fontAwesomeIcons = @[@"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @"", @""];
}
return fontAwesomeIcons;
}
Expand Down Expand Up @@ -316,6 +316,7 @@ + (NSDictionary*)enumDictionary
tmp[@"icon-github-alt"] = @(FAIconGithubAlt);
tmp[@"icon-close-alt"] = @(FAIconFolderCloseAlt);
tmp[@"icon-folder-open-alt"] = @(FAIconFolderOpenAlt);
tmp[@"icon-suitcase"] = @(FAIconSuitcase);
enumDictionary = tmp;
}

Expand Down

0 comments on commit 6206eb3

Please sign in to comment.