Skip to content

Commit

Permalink
Removed old values in the Enum definition.
Browse files Browse the repository at this point in the history
Replaced old values with the new ones
  • Loading branch information
lucasiturbide committed Apr 30, 2014
1 parent 14cdf01 commit c48a285
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 311 deletions.
301 changes: 0 additions & 301 deletions BButton/Classes/NSString+FontAwesome.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,307 +41,6 @@ extern NSString * const kFontAwesomeFont;
* A constant describing the available Font Awesome Icons.
*/
typedef NS_ENUM(NSUInteger, FAIcon){
FAIconGlass = 0xf000,
FAIconMusic = 0xf001,
FAIconSearch = 0xf002,
FAIconEnvelope = 0xf003,
FAIconHeart = 0xf004,
FAIconStar = 0xf005,
FAIconStarEmpty = 0xf006,
FAIconUser = 0xf007,
FAIconFilm = 0xf008,
FAIconThLarge = 0xf009,
FAIconTh = 0xf00a,
FAIconThList = 0xf00b,
FAIconOk = 0xf00c,
FAIconRemove = 0xf00d,
FAIconZoomIn = 0xf00e,
FAIconZoomOut = 0xf010,
FAIconOff = 0xf011,
FAIconSignal = 0xf012,
FAIconCog = 0xf013,
FAIconTrash = 0xf014,
FAIconHome = 0xf015,
FAIconFile = 0xf016,
FAIconTime = 0xf017,
FAIconRoad = 0xf018,
FAIconDownloadAlt = 0xf019,
FAIconDownload = 0xf01a,
FAIconUpload = 0xf01b,
FAIconInbox = 0xf01c,
FAIconPlayCircle = 0xf01d,
FAIconRepeat = 0xf01e,
FAIconRefresh = 0xf021,
FAIconListAlt = 0xf022,
FAIconLock = 0xf023,
FAIconFlag = 0xf024,
FAIconHeadphones = 0xf025,
FAIconVolumeOff = 0xf026,
FAIconVolumeDown = 0xf027,
FAIconVolumeUp = 0xf028,
FAIconQrcode = 0xf029,
FAIconBarcode = 0xf02a,
FAIconTag = 0xf02b,
FAIconTags = 0xf02c,
FAIconBook = 0xf02d,
FAIconBookmark = 0xf02e,
FAIconPrint = 0xf02f,
FAIconCamera = 0xf030,
FAIconFont = 0xf031,
FAIconBold = 0xf032,
FAIconItalic = 0xf033,
FAIconTextHeight = 0xf034,
FAIconTextWidth = 0xf035,
FAIconAlignLeft = 0xf036,
FAIconAlignCenter = 0xf037,
FAIconAlignRight = 0xf038,
FAIconAlignJustify = 0xf039,
FAIconList = 0xf03a,
FAIconIndentLeft = 0xf03b,
FAIconIndentRight = 0xf03c,
FAIconFacetimeVideo = 0xf03d,
FAIconPicture = 0xf03e,
FAIconPencil = 0xf040,
FAIconMapMarker = 0xf041,
FAIconAdjust = 0xf042,
FAIconTint = 0xf043,
FAIconEdit = 0xf044,
FAIconShare = 0xf045,
FAIconCheck = 0xf046,
FAIconMove = 0xf047,
FAIconStepBackward = 0xf048,
FAIconFastBackward = 0xf049,
FAIconBackward = 0xf04a,
FAIconPlay = 0xf04b,
FAIconPause = 0xf04c,
FAIconStop = 0xf04d,
FAIconForward = 0xf04e,
FAIconFastForward = 0xf050,
FAIconStepForward = 0xf051,
FAIconEject = 0xf052,
FAIconChevronLeft = 0xf053,
FAIconChevronRight = 0xf054,
FAIconPlusSign = 0xf055,
FAIconMinusSign = 0xf056,
FAIconRemoveSign = 0xf057,
FAIconOkSign = 0xf058,
FAIconQuestionSign = 0xf059,
FAIconInfoSign = 0xf05a,
FAIconScreenshot = 0xf05b,
FAIconRemoveCircle = 0xf05c,
FAIconOkCircle = 0xf05d,
FAIconBanCircle = 0xf05e,
FAIconArrowLeft = 0xf060,
FAIconArrowRight = 0xf061,
FAIconArrowUp = 0xf062,
FAIconArrowDown = 0xf063,
FAIconShareAlt = 0xf064,
FAIconResizeFull = 0xf065,
FAIconResizeSmall = 0xf066,
FAIconPlus = 0xf067,
FAIconMinus = 0xf068,
FAIconAsterisk = 0xf069,
FAIconExclamationSign = 0xf06a,
FAIconGift = 0xf06b,
FAIconLeaf = 0xf06c,
FAIconFire = 0xf06d,
FAIconEyeOpen = 0xf06e,
FAIconEyeClose = 0xf070,
FAIconWarningSign = 0xf071,
FAIconPlane = 0xf072,
FAIconCalendar = 0xf073,
FAIconRandom = 0xf074,
FAIconComment = 0xf075,
FAIconMagnet = 0xf076,
FAIconChevronUp = 0xf077,
FAIconChevronDown = 0xf078,
FAIconRetweet = 0xf079,
FAIconShoppingCart = 0xf07a,
FAIconFolderClose = 0xf07b,
FAIconFolderOpen = 0xf07c,
FAIconResizeVertical = 0xf07d,
FAIconResizeHorizontal = 0xf07e,
FAIconBarChart = 0xf080,
FAIconTwitterSign = 0xf081,
FAIconFacebookSign = 0xf082,
FAIconCameraRetro = 0xf083,
FAIconKey = 0xf084,
FAIconCogs = 0xf085,
FAIconComments = 0xf086,
FAIconThumbsUp = 0xf087,
FAIconThumbsDown = 0xf088,
FAIconStarHalf = 0xf089,
FAIconHeartEmpty = 0xf08a,
FAIconSignout = 0xf08b,
FAIconLinkedinSign = 0xf08c,
FAIconPushpin = 0xf08d,
FAIconExternalLink = 0xf08e,
FAIconSignin = 0xf090,
FAIconTrophy = 0xf091,
FAIconGithubSign = 0xf092,
FAIconUploadAlt = 0xf093,
FAIconLemon = 0xf094,
FAIconPhone = 0xf095,
FAIconCheckEmpty = 0xf096,
FAIconBookmarkEmpty = 0xf097,
FAIconPhoneSign = 0xf098,
FAIconTwitter = 0xf099,
FAIconFacebook = 0xf09a,
FAIconGithub = 0xf09b,
FAIconUnlock = 0xf09c,
FAIconCreditCard = 0xf09d,
FAIconRss = 0xf09e,
FAIconHdd = 0xf0a0,
FAIconBullhorn = 0xf0a1,
FAIconBell = 0xf0f3,
FAIconCertificate = 0xf0a3,
FAIconHandRight = 0xf0a4,
FAIconHandLeft = 0xf0a5,
FAIconHandUp = 0xf0a6,
FAIconHandDown = 0xf0a7,
FAIconCircleArrowLeft = 0xf0a8,
FAIconCircleArrowRight = 0xf0a9,
FAIconCircleArrowUp = 0xf0aa,
FAIconCircleArrowDown = 0xf0ab,
FAIconGlobe = 0xf0ac,
FAIconWrench = 0xf0ad,
FAIconTasks = 0xf0ae,
FAIconFilter = 0xf0b0,
FAIconBriefcase = 0xf0b1,
FAIconFullscreen = 0xf0b2,
FAIconGroup = 0xf0c0,
FAIconLink = 0xf0c1,
FAIconCloud = 0xf0c2,
FAIconBeaker = 0xf0c3,
FAIconCut = 0xf0c4,
FAIconCopy = 0xf0c4,
FAIconPaperClip = 0xf0c5,
FAIconSave = 0xf0c7,
FAIconSignBlank = 0xf0c8,
FAIconReorder = 0xf0c9,
FAIconListUl = 0xf0ca,
FAIconListOl = 0xf0cb,
FAIconStrikethrough = 0xf0cc,
FAIconUnderline = 0xf0cd,
FAIconTable = 0xf0ce,
FAIconMagic = 0xf0d0,
FAIconTruck = 0xf0d1,
FAIconPinterest = 0xf0d2,
FAIconPinterestSign = 0xf0d3,
FAIconGooglePlusSign = 0xf0d4,
FAIconGooglePlus = 0xf0d5,
FAIconMoney = 0xf0d6,
FAIconCaretDown = 0xf0d7,
FAIconCaretUp = 0xf0d8,
FAIconCaretLeft = 0xf0d9,
FAIconCaretRight = 0xf0da,
FAIconColumns = 0xf0db,
FAIconSort = 0xf0dc,
FAIconSortDown = 0xf0dd,
FAIconSortUp = 0xf0de,
FAIconEnvelopeAlt = 0xf0e0,
FAIconLinkedin = 0xf0e1,
FAIconUndo = 0xf0e2,
FAIconLegal = 0xf0e3,
FAIconDashboard = 0xf0e4,
FAIconCommentAlt = 0xf0e5,
FAIconCommentsAlt = 0xf0e6,
FAIconBolt = 0xf0e7,
FAIconSitemap = 0xf0e8,
FAIconUmbrella = 0xf0e9,
FAIconPaste = 0xf0ea,
FAIconLightBulb = 0xf0eb,
FAIconExchange = 0xf0ec,
FAIconCloudDownload = 0xf0ed,
FAIconCloudUpload = 0xf0ee,
FAIconUserMd = 0xf0f0,
FAIconStethoscope = 0xf0f1,
FAIconSuitecase = 0xf0f2,
FAIconBellAlt = 0xf0a2,
FAIconCoffee = 0xf0f4,
FAIconFood = 0xf0f5,
FAIconFileAlt = 0xf0f6,
FAIconBuilding = 0xf0f7,
FAIconHospital = 0xf0f8,
FAIconAmbulance = 0xf0f9,
FAIconMedkit = 0xf0fa,
FAIconFighterJet = 0xf0fb,
FAIconBeer = 0xf0fc,
FAIconHSign = 0xf0fd,
FAIconPlusSignAlt = 0xf0fe,
FAIconDoubleAngleLeft = 0xf100,
FAIconDoubleAngleRight = 0xf101,
FAIconDoubleAngleUp = 0xf102,
FAIconDoubleAngleDown = 0xf103,
FAIconAngleLeft = 0xf104,
FAIconAngleRight = 0xf105,
FAIconAngleUp = 0xf106,
FAIconAngleDown = 0xf107,
FAIconDesktop = 0xf108,
FAIconLaptop = 0xf109,
FAIconTablet = 0xf10a,
FAIconMobilePhone = 0xf10b,
FAIconCircleBlank = 0xf10c,
FAIconQuoteLeft = 0xf10d,
FAIconQuoteRight = 0xf10e,
FAIconSpinner = 0xf110,
FAIconCircle = 0xf111,
FAIconReply = 0xf112,
FAIconFolderCloseAlt = 0xf114,
FAIconFolderOpenAlt = 0xf115,
FAIconExpandAlt = 0xf065,
FAIconCollapseAlt = 0xf066,
FAIconSmile = 0xf118,
FAIconFrown = 0xf119,
FAIconMeh = 0xf11a,
FAIconGamepad = 0xf11b,
FAIconKeyboard = 0xf11c,
FAIconFlagAlt = 0xf11d,
FAIconFlagCheckered = 0xf11e,
FAIconTerminal = 0xf120,
FAIconCode = 0xf121,
FAIconReplyAll = 0xf122,
FAIconStarHalfAlt = 0xf123,
FAIconLocationArrow = 0xf124,
FAIconCrop = 0xf125,
FAIconCodeFork = 0xf126,
FAIconUnlink = 0xf127,
FAIconQuestion = 0xf128,
FAIconInfo = 0xf129,
FAIconExclamation = 0xf12a,
FAIconSuperscript = 0xf12b,
FAIconSubscript = 0xf12c,
FAIconEraser = 0xf12d,
FAIconPuzzlePiece = 0xf12e,
FAIconMicrophone = 0xf130,
FAIconMicrophoneOff = 0xf131,
FAIconShield = 0xf132,
FAIconCalendarEmpty = 0xf133,
FAIconFireExtinguisher = 0xf134,
FAIconRocket = 0xf135,
FAIconMaxCDN = 0xf136,
FAIconChevronSignLeft = 0xf137,
FAIconChevronSignRight = 0xf138,
FAIconChevronSignUp = 0xf139,
FAIconChevronSignDown = 0xf13a,
FAIconHTML5 = 0xf13b,
FAIconCSS3 = 0xf13c,
FAIconFAIconAnchor = 0xf13d,
FAIconUnlockAlt = 0xf13e,
FAIconBullseye = 0xf140,
FAIconEllipsisHorizontal = 0xf141,
FAIconEllipsisVertical = 0xf142,
FAIconRSS = 0xf143,
FAIconPlaySign = 0xf144,
FAIconTicket = 0xf145,
FAIconMinusSignAlt = 0xf146,
FAIconCheckMinus = 0xf147,
FAIconLevelUp = 0xf148,
FAIconLevelDown = 0xf149,
FAIconCheckSign = 0xf14a,
FAIconEditSign = 0xf14b,
FAIconExternalLinkSign = 0xf14c,
FAIconShareSign = 0xf14d,
FAGlass = 0xf000,
FAMusic = 0xf001,
FASearch = 0xf002,
Expand Down
4 changes: 2 additions & 2 deletions BButtonDemo/TWBSDemoViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ - (void)viewDidLoad
[btn setTitle:[self titleForType:type] forState:UIControlStateNormal];

if(type == BButtonTypeFacebook)
[btn addAwesomeIcon:FAIconFacebook beforeTitle:YES];
[btn addAwesomeIcon:FAFacebook beforeTitle:YES];
else if(type == BButtonTypeTwitter)
[btn addAwesomeIcon:FAIconTwitter beforeTitle:NO];
[btn addAwesomeIcon:FATwitter beforeTitle:NO];

type++;
if(type > BButtonTypeGray) {
Expand Down
16 changes: 8 additions & 8 deletions BButtonDemoTests/BButtonDemoTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ - (void)testButtonInitMethods
btn = [[BButton alloc] initWithFrame:frame
type:BButtonTypeWarning
style:BButtonStyleBootstrapV3
icon:FAIconAdjust
icon:FAAdjust
fontSize:14.0f];
XCTAssertNotNil(btn, @"Button should not be nil");
XCTAssert([btn.color isEqual:[UIColor bb_warningColorV3]], @"Colors should be equal");
Expand All @@ -56,40 +56,40 @@ - (void)testButtonInitMethods
btn = [[BButton alloc] initWithFrame:frame
color:[UIColor blackColor]
style:BButtonStyleBootstrapV3
icon:FAIconZoomOut
icon:FASearchMinus
fontSize:16.0f];
XCTAssertNotNil(btn, @"Button should not be nil");



btn = nil;
btn = [BButton awesomeButtonWithOnlyIcon:FAIconZoomIn color:[UIColor blueColor] style:BButtonStyleBootstrapV2];
btn = [BButton awesomeButtonWithOnlyIcon:FASearchPlus color:[UIColor blueColor] style:BButtonStyleBootstrapV2];
XCTAssertNotNil(btn, @"Button should not be nil");
XCTAssert([btn.titleLabel.text length] == 1, @"Button text should only include FAIcon");
}

- (void)testButtonClassInitMethods
{
BButton *btn = [BButton awesomeButtonWithOnlyIcon:FAIconUserMd type:BButtonTypeSuccess style:BButtonStyleBootstrapV3];
BButton *btn = [BButton awesomeButtonWithOnlyIcon:FAUserMd type:BButtonTypeSuccess style:BButtonStyleBootstrapV3];
XCTAssert([btn.color isEqual:[UIColor bb_successColorV3]], @"Colors should be equal");
XCTAssertNotNil(btn, @"Button should not be nil");
XCTAssert([btn.titleLabel.text length] == 1, @"Button text should only include FAIcon");



btn = nil;
btn = [BButton awesomeButtonWithOnlyIcon:FAIconZoomIn color:[UIColor blueColor] style:BButtonStyleBootstrapV2];
btn = [BButton awesomeButtonWithOnlyIcon:FASearchPlus color:[UIColor blueColor] style:BButtonStyleBootstrapV2];
XCTAssertNotNil(btn, @"Button should not be nil");
XCTAssert([btn.titleLabel.text length] == 1, @"Button text should only include FAIcon");
}

- (void)testFontAwesome
{
NSString *icon = [NSString fa_stringFromFontAwesomeForIcon:FAIconWarningSign];
NSString *icon = [NSString fa_stringFromFontAwesomeForIcon:FAWarning];
XCTAssertNotNil(icon, @"Icon should not be nil");

NSString *btnTitle = @"Button Title";
FAIcon i = FAIconVolumeDown;
FAIcon i = FAVolumeDown;
BButton *btn = [[BButton alloc] initWithFrame:CGRectMake(0.0f, 0.0f, 200.0f, 50.0f)
type:BButtonTypeInverse
style:BButtonStyleBootstrapV2];
Expand All @@ -105,7 +105,7 @@ - (void)testFontAwesome
NSString *btnIcon = [btn.titleLabel.text substringFromIndex:[btn.titleLabel.text length] - 1];
XCTAssert([btnIcon isEqualToString:icon], @"Last character in button title should equal FA icon");

i = FAIconTerminal;
i = FATerminal;
[btn addAwesomeIcon:i beforeTitle:YES];
XCTAssertEqual([btn.titleLabel.text length], [btnTitle length] + 4, @"Button title length should be 4 characters longer after adding 2 icons");

Expand Down

0 comments on commit c48a285

Please sign in to comment.