Styling ranking and time line

DailyReview/DailyReview.xcodeproj/project.pbxproj

@@ -172,7 +172,6 @@
 		A3048919164C7CB20062D3E6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = A3048915164C7CB20062D3E6 /* InfoPlist.strings */; };
 		A304891A164C7CB20062D3E6 /* MainStoryboard_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A3048917164C7CB20062D3E6 /* MainStoryboard_iPhone.storyboard */; };
 		A304891D164C7CD90062D3E6 /* RankingChartsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A304891C164C7CD90062D3E6 /* RankingChartsViewController.m */; };
-		A304894E164C8E540062D3E6 /* BehaviorSectionHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = A304894D164C8E540062D3E6 /* BehaviorSectionHeaderView.m */; };
 		A35455C91820D81700D03DE2 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A35455C81820D81600D03DE2 /* Images.xcassets */; };
 		A391D3F6165206070061BBC7 /* DataModel.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = A3048911164C7BE10062D3E6 /* DataModel.xcdatamodeld */; };
 		A391D3F8165206440061BBC7 /* db.sqlite in Resources */ = {isa = PBXBuildFile; fileRef = A391D3F7165206440061BBC7 /* db.sqlite */; };
@@ -210,15 +209,12 @@
 		A3C216F81652420D009B78F9 /* TimeLineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A304890F164C7B3D0062D3E6 /* TimeLineViewController.m */; };
 		A3C216F91652420D009B78F9 /* RankingChartsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A304891C164C7CD90062D3E6 /* RankingChartsViewController.m */; };
 		A3C216FA16524218009B78F9 /* HorizontalStackedView.m in Sources */ = {isa = PBXBuildFile; fileRef = 558707E1DC51985ADF5BC35D /* HorizontalStackedView.m */; };
-		A3C216FC16524218009B78F9 /* BehaviorSectionHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = A304894D164C8E540062D3E6 /* BehaviorSectionHeaderView.m */; };
 		A3C216FD16524218009B78F9 /* FullPageTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5587010F7A7A8D5D81529209 /* FullPageTextView.m */; };
 		A3C216FE16524218009B78F9 /* BehaviorTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 499EC2581537E9A90025C20D /* BehaviorTableViewCell.m */; };
 		A3C216FF16524218009B78F9 /* ScoreView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4956E97D1543EC9700C33D89 /* ScoreView.m */; };
 		A3C2170116524218009B78F9 /* HorizontalStackedView.m in Sources */ = {isa = PBXBuildFile; fileRef = 558707E1DC51985ADF5BC35D /* HorizontalStackedView.m */; };
-		A3C2170316524218009B78F9 /* BehaviorSectionHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = A304894D164C8E540062D3E6 /* BehaviorSectionHeaderView.m */; };
 		A3C2170416524218009B78F9 /* FullPageTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5587010F7A7A8D5D81529209 /* FullPageTextView.m */; };
 		A3C2170516524218009B78F9 /* HorizontalStackedView.m in Sources */ = {isa = PBXBuildFile; fileRef = 558707E1DC51985ADF5BC35D /* HorizontalStackedView.m */; };
-		A3C2170716524218009B78F9 /* BehaviorSectionHeaderView.m in Sources */ = {isa = PBXBuildFile; fileRef = A304894D164C8E540062D3E6 /* BehaviorSectionHeaderView.m */; };
 		A3C2170816524218009B78F9 /* FullPageTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5587010F7A7A8D5D81529209 /* FullPageTextView.m */; };
 		A3C2170916524222009B78F9 /* UserDefaultsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 558708EAAD5822BC9B49D054 /* UserDefaultsManager.m */; };
 		A3C2170B16524222009B78F9 /* UserDefaultsManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 558708EAAD5822BC9B49D054 /* UserDefaultsManager.m */; };
@@ -422,8 +418,6 @@
 		A3048918164C7CB20062D3E6 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/MainStoryboard_iPhone.storyboard; sourceTree = "<group>"; };
 		A304891B164C7CD90062D3E6 /* RankingChartsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RankingChartsViewController.h; sourceTree = "<group>"; };
 		A304891C164C7CD90062D3E6 /* RankingChartsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RankingChartsViewController.m; sourceTree = "<group>"; };
-		A304894C164C8E540062D3E6 /* BehaviorSectionHeaderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BehaviorSectionHeaderView.h; sourceTree = "<group>"; };
-		A304894D164C8E540062D3E6 /* BehaviorSectionHeaderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BehaviorSectionHeaderView.m; sourceTree = "<group>"; };
 		A35455C81820D81600D03DE2 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Develpment/Images.xcassets; sourceTree = "<group>"; };
 		A391D3F7165206440061BBC7 /* db.sqlite */ = {isa = PBXFileReference; lastKnownFileType = file; name = db.sqlite; path = resources/db.sqlite; sourceTree = "<group>"; };
 		A3A77604165201610051BAA1 /* initial_data.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = initial_data.json; path = resources/initial_data.json; sourceTree = "<group>"; };
@@ -784,8 +778,6 @@
 			children = (
 				558708C173DE23AD638E7D62 /* HorizontalStackedView.h */,
 				558707E1DC51985ADF5BC35D /* HorizontalStackedView.m */,
