Perfect Trending logic

leichunfeng · leichunfeng · commit 9b53f2f3ea72 · 2015-10-22T23:03:41.000+08:00
Former-commit-id: 90949a0
diff --git a/MVVMReactiveCocoa/ViewModel/MRCTrendingSettingsViewModel.m b/MVVMReactiveCocoa/ViewModel/MRCTrendingSettingsViewModel.m
@@ -23,6 +23,7 @@ - (void)initialize {
     [super initialize];
     
     self.title = @"Options";
+    self.shouldRequestRemoteDataOnViewDidLoad = NO;
     
     NSArray *sinces = @[
 		@"Today",
diff --git a/MVVMReactiveCocoa/ViewModel/MRCTrendingViewModel.m b/MVVMReactiveCocoa/ViewModel/MRCTrendingViewModel.m
@@ -8,11 +8,20 @@
 
 #import "MRCTrendingViewModel.h"
 
+@interface MRCTrendingViewModel ()
+
+@property (nonatomic, strong) RACSignal *optionsSignal;
+
+@end
+
 @implementation MRCTrendingViewModel
 
 - (void)initialize {
     [super initialize];
     
+    self.shouldRequestRemoteDataOnViewDidLoad = NO;
+    self.requestRemoteDataCommand.allowsConcurrentExecution = YES;
+    
     NSString *since    = [[NSUserDefaults standardUserDefaults] stringForKey:@"since"];
     NSString *language = [[NSUserDefaults standardUserDefaults] stringForKey:@"language"];
     
@@ -24,17 +33,15 @@ - (void)initialize {
     RAC(self, title)    = RACObserve(self, language);
     RAC(self, subtitle) = RACObserve(self, since);
     
+    self.optionsSignal = [RACSignal combineLatest:@[ RACObserve(self, since).distinctUntilChanged,
+                                                     RACObserve(self, language).distinctUntilChanged, ]];
+
     @weakify(self)
-    [[[RACSignal
-    	combineLatest:@[
-            RACObserve(self, since).distinctUntilChanged,
-            RACObserve(self, language).distinctUntilChanged
-        ]]
-      	skip:1]
-    	subscribeNext:^(id x) {
-            @strongify(self)
-            [self.requestRemoteDataCommand execute:nil];
-        }];
+    [self.optionsSignal subscribeNext:^(id x) {
+        @strongify(self)
+        self.dataSource = nil;
+        [self.requestRemoteDataCommand execute:nil];
+    }];
 }
 
 - (MRCReposViewModelType)type {
@@ -60,9 +67,10 @@ - (id)fetchLocalData {
 }
 
 - (RACSignal *)requestRemoteDataSignalWithPage:(NSUInteger)page {
-    return [[self.services
-		repositoryService]
-        requestTrendingRepositoriesSince:self.since language:self.language];
+    return [[[self.services
+        repositoryService]
+        requestTrendingRepositoriesSince:self.since language:self.language]
+        takeUntil:[self.optionsSignal skip:1]];
 }
 
 @end
