Refactor orientation property

alekseyn · Aug 20, 2014 · 3821ec9 · 3821ec9
1 parent 6059502
commit 3821ec9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/Classes/EasyTableView.h b/Classes/EasyTableView.h
@@ -37,10 +37,10 @@
 #define ROTATED_CELL_VIEW_TAG	801
 #define CELL_CONTENT_TAG		802
 
-typedef enum {
-	EasyTableViewOrientationVertical,
+typedef NS_ENUM(NSUInteger, EasyTableViewOrientation){
+    EasyTableViewOrientationVertical,
 	EasyTableViewOrientationHorizontal
-} EasyTableViewOrientation;
+};
 
 @class EasyTableView;
 
@@ -66,7 +66,7 @@ typedef enum {
 @property (nonatomic, readonly, weak) NSArray *visibleViews;
 @property (nonatomic) NSIndexPath *selectedIndexPath;
 @property (nonatomic) UIColor *cellBackgroundColor;
-@property (nonatomic, readonly) EasyTableViewOrientation orientation;
+@property (nonatomic) EasyTableViewOrientation orientation;
 @property (nonatomic, assign) CGPoint contentOffset;
 @property (nonatomic, assign) NSUInteger numberOfCells;
 

diff --git a/Classes/EasyTableView.m b/Classes/EasyTableView.m
@@ -40,7 +40,7 @@ - (id)initWithFrame:(CGRect)frame numberOfColumns:(NSUInteger)numCols ofWidth:(C
     if (self = [super initWithFrame:frame]) {
 		_numItems			= numCols;
 		_cellWidthOrHeight	= width;
-		_orientation = EasyTableViewOrientationHorizontal;
+		self.orientation = EasyTableViewOrientationHorizontal;
         self.tableView = [UITableView new];
 	}
     return self;
@@ -51,7 +51,7 @@ - (id)initWithFrame:(CGRect)frame numberOfRows:(NSUInteger)numRows ofHeight:(CGF
     if (self = [super initWithFrame:frame]) {
 		_numItems			= numRows;
 		_cellWidthOrHeight	= height;
-		_orientation = EasyTableViewOrientationVertical;
+		self.orientation = EasyTableViewOrientationVertical;
         self.tableView = [UITableView new];
     }
     return self;
@@ -63,20 +63,28 @@ - (void)setTableView:(UITableView *)tableView
 {
     _tableView = tableView;
 
+    self.orientation = _orientation;
+
+    _tableView.delegate			= self;
+    _tableView.dataSource		= self;
+    _tableView.autoresizingMask	= UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+    [self addSubview:_tableView];
+}
+
+- (void)setOrientation:(EasyTableViewOrientation)orientation
+{
+    _orientation = orientation;
+
     if (_orientation == EasyTableViewOrientationHorizontal) {
         int xOrigin	= (self.bounds.size.width - self.bounds.size.height)/2;
         int yOrigin	= (self.bounds.size.height - self.bounds.size.width)/2;
-        _tableView.frame = CGRectMake(xOrigin, yOrigin, self.bounds.size.height, self.bounds.size.width);
-        _tableView.transform	= CGAffineTransformMakeRotation(-M_PI/2);
+        self.tableView.frame = CGRectMake(xOrigin, yOrigin, self.bounds.size.height, self.bounds.size.width);
+        self.tableView.transform	= CGAffineTransformMakeRotation(-M_PI/2);
     }
     else
     {
-        _tableView.frame = CGRectMake(0, 0, self.bounds.size.width, self.bounds.size.height);
+        self.tableView.frame = CGRectMake(0, 0, self.bounds.size.width, self.bounds.size.height);
     }
-    _tableView.delegate			= self;
-    _tableView.dataSource		= self;
-    _tableView.autoresizingMask	= UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
-    [self addSubview:_tableView];
 }
 
 - (NSArray *)visibleViews {