Using the latest version of Octicons(v2.1.2, https://octicons.github.…

…com/).
jacksonh · Jan 15, 2015 · f2c5ee3 · f2c5ee3
1 parent 4e46b5c
commit f2c5ee3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 19 deletions.
diff --git a/OcticonsIOS/NSString+Octicons.h b/OcticonsIOS/NSString+Octicons.h
@@ -112,8 +112,6 @@ typedef NS_ENUM(NSInteger, OCTIcon) {
 	OCTIconListUnordered,
 	OCTIconLocation,
 	OCTIconLock,
-	OCTIconLogIn,
-	OCTIconLogOut,
 	OCTIconLogoGithub,
 	OCTIconMail,
 	OCTIconMailRead,
@@ -167,6 +165,8 @@ typedef NS_ENUM(NSInteger, OCTIcon) {
 	OCTIconSearch,
 	OCTIconServer,
 	OCTIconSettings,
+	OCTIconLogIn,
+    OCTIconLogOut,
 	OCTIconSplit,
 	OCTIconSquirrel,
 	OCTIconStar,

diff --git a/OcticonsIOS/NSString+Octicons.m b/OcticonsIOS/NSString+Octicons.m
@@ -138,8 +138,6 @@ + (NSArray *)octicon_icons {
 						 @"\uf061",
 						 @"\uf060",
 						 @"\uf06a",
-						 @"\uf036",
-						 @"\uf032",
 						 @"\uf092",
 						 @"\uf03b",
 						 @"\uf03c",
@@ -193,6 +191,8 @@ + (NSArray *)octicon_icons {
 						 @"\uf02e",
 						 @"\uf097",
 						 @"\uf07c",
+						 @"\uf036",
+						 @"\uf032",
 						 @"\uf0c6",
 						 @"\uf0b2",
 						 @"\uf02a",
@@ -323,8 +323,6 @@ + (NSDictionary *)octicon_enumDictionary {
 			   @"ListUnordered": @(OCTIconListUnordered),
 			   @"Location": @(OCTIconLocation),
 			   @"Lock": @(OCTIconLock),
-			   @"LogIn": @(OCTIconLogIn),
-			   @"LogOut": @(OCTIconLogOut),
 			   @"LogoGithub": @(OCTIconLogoGithub),
 			   @"Mail": @(OCTIconMail),
 			   @"MailRead": @(OCTIconMailRead),
@@ -378,6 +376,8 @@ + (NSDictionary *)octicon_enumDictionary {
 			   @"Search": @(OCTIconSearch),
 			   @"Server": @(OCTIconServer),
 			   @"Settings": @(OCTIconSettings),
+			   @"LogIn": @(OCTIconLogIn),
+			   @"LogOut": @(OCTIconLogOut),
 			   @"Split": @(OCTIconSplit),
 			   @"Squirrel": @(OCTIconSquirrel),
 			   @"Star": @(OCTIconStar),

diff --git a/OcticonsIOS/SNTXViewController.m b/OcticonsIOS/SNTXViewController.m
@@ -16,23 +16,12 @@ @interface SNTXViewController () {
 
 @end
 
-
-
 @implementation SNTXViewController
 
-- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
-	self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-	if (self) {
-		_currentIcon = OCTIconAlert;
-	}
-	return self;
-}
-
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-
+	_currentIcon = OCTIconAlert;
 	[self sntx_displayCurrentIcon];
 }
 
@@ -51,7 +40,7 @@ - (void)sntx_displayCurrentIcon
 
 - (IBAction)iconButtonTapped:(id)sender
 {
-	_currentIcon = (_currentIcon + 1) % OCTIconZap;
+	_currentIcon = (_currentIcon + 1) % (OCTIconZap + 1);
 	[self sntx_displayCurrentIcon];
 }
 @end
diff --git a/OcticonsIOS/octicons.ttf b/OcticonsIOS/octicons.ttf