renamed Arrow to Caret.

sebastienwindal · Mar 6, 2014 · 558be36 · 558be36
1 parent e52f228
commit 558be36
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/FRDLivelyButtonDemo/FRDLivelyButtonDemo/FRDLivelyButton.h b/FRDLivelyButtonDemo/FRDLivelyButtonDemo/FRDLivelyButton.h
@@ -15,8 +15,8 @@ typedef enum {
     kFRDLivelyButtonStylePlus,
     kFRDLivelyButtonStyleCirclePlus,
     kFRDLivelyButtonStyleCircleClose,
-    kFRDLivelyButtonStyleArrowUp,
-    kFRDLivelyButtonStyleArrowDown
+    kFRDLivelyButtonStyleCaretUp,
+    kFRDLivelyButtonStyleCaretDown
 } kFRDLivelyButtonStyle;
 
 @interface FRDLivelyButton : UIButton

diff --git a/FRDLivelyButtonDemo/FRDLivelyButtonDemo/FRDLivelyButton.m b/FRDLivelyButtonDemo/FRDLivelyButtonDemo/FRDLivelyButton.m
@@ -232,15 +232,15 @@ -(void) setStyle:(kFRDLivelyButtonStyle)style animated:(BOOL)animated
         newLine2Path = [self createCenteredLineWithRadius:self.dimension/2.0f/GOLDEN_RATIO angle:+M_PI_4 offset:CGPointMake(0, 0)];
         newLine3Path = [self createCenteredLineWithRadius:self.dimension/2.0f/GOLDEN_RATIO angle:-M_PI_4 offset:CGPointMake(0, 0)];
 
-    } else if (style == kFRDLivelyButtonStyleArrowUp) {
+    } else if (style == kFRDLivelyButtonStyleCaretUp) {
         newCirclePath = [self createCenteredCircleWithRadius:self.dimension/20.0f];
         newCircleAlpha = 0.0f;
         newLine1Path = [self createCenteredLineWithRadius:self.dimension/20.0f angle:0 offset:CGPointMake(0, 0)];
         newLine1Alpha = 0.0f;
         newLine2Path = [self createCenteredLineWithRadius:self.dimension/4.0f - self.line2Layer.lineWidth/2.0f angle:-M_PI_4 offset:CGPointMake(self.dimension/6.0f,0.0f)];
         newLine3Path = [self createCenteredLineWithRadius:self.dimension/4.0f - self.line3Layer.lineWidth/2.0f angle:-3*M_PI_4 offset:CGPointMake(-self.dimension/6.0f,0.0f)];
 
-    } else if (style == kFRDLivelyButtonStyleArrowDown) {
+    } else if (style == kFRDLivelyButtonStyleCaretDown) {
         newCirclePath = [self createCenteredCircleWithRadius:self.dimension/20.0f];
         newCircleAlpha = 0.0f;
         newLine1Path = [self createCenteredLineWithRadius:self.dimension/20.0f angle:0 offset:CGPointMake(0, 0)];

diff --git a/FRDLivelyButtonDemo/FRDLivelyButtonDemo/Storyboard.storyboard b/FRDLivelyButtonDemo/FRDLivelyButtonDemo/Storyboard.storyboard
@@ -110,10 +110,10 @@
                         <outlet property="burgerButton" destination="MVJ-ex-Sx8" id="Byb-YM-WN3"/>
                         <outlet property="closeButton" destination="Eri-O2-1vs" id="owB-ms-KqD"/>
                         <outlet property="closeCircleButton" destination="WuS-Lu-38q" id="Epq-BG-QFD"/>
-                        <outlet property="downArrowButton" destination="JGa-di-8gl" id="mT2-Xx-e5E"/>
+                        <outlet property="downCaretButton" destination="JGa-di-8gl" id="a1B-0u-Qb4"/>
                         <outlet property="plusCircleButton" destination="Fnb-sA-OE9" id="O3C-0M-RGx"/>
                         <outlet property="plustButton" destination="79g-6E-ejR" id="MDm-rL-KaH"/>
-                        <outlet property="upArrowButton" destination="euH-tP-FHV" id="u0M-3K-lS8"/>
+                        <outlet property="upCaretButton" destination="euH-tP-FHV" id="VtK-OL-cYK"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="9oJ-e2-Eor" userLabel="First Responder" sceneMemberID="firstResponder"/>

diff --git a/FRDLivelyButtonDemo/FRDLivelyButtonDemo/TestViewController.m b/FRDLivelyButtonDemo/FRDLivelyButtonDemo/TestViewController.m
@@ -18,8 +18,8 @@ @interface TestViewController ()
 @property (weak, nonatomic) IBOutlet FRDLivelyButton *plusCircleButton;
 @property (weak, nonatomic) IBOutlet FRDLivelyButton *closeButton;
 @property (weak, nonatomic) IBOutlet FRDLivelyButton *closeCircleButton;
-@property (weak, nonatomic) IBOutlet FRDLivelyButton *upArrowButton;
-@property (weak, nonatomic) IBOutlet FRDLivelyButton *downArrowButton;
+@property (weak, nonatomic) IBOutlet FRDLivelyButton *upCaretButton;
+@property (weak, nonatomic) IBOutlet FRDLivelyButton *downCaretButton;
 
 @end
 
@@ -47,8 +47,8 @@ - (void)viewDidLoad
     [self.plustButton setStyle:kFRDLivelyButtonStylePlus animated:NO];
     [self.closeButton setStyle:kFRDLivelyButtonStyleClose animated:NO];
     [self.closeCircleButton setStyle:kFRDLivelyButtonStyleCircleClose animated:NO];
-    [self.upArrowButton setStyle:kFRDLivelyButtonStyleArrowUp animated:NO];
-    [self.downArrowButton setStyle:kFRDLivelyButtonStyleArrowDown animated:NO];
+    [self.upCaretButton setStyle:kFRDLivelyButtonStyleCaretUp animated:NO];
+    [self.downCaretButton setStyle:kFRDLivelyButtonStyleCaretDown animated:NO];
 
     [self.bigButton setStyle:kFRDLivelyButtonStyleClose animated:YES];
     [self.bigButton setOptions:@{kFRDLivelyButtonLineWidth: @(4.0f)}];