-				A304894C164C8E540062D3E6 /* BehaviorSectionHeaderView.h */,
-				A304894D164C8E540062D3E6 /* BehaviorSectionHeaderView.m */,
 				55870B8027DB15C18B314DAD /* FullPageTextView.h */,
 				5587010F7A7A8D5D81529209 /* FullPageTextView.m */,
 				499EC2571537E9A90025C20D /* BehaviorTableViewCell.h */,
@@ -1157,7 +1149,6 @@
 				A3C216E3165241AA009B78F9 /* RankingChartsViewController.m in Sources */,
 				A3C216EB165241BF009B78F9 /* DataModel.xcdatamodeld in Sources */,
 				A3C2170516524218009B78F9 /* HorizontalStackedView.m in Sources */,
-				A3C2170716524218009B78F9 /* BehaviorSectionHeaderView.m in Sources */,
 				A3C2170816524218009B78F9 /* FullPageTextView.m in Sources */,
 				A3C2170C16524223009B78F9 /* UserDefaultsManager.m in Sources */,
 				A3C21720165242C1009B78F9 /* NSString+Additions.m in Sources */,
@@ -1207,7 +1198,6 @@
 				A3C216E1165241A9009B78F9 /* RankingChartsViewController.m in Sources */,
 				A3C216EA165241BD009B78F9 /* DataModel.xcdatamodeld in Sources */,
 				A3C2170116524218009B78F9 /* HorizontalStackedView.m in Sources */,
-				A3C2170316524218009B78F9 /* BehaviorSectionHeaderView.m in Sources */,
 				A3C2170416524218009B78F9 /* FullPageTextView.m in Sources */,
 				A3C2170B16524222009B78F9 /* UserDefaultsManager.m in Sources */,
 				A3C2171F165242C0009B78F9 /* NSString+Additions.m in Sources */,
@@ -1255,7 +1245,6 @@
 				A3C216F81652420D009B78F9 /* TimeLineViewController.m in Sources */,
 				A3C216F91652420D009B78F9 /* RankingChartsViewController.m in Sources */,
 				A3C216FA16524218009B78F9 /* HorizontalStackedView.m in Sources */,
-				A3C216FC16524218009B78F9 /* BehaviorSectionHeaderView.m in Sources */,
 				A3C216FD16524218009B78F9 /* FullPageTextView.m in Sources */,
 				A3C216FE16524218009B78F9 /* BehaviorTableViewCell.m in Sources */,
 				A3C216FF16524218009B78F9 /* ScoreView.m in Sources */,
@@ -1307,7 +1296,6 @@
 				A3048910164C7B3D0062D3E6 /* TimeLineViewController.m in Sources */,
 				A3048914164C7BE10062D3E6 /* DataModel.xcdatamodeld in Sources */,
 				A304891D164C7CD90062D3E6 /* RankingChartsViewController.m in Sources */,
-				A304894E164C8E540062D3E6 /* BehaviorSectionHeaderView.m in Sources */,
 				558707CAC1852A202DCE74A3 /* BaihuaViewController.m in Sources */,
 				558702E8A02CBB5B38DFAD80 /* UserDefaultsManager.m in Sources */,
 				55870AA47DE5892B25997879 /* NotificationSettingController.m in Sources */,

DailyReview/Develpment/Images.xcassets/images/sort.imageset/Contents.json

@@ -2,7 +2,8 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x"
+      "scale" : "1x",
+      "filename" : "sort.png"
     },
     {
       "idiom" : "universal",

DailyReview/Develpment/Images.xcassets/images/timeline.imageset/Contents.json

@@ -2,7 +2,8 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x"
+      "scale" : "1x",
+      "filename" : "timeline.png"
     },
     {
       "idiom" : "universal",

DailyReview/src/RankingChartsViewController.m

@@ -12,7 +12,6 @@
 #import "NSArray+Additions.h"
 #import "Behavior.h"
 #import "BehaviorTableViewCell.h"
-#import "BehaviorSectionHeaderView.h"
 #import "UIColor+Additions.h"
 
 @interface RankingChartsViewController () {
@@ -25,7 +24,6 @@ @implementation RankingChartsViewController
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.view.backgroundColor = [UIColor creamColor];
     [self fetchTableData];
 }
 
@@ -85,11 +83,11 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 
 #pragma mark - Table view delegate
 
-- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
-    return [BehaviorSectionHeaderView viewWithTitle:section == 0 ? @"功德排行" : @"过失排行"];
+- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
+    return section == 0 ? @"功德排行" : @"过失排行";
 }
 
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
-    return 32;
+    return 36;
 }
 @end

DailyReview/src/TimeLineViewController.m

@@ -12,84 +12,85 @@
 #import "NSFetchedResultsController+Additions.h"
 #import "BehaviorTableViewCell.h"
 #import "Event.h"
