Fixes a scrolling issue and default cell label background colors on 6.1 fixes CEWendel#29 CEWendel#22

CEWendel · CEWendel · commit ecf1de4407e5 · 2013-11-22T16:42:47.000-05:00
diff --git a/SWTableViewCell/SWTableViewCell.m b/SWTableViewCell/SWTableViewCell.m
@@ -138,11 +138,12 @@ @implementation SWUtilityButtonTapGestureRecognizer
 
 @interface SWTableViewCell () <UIScrollViewDelegate> {
     SWCellState _cellState; // The state of the cell within the scroll view, can be left, right or middle
+    BOOL _isHidingUtilityButtons;
     CGFloat additionalRightPadding;
 }
 
 // Scroll view to be added to UITableViewCell
-@property (nonatomic, weak) UIScrollView *cellScrollView;
+@property (nonatomic, strong) SWCellScrollView *cellScrollView;
 
 // The cell's height
 @property (nonatomic) CGFloat height;
@@ -223,6 +224,7 @@ - (void)initializer {
     cellScrollView.delegate = self;
     cellScrollView.showsHorizontalScrollIndicator = NO;
     cellScrollView.scrollsToTop = NO;
+    cellScrollView.scrollEnabled = YES;
     
     UITapGestureRecognizer *tapGesutreRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(scrollViewUp:)];
     [cellScrollView addGestureRecognizer:tapGesutreRecognizer];
@@ -407,7 +409,11 @@ - (void)leftUtilityButtonHandler:(id)sender {
 
 - (void)hideUtilityButtonsAnimated:(BOOL)animated {
     // Scroll back to center
-    [self.cellScrollView setContentOffset:CGPointMake([self leftUtilityButtonsWidth], 0) animated:animated];
+    
+    // Force the scroll back to run on the main thread because of weird scroll view bugs
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [self.cellScrollView setContentOffset:CGPointMake([self leftUtilityButtonsWidth], 0) animated:YES];
+    });
     _cellState = kCellStateCenter;
     
     if ([_delegate respondsToSelector:@selector(swippableTableViewCell:scrollingToState:)]) {
@@ -427,6 +433,7 @@ - (void)layoutSubviews {
     self.scrollViewButtonViewLeft.frame = CGRectMake([self leftUtilityButtonsWidth], 0, [self leftUtilityButtonsWidth], _height);
     self.scrollViewButtonViewRight.frame = CGRectMake(CGRectGetWidth(self.bounds), 0, [self rightUtilityButtonsWidth], _height);
     self.scrollViewContentView.frame = CGRectMake([self leftUtilityButtonsWidth], 0, CGRectGetWidth(self.bounds), _height);
+    self.cellScrollView.scrollEnabled = YES;
     self.containingTableView.scrollEnabled = YES;
     self.tapGestureRecognizer.enabled = YES;
 }
@@ -552,6 +559,7 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
             self.scrollViewButtonViewLeft.frame = CGRectMake(scrollView.contentOffset.x, 0.0f, [self leftUtilityButtonsWidth], _height);
         }
     } else {
+        self.containingTableView.scrollEnabled = YES;
         [scrollView setContentOffset:CGPointMake([self leftUtilityButtonsWidth], 0) animated:NO];
     }
 }
@@ -565,6 +573,7 @@ - (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView {
     // Called when setContentOffset in hideUtilityButtonsAnimated: is done
     self.tapGestureRecognizer.enabled = YES;
     if (_cellState == kCellStateCenter) {
+        self.containingTableView.scrollEnabled = YES;
         self.longPressGestureRecognizer.enabled = YES;
     }
 }
diff --git a/SWTableViewCell/ViewController.m b/SWTableViewCell/ViewController.m
@@ -28,7 +28,11 @@ - (void)viewDidLoad
     self.tableView.dataSource = self;
     self.tableView.rowHeight = 90;
     self.tableView.allowsSelection = NO; // We essentially implement our own selection
-    self.tableView.separatorInset = UIEdgeInsetsMake(0, 0, 0, 0); // Makes the horizontal row seperator stretch the entire length of the table view
+    
+    // If you set the seperator inset on iOS 6 you get a NSInvalidArgumentException...weird
+    if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 7) {
+       self.tableView.separatorInset = UIEdgeInsetsMake(0, 0, 0, 0); // Makes the horizontal row seperator stretch the entire length of the table view
+    }
     
     _sections = [[UILocalizedIndexedCollation currentCollation] sectionIndexTitles];
     
@@ -78,7 +82,6 @@ - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInte
 
 /*
  This makes it so cells will not scroll sideways when the table view is scrolling.
- Makes scrolling the containing table view much smoother
  */
 
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
@@ -128,6 +131,8 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     
     NSDate *dateObject = _testArray[indexPath.section][indexPath.row];
     cell.textLabel.text = [dateObject description];
+    cell.textLabel.backgroundColor = [UIColor whiteColor];
+    cell.detailTextLabel.backgroundColor = [UIColor whiteColor];
     cell.detailTextLabel.text = @"Some detail text";
     
 //     If you are setting the row height on an individual basis:
@@ -178,7 +183,7 @@ - (void)swippableTableViewCell:(SWTableViewCell *)cell didTriggerRightUtilityBut
             NSLog(@"More button was pressed");
             UIAlertView *alertTest = [[UIAlertView alloc] initWithTitle:@"Hello" message:@"More more more" delegate:nil cancelButtonTitle:@"cancel" otherButtonTitles: nil];
             [alertTest show];
-            
+        
             [cell hideUtilityButtonsAnimated:YES];
             break;
         }
