Merge pull request #1409 from ejensen/swift-alignment-enum

[Refactoring] ASHorizontalAlignment & ASVerticalAlignment Swift interface

AsyncDisplayKit/ASButtonNode.h

@@ -28,12 +28,12 @@
 @property (nonatomic, assign) BOOL laysOutHorizontally;
 
 /** Horizontally align content (text or image).
- Defaults to ASAlignmentMiddle.
+ Defaults to ASHorizontalAlignmentMiddle.
  */
 @property (nonatomic, assign) ASHorizontalAlignment contentHorizontalAlignment;
 
 /** Vertically align content (text or image).
- Defaults to ASAlignmentCenter.
+ Defaults to ASVerticalAlignmentCenter.
  */
 @property (nonatomic, assign) ASVerticalAlignment contentVerticalAlignment;
 

AsyncDisplayKit/ASButtonNode.mm

@@ -57,8 +57,8 @@
     
     _contentSpacing = 8.0;
     _laysOutHorizontally = YES;
-    _contentHorizontalAlignment = ASAlignmentMiddle;
-    _contentVerticalAlignment = ASAlignmentCenter;
+    _contentHorizontalAlignment = ASHorizontalAlignmentMiddle;
+    _contentVerticalAlignment = ASVerticalAlignmentCenter;
     _contentEdgeInsets = UIEdgeInsetsZero;
     self.accessibilityTraits = UIAccessibilityTraitButton;
   }

AsyncDisplayKit/Layout/ASStackLayoutDefines.h

@@ -8,6 +8,8 @@
  *
  */
 
+#import "ASBaseDefines.h"
+
 /** The direction children are stacked in */
 typedef NS_ENUM(NSUInteger, ASStackLayoutDirection) {
   /** Children are stacked vertically */
@@ -88,11 +90,18 @@ typedef NS_ENUM(NSUInteger, ASHorizontalAlignment) {
   /** No alignment specified. Default value */
   ASHorizontalAlignmentNone,
   /** Left aligned */
-  ASAlignmentLeft,
+  ASHorizontalAlignmentLeft,
   /** Center aligned */
-  ASAlignmentMiddle,
+  ASHorizontalAlignmentMiddle,
   /** Right aligned */
-  ASAlignmentRight,
+  ASHorizontalAlignmentRight,
+
+  /** @deprecated Use ASHorizontalAlignmentLeft instead */
+  ASAlignmentLeft ASDISPLAYNODE_DEPRECATED = ASHorizontalAlignmentLeft,
+  /** @deprecated Use ASHorizontalAlignmentMiddle instead */
+  ASAlignmentMiddle ASDISPLAYNODE_DEPRECATED = ASHorizontalAlignmentMiddle,
+  /** @deprecated Use ASHorizontalAlignmentRight instead */
+  ASAlignmentRight ASDISPLAYNODE_DEPRECATED = ASHorizontalAlignmentRight,
 };
 
 /** Orientation of children along vertical axis */
@@ -100,9 +109,16 @@ typedef NS_ENUM(NSUInteger, ASVerticalAlignment) {
   /** No alignment specified. Default value */
   ASVerticalAlignmentNone,
   /** Top aligned */
-  ASAlignmentTop,
+  ASVerticalAlignmentTop,
   /** Center aligned */
-  ASAlignmentCenter,
+  ASVerticalAlignmentCenter,
   /** Bottom aligned */
-  ASAlignmentBottom,
+  ASVerticalAlignmentBottom,
+
+  /** @deprecated Use ASVerticalAlignmentTop instead */
+  ASAlignmentTop ASDISPLAYNODE_DEPRECATED = ASVerticalAlignmentTop,
+  /** @deprecated Use ASVerticalAlignmentCenter instead */
+  ASAlignmentCenter ASDISPLAYNODE_DEPRECATED = ASVerticalAlignmentCenter,
+  /** @deprecated Use ASVerticalAlignmentBottom instead */
+  ASAlignmentBottom ASDISPLAYNODE_DEPRECATED = ASVerticalAlignmentBottom,
 };

AsyncDisplayKit/Private/ASStackLayoutSpecUtilities.h

@@ -72,11 +72,11 @@ inline ASStackLayoutAlignItems alignment(ASStackLayoutAlignSelf childAlignment,
 inline ASStackLayoutAlignItems alignment(ASHorizontalAlignment alignment, ASStackLayoutAlignItems defaultAlignment)
 {
   switch (alignment) {
-    case ASAlignmentLeft:
+    case ASHorizontalAlignmentLeft:
       return ASStackLayoutAlignItemsStart;
-    case ASAlignmentMiddle:
+    case ASHorizontalAlignmentMiddle:
       return ASStackLayoutAlignItemsCenter;
-    case ASAlignmentRight:
+    case ASHorizontalAlignmentRight:
       return ASStackLayoutAlignItemsEnd;
     case ASHorizontalAlignmentNone:
     default:
@@ -87,11 +87,11 @@ inline ASStackLayoutAlignItems alignment(ASHorizontalAlignment alignment, ASStac
 inline ASStackLayoutAlignItems alignment(ASVerticalAlignment alignment, ASStackLayoutAlignItems defaultAlignment)
 {
   switch (alignment) {
-    case ASAlignmentTop:
+    case ASVerticalAlignmentTop:
       return ASStackLayoutAlignItemsStart;
-    case ASAlignmentCenter:
+    case ASVerticalAlignmentCenter:
       return ASStackLayoutAlignItemsCenter;
-    case ASAlignmentBottom:
+    case ASVerticalAlignmentBottom:
       return ASStackLayoutAlignItemsEnd;
     case ASVerticalAlignmentNone:
     default:
@@ -102,11 +102,11 @@ inline ASStackLayoutAlignItems alignment(ASVerticalAlignment alignment, ASStackL
 inline ASStackLayoutJustifyContent justifyContent(ASHorizontalAlignment alignment, ASStackLayoutJustifyContent defaultJustifyContent)
 {
   switch (alignment) {
-    case ASAlignmentLeft:
+    case ASHorizontalAlignmentLeft:
       return ASStackLayoutJustifyContentStart;
-    case ASAlignmentMiddle:
+    case ASHorizontalAlignmentMiddle:
       return ASStackLayoutJustifyContentCenter;
-    case ASAlignmentRight:
+    case ASHorizontalAlignmentRight:
       return ASStackLayoutJustifyContentEnd;
     case ASHorizontalAlignmentNone:
     default:
@@ -117,11 +117,11 @@ inline ASStackLayoutJustifyContent justifyContent(ASHorizontalAlignment alignmen
 inline ASStackLayoutJustifyContent justifyContent(ASVerticalAlignment alignment, ASStackLayoutJustifyContent defaultJustifyContent)
 {
   switch (alignment) {
-    case ASAlignmentTop:
+    case ASVerticalAlignmentTop:
       return ASStackLayoutJustifyContentStart;
-    case ASAlignmentCenter:
+    case ASVerticalAlignmentCenter:
       return ASStackLayoutJustifyContentCenter;
-    case ASAlignmentBottom:
+    case ASVerticalAlignmentBottom:
       return ASStackLayoutJustifyContentEnd;
     case ASVerticalAlignmentNone:
     default: