- Added highlightedCellDirection in custom layout attributes

- Little refactoring

Author: rais38

RAMCollectionViewFlemishBondLayout/RAMCollectionViewFlemishBondLayout.h

@@ -27,15 +27,11 @@
 //
 
 #import <UIKit/UIKit.h>
+#import "RAMCollectionViewFlemishBondLayoutAttributes.h"
 
 FOUNDATION_EXPORT NSString *const RAMCollectionViewFlemishBondHeaderKind;
 FOUNDATION_EXPORT NSString *const RAMCollectionViewFlemishBondFooterKind;
 
-typedef NS_ENUM(NSUInteger, RAMCollectionViewFlemishBondLayoutGroupDirection) {
-    RAMCollectionViewFlemishBondLayoutGroupDirectionLeft,
-    RAMCollectionViewFlemishBondLayoutGroupDirectionRight
-};
-
 @class RAMCollectionViewFlemishBondLayout;
 
 @protocol RAMCollectionViewFlemishBondLayoutDelegate <NSObject>

RAMCollectionViewFlemishBondLayout/RAMCollectionViewFlemishBondLayout.m

@@ -27,7 +27,6 @@
 //
 
 #import "RAMCollectionViewFlemishBondLayout.h"
-#import "RAMCollectionViewFlemishBondLayoutAttributes.h"
 
 static NSString *const RAMCollectionViewFlemishBondCellKind = @"RAMCollectionViewFlemishBondCellKind";
 NSString *const RAMCollectionViewFlemishBondHeaderKind = @"RAMCollectionViewFlemishBondHeaderKind";
@@ -64,7 +63,7 @@ - (id)init
 
 - (id)initWithCoder:(NSCoder *)aDecoder
 {
-    self = [super init];
+    self = [super initWithCoder:aDecoder];
     if (self) {
         [self setup];
     }
@@ -178,7 +177,8 @@ - (void)prepareLayout
 
             RAMCollectionViewFlemishBondLayoutAttributes *layoutAttributes = [RAMCollectionViewFlemishBondLayoutAttributes layoutAttributesForCellWithIndexPath:indexPath];
             layoutAttributes.frame = [self frameForCellAtIndexPath:indexPath];
-            layoutAttributes.highlightedCell = [self isHighLightedElementAtIndexPath:indexPath] ? YES : NO;
+            layoutAttributes.highlightedCell = [self isHighLightedElementAtIndexPath:indexPath];
+            layoutAttributes.highlightedCellDirection = self.highlightedCellDirection;
 
             cellLayoutDictionary[indexPath] = layoutAttributes;
         }

RAMCollectionViewFlemishBondLayout/RAMCollectionViewFlemishBondLayoutAttributes.h

@@ -28,8 +28,14 @@
 
 #import <UIKit/UIKit.h>
 
+typedef NS_ENUM(NSUInteger, RAMCollectionViewFlemishBondLayoutGroupDirection) {
+    RAMCollectionViewFlemishBondLayoutGroupDirectionLeft,
+    RAMCollectionViewFlemishBondLayoutGroupDirectionRight
+};
+
 @interface RAMCollectionViewFlemishBondLayoutAttributes : UICollectionViewLayoutAttributes
 
 @property (nonatomic, assign, getter = isHighlightedCell) BOOL highlightedCell;
+@property (nonatomic, assign) RAMCollectionViewFlemishBondLayoutGroupDirection highlightedCellDirection;
 
 @end

RAMCollectionViewFlemishBondLayout/RAMCollectionViewFlemishBondLayoutAttributes.m

@@ -34,13 +34,17 @@ - (id)copyWithZone:(NSZone *)zone
 {
     RAMCollectionViewFlemishBondLayoutAttributes *attributes = [super copyWithZone:zone];
     attributes.highlightedCell = self.highlightedCell;
+    attributes.highlightedCellDirection = self.highlightedCellDirection;
 
     return attributes;
 }
 
 - (NSString *)debugDescription
 {
-    return [self.description stringByAppendingFormat:@"highlighted cell: %@", [self isHighlightedCell] ? @"Yes" : @"No"];
+    NSString *highlightedCellString = [NSString stringWithFormat:@"Highlighted cell: %@; ", [self isHighlightedCell] ? @"Yes" : @"No"];
+    NSString *highlightedCellDirectionString = [NSString stringWithFormat:@"Highlighted cell direction: %@; ", (self.highlightedCellDirection == RAMCollectionViewFlemishBondLayoutGroupDirectionLeft) ? @"Left" : @"Right"];
+    
+    return [self.description stringByAppendingFormat:@"%@%@", highlightedCellString, highlightedCellDirectionString];
 }
 
 @end