-#import "BehaviorSectionHeaderView.h"
 #import "NSArray+Additions.h"
 #import "UIColor+Additions.h"
 
 @interface TimeLineViewController () {
-    NSFetchedResultsController *_resultsController;
-    NSDateFormatter *_dateFormatter;
+  NSFetchedResultsController *_resultsController;
+  NSDateFormatter *_dateFormatter;
 }
 @end
 
 @implementation TimeLineViewController
 
 - (void)viewDidLoad {
-    [super viewDidLoad];
-
-    [[self resultsController] performFetch:nil];
-
-    _dateFormatter = [[NSDateFormatter alloc] init];
-    _dateFormatter.locale = [[NSLocale alloc] initWithLocaleIdentifier:@"zh_CN"];
-    _dateFormatter.dateStyle = NSDateFormatterLongStyle;
-    _dateFormatter.timeStyle = NSDateFormatterNoStyle;
+  [super viewDidLoad];
+    
+  [[self resultsController] performFetch:nil];
+  
+  _dateFormatter = [[NSDateFormatter alloc] init];
+  _dateFormatter.locale = [[NSLocale alloc] initWithLocaleIdentifier:@"zh_CN"];
+  _dateFormatter.dateStyle = NSDateFormatterLongStyle;
+  _dateFormatter.timeStyle = NSDateFormatterNoStyle;
 }
 
 - (void)viewWillAppear:(BOOL)animated {
-    [super viewWillAppear:animated];
-    [[self resultsController] performFetch:nil];
-    [[self tableView] reloadData];
+  [super viewWillAppear:animated];
+  [[self resultsController] performFetch:nil];
+  [[self tableView] reloadData];
 }
 
 - (NSFetchedResultsController *)resultsController {
-    if (_resultsController == nil) {
-        NSManagedObjectContext *context = [NSManagedObjectContext defaultContext];
-        NSFetchRequest *request = [[NSFetchRequest alloc] initWithEntityName:@"Event"];
-
-        NSSortDescriptor *dateSorter = [[NSSortDescriptor alloc] initWithKey:@"date" ascending:NO];
-        NSSortDescriptor *countSorter = [[NSSortDescriptor alloc] initWithKey:@"count" ascending:NO];
-        NSSortDescriptor *rankSorter = [[NSSortDescriptor alloc] initWithKey:@"behavior.rank" ascending:YES];
-        [request setSortDescriptors:@[dateSorter, countSorter, rankSorter]];
-
-        request.fetchBatchSize = 20;
-
-        _resultsController =
-                [[NSFetchedResultsController alloc] initWithFetchRequest:request managedObjectContext:context
-                                                      sectionNameKeyPath:@"date" cacheName:@"TimelineResults"];
-    }
-    return _resultsController;
+  if (_resultsController == nil) {
+    NSManagedObjectContext *context = [NSManagedObjectContext defaultContext];
+    NSFetchRequest *request = [[NSFetchRequest alloc] initWithEntityName:@"Event"];
+    
+    NSSortDescriptor *dateSorter = [[NSSortDescriptor alloc] initWithKey:@"date" ascending:NO];
+    NSSortDescriptor *countSorter = [[NSSortDescriptor alloc] initWithKey:@"count" ascending:NO];
+    NSSortDescriptor *rankSorter = [[NSSortDescriptor alloc] initWithKey:@"behavior.rank" ascending:YES];
+    [request setSortDescriptors:@[dateSorter, countSorter, rankSorter]];
+    
+    request.fetchBatchSize = 20;
+    
+    _resultsController =
+    [[NSFetchedResultsController alloc] initWithFetchRequest:request managedObjectContext:context
+                                          sectionNameKeyPath:@"date" cacheName:@"TimelineResults"];
+  }
+  return _resultsController;
 }
 
 #pragma mark - Table view data source
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-    return [[self.resultsController sections] count];
+  return [[self.resultsController sections] count];
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return [self.resultsController numberOfObjectsInSection:(NSUInteger) section];
+  return [self.resultsController numberOfObjectsInSection:(NSUInteger) section];
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    BehaviorTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([BehaviorTableViewCell class])];
-    if (nil == cell) {
-        cell = [BehaviorTableViewCell cell];
-    }
+  BehaviorTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([BehaviorTableViewCell class])];
+  if (nil == cell) {
+    cell = [BehaviorTableViewCell cell];
+  }
+
+  Event *event = [self.resultsController objectAtIndexPath:indexPath];
+  cell.textLabel.text = event.behavior.name;
+  [cell displayEventCount:event.count];
+  return cell;
+}
 
-    Event *event = [self.resultsController objectAtIndexPath:indexPath];
-    cell.textLabel.text = event.behavior.name;
-    [cell displayEventCount:event.count];
-    return cell;
+- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
+{
+  NSDate *date = ((Event *) [[[[self.resultsController sections] objectAtIndex:(NSUInteger) section] objects] first]).date;
+  return [_dateFormatter stringFromDate:date];
+
 }
 
 #pragma mark - Table view delegate
 
-- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
-    NSDate *date = ((Event *) [[[[self.resultsController sections] objectAtIndex:(NSUInteger) section] objects] first]).date;
-    return [BehaviorSectionHeaderView viewWithTitle:[_dateFormatter stringFromDate:date]];
-}
-
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
-    return 32;
+  return 36;
 }
 @end