Merge pull request forkingdog#358 from forkingdog/1.7-Dev

accessory and index title width problem

Author: wangyutao0424

Classes/UITableView+FDTemplateLayoutCell.m

@@ -32,11 +32,18 @@ - (CGFloat)fd_systemFittingHeightForConfiguratedCell:(UITableViewCell *)cell {
     cellBounds.size.width = contentViewWidth;
     cell.bounds = cellBounds;
 
-    CGFloat accessroyWidth = 0;
+    CGFloat rightSystemViewsWidth = 0.0;
+    for (UIView *view in self.subviews) {
+        if ([view isKindOfClass:NSClassFromString(@"UITableViewIndex")]) {
+            rightSystemViewsWidth = CGRectGetWidth(view.frame);
+            break;
+        }
+    }
+    
     // If a cell has accessory view or system accessory type, its content view's width is smaller
     // than cell's by some fixed values.
     if (cell.accessoryView) {
-        accessroyWidth = 16 + CGRectGetWidth(cell.accessoryView.frame);
+        rightSystemViewsWidth += 16 + CGRectGetWidth(cell.accessoryView.frame);
     } else {
         static const CGFloat systemAccessoryWidths[] = {
             [UITableViewCellAccessoryNone] = 0,
@@ -45,9 +52,14 @@ - (CGFloat)fd_systemFittingHeightForConfiguratedCell:(UITableViewCell *)cell {
             [UITableViewCellAccessoryCheckmark] = 40,
             [UITableViewCellAccessoryDetailButton] = 48
         };
-        accessroyWidth = systemAccessoryWidths[cell.accessoryType];
+        rightSystemViewsWidth += systemAccessoryWidths[cell.accessoryType];
     }
-    contentViewWidth -= accessroyWidth;
+    
+    if ([UIScreen mainScreen].scale >= 3 && [UIScreen mainScreen].bounds.size.width >= 414) {
+        rightSystemViewsWidth += 4;
+    }
+    
+    contentViewWidth -= rightSystemViewsWidth;
 
 
     // If not using auto layout, you have to override "-sizeThatFits:" to provide a fitting size by yourself.
@@ -79,7 +91,7 @@ - (CGFloat)fd_systemFittingHeightForConfiguratedCell:(UITableViewCell *)cell {
 
             // Build edge constraints
             NSLayoutConstraint *leftConstraint = [NSLayoutConstraint constraintWithItem:cell.contentView attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:cell attribute:NSLayoutAttributeLeft multiplier:1.0 constant:0];
-            NSLayoutConstraint *rightConstraint = [NSLayoutConstraint constraintWithItem:cell.contentView attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:cell attribute:NSLayoutAttributeRight multiplier:1.0 constant:accessroyWidth];
+            NSLayoutConstraint *rightConstraint = [NSLayoutConstraint constraintWithItem:cell.contentView attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:cell attribute:NSLayoutAttributeRight multiplier:1.0 constant:-rightSystemViewsWidth];
             NSLayoutConstraint *topConstraint = [NSLayoutConstraint constraintWithItem:cell.contentView attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:cell attribute:NSLayoutAttributeTop multiplier:1.0 constant:0];
             NSLayoutConstraint *bottomConstraint = [NSLayoutConstraint constraintWithItem:cell.contentView attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:cell attribute:NSLayoutAttributeBottom multiplier:1.0 constant:0];
             edgeConstraints = @[leftConstraint, rightConstraint, topConstraint, bottomConstraint];

Demo/Demo/FDFeedViewController.m

@@ -90,6 +90,10 @@ - (void)configureCell:(FDFeedCell *)cell atIndexPath:(NSIndexPath *)indexPath {
     cell.entity = self.feedEntitySections[indexPath.section][indexPath.row];
 }
 
+- (NSArray<NSString *> *)sectionIndexTitlesForTableView:(UITableView *)tableView {
+    return @[@"A",@"B",@"C",@"D"];
+}
+
 #pragma mark - UITableViewDelegate
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {