Add MRCReposViewModelOptionsTableViewCellEditActions

leichunfeng · leichunfeng · commit d5f98adda693 · 2015-12-05T21:52:00.000+08:00
Former-commit-id: 52be359
diff --git a/MVVMReactiveCocoa/View/MRCOwnedReposViewController.m b/MVVMReactiveCocoa/View/MRCOwnedReposViewController.m
@@ -55,6 +55,10 @@ - (void)configureCell:(MRCReposTableViewCell *)cell atIndexPath:(NSIndexPath *)i
 
 #pragma mark - UITableViewDataSource
 
+- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
+    return self.viewModel.options & MRCReposViewModelOptionsTableViewCellEditActions;
+}
+
 - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath {}
 
 #pragma mark - UITableViewDelegate
@@ -65,7 +69,7 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa
 
 - (NSArray *)tableView:(UITableView *)tableView editActionsForRowAtIndexPath:(NSIndexPath *)indexPath {
     MRCReposItemViewModel *viewModel = self.viewModel.dataSource[indexPath.section][indexPath.row];
-
+    
     void (^handlerStar)(UITableViewRowAction *, NSIndexPath *) = ^(UITableViewRowAction *action, NSIndexPath *indexPath) {
         tableView.editing = false;
         [[[self.viewModel.services client] mrc_starRepository:viewModel.repository] subscribeNext:^(id x) {}];
diff --git a/MVVMReactiveCocoa/ViewModel/MRCOwnedReposViewModel.h b/MVVMReactiveCocoa/ViewModel/MRCOwnedReposViewModel.h
@@ -24,6 +24,7 @@ typedef NS_OPTIONS(NSUInteger, MRCReposViewModelOptions) {
     MRCReposViewModelOptionsSectionIndex              = 1 << 4,
     MRCReposViewModelOptionsShowOwnerLogin            = 1 << 5,
     MRCReposViewModelOptionsMarkStarredStatus         = 1 << 6,
+    MRCReposViewModelOptionsTableViewCellEditActions  = 1 << 7,
 };
 
 @interface MRCOwnedReposViewModel : MRCTableViewModel
diff --git a/MVVMReactiveCocoa/ViewModel/MRCOwnedReposViewModel.m b/MVVMReactiveCocoa/ViewModel/MRCOwnedReposViewModel.m
@@ -124,6 +124,7 @@ - (MRCReposViewModelOptions)options {
     options = options | MRCReposViewModelOptionsSectionIndex;
 //    options = options | MRCReposViewModelOptionsShowOwnerLogin;
 //    options = options | MRCReposViewModelOptionsMarkStarredStatus;
+//    options = options | MRCReposViewModelOptionsTableViewCellEditActions;
     
     return options;
 }
diff --git a/MVVMReactiveCocoa/ViewModel/MRCPublicReposViewModel.m b/MVVMReactiveCocoa/ViewModel/MRCPublicReposViewModel.m
@@ -31,6 +31,7 @@ - (MRCReposViewModelOptions)options {
 //        options = options | MRCReposViewModelOptionsSectionIndex;
 //        options = options | MRCReposViewModelOptionsShowOwnerLogin;
 //        options = options | MRCReposViewModelOptionsMarkStarredStatus;
+        options = options | MRCReposViewModelOptionsTableViewCellEditActions;
     } else {
 //        options = options | MRCReposViewModelOptionsObserveStarredReposChange;
 //        options = options | MRCReposViewModelOptionsSaveOrUpdateRepos;
@@ -39,6 +40,7 @@ - (MRCReposViewModelOptions)options {
 //        options = options | MRCReposViewModelOptionsSectionIndex;
         options = options | MRCReposViewModelOptionsShowOwnerLogin;
         options = options | MRCReposViewModelOptionsMarkStarredStatus;
+        options = options | MRCReposViewModelOptionsTableViewCellEditActions;
     }
     
     return options;
diff --git a/MVVMReactiveCocoa/ViewModel/MRCReposSearchResultsViewModel.m b/MVVMReactiveCocoa/ViewModel/MRCReposSearchResultsViewModel.m
@@ -36,6 +36,7 @@ - (MRCReposViewModelOptions)options {
 //    options = options | MRCReposViewModelOptionsSectionIndex;
     options = options | MRCReposViewModelOptionsShowOwnerLogin;
     options = options | MRCReposViewModelOptionsMarkStarredStatus;
+//    options = options | MRCReposViewModelOptionsTableViewCellEditActions;
     
     return options;
 }
diff --git a/MVVMReactiveCocoa/ViewModel/MRCStarredReposViewModel.m b/MVVMReactiveCocoa/ViewModel/MRCStarredReposViewModel.m
@@ -63,6 +63,10 @@ - (MRCReposViewModelOptions)options {
         options = options | MRCReposViewModelOptionsMarkStarredStatus;
     }
     
+    if (!(self.isCurrentUser && self.entryPoint == MRCStarredReposViewModelEntryPointHomepage)) {
+        options = options | MRCReposViewModelOptionsTableViewCellEditActions;
+    }
+    
     return options;
 }
 
diff --git a/MVVMReactiveCocoa/ViewModel/MRCTrendingViewModel.m b/MVVMReactiveCocoa/ViewModel/MRCTrendingViewModel.m
@@ -63,6 +63,7 @@ - (MRCReposViewModelOptions)options {
 //    options = options | MRCReposViewModelOptionsSectionIndex;
     options = options | MRCReposViewModelOptionsShowOwnerLogin;
     options = options | MRCReposViewModelOptionsMarkStarredStatus;
+    options = options | MRCReposViewModelOptionsTableViewCellEditActions;
 
     return options;
 }

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,7 @@ - (MRCReposViewModelOptions)options {`
`124`	`124`	`options = options \| MRCReposViewModelOptionsSectionIndex;`
`125`	`125`	`// options = options \| MRCReposViewModelOptionsShowOwnerLogin;`
`126`	`126`	`// options = options \| MRCReposViewModelOptionsMarkStarredStatus;`
	`127`	`+// options = options \| MRCReposViewModelOptionsTableViewCellEditActions;`
`127`	`128`
`128`	`129`	`return options;`
`129`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ - (MRCReposViewModelOptions)options {`
`36`	`36`	`// options = options \| MRCReposViewModelOptionsSectionIndex;`
`37`	`37`	`options = options \| MRCReposViewModelOptionsShowOwnerLogin;`
`38`	`38`	`options = options \| MRCReposViewModelOptionsMarkStarredStatus;`
	`39`	`+// options = options \| MRCReposViewModelOptionsTableViewCellEditActions;`
`39`	`40`
`40`	`41`	`return options;`
`41`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,10 @@ - (MRCReposViewModelOptions)options {`
`63`	`63`	`options = options \| MRCReposViewModelOptionsMarkStarredStatus;`
`64`	`64`	`}`
`65`	`65`
	`66`	`+ if (!(self.isCurrentUser && self.entryPoint == MRCStarredReposViewModelEntryPointHomepage)) {`
	`67`	`+ options = options \| MRCReposViewModelOptionsTableViewCellEditActions;`
	`68`	`+ }`
	`69`	`+`
`66`	`70`	`return options;`
`67`	`71`	`}`
`68`	`72`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,7 @@ - (MRCReposViewModelOptions)options {`
`63`	`63`	`// options = options \| MRCReposViewModelOptionsSectionIndex;`
`64`	`64`	`options = options \| MRCReposViewModelOptionsShowOwnerLogin;`
`65`	`65`	`options = options \| MRCReposViewModelOptionsMarkStarredStatus;`
	`66`	`+ options = options \| MRCReposViewModelOptionsTableViewCellEditActions;`
`66`	`67`
`67`	`68`	`return options;`
`68`	`69`	`}`