Browse Source

activity view

Marino Faggiana 6 years ago
parent
commit
ace9478355
2 changed files with 7 additions and 2 deletions
  1. 1 1
      iOSClient/Activity/NCActivity.swift
  2. 6 1
      iOSClient/Utility/CCUtility.m

+ 1 - 1
iOSClient/Activity/NCActivity.swift

@@ -126,7 +126,7 @@ class NCActivity: UIViewController, UITableViewDataSource, UITableViewDelegate,
         label.textAlignment = .center
         label.layer.cornerRadius = 10
         label.layer.masksToBounds = true
-        label.layer.backgroundColor = UIColor(red: 162.0/255.0, green: 162.0/255.0, blue: 162.0/255.0, alpha: 0.8).cgColor
+        label.layer.backgroundColor = UIColor(red: 220.0/255.0, green: 220.0/255.0, blue: 220.0/255.0, alpha: 0.8).cgColor
         
         view.addSubview(label)
         return view

+ 6 - 1
iOSClient/Utility/CCUtility.m

@@ -942,6 +942,8 @@
 + (NSString *)getTitleSectionDate:(NSDate *)date
 {
     NSString * title;
+    NSDate *today = [NSDate date];
+    NSDate *yesterday = [today dateByAddingTimeInterval: -86400.0];
     
     if ([date isEqualToDate:[CCUtility datetimeWithOutTime:[NSDate distantPast]]]) {
         
@@ -951,8 +953,11 @@
         
         title = [NSDateFormatter localizedStringFromDate:date dateStyle:NSDateFormatterFullStyle timeStyle:0];
         
-        if ([date isEqualToDate:[CCUtility datetimeWithOutTime:[NSDate date]]])
+        if ([date isEqualToDate:[CCUtility datetimeWithOutTime:today]])
             title = [NSString stringWithFormat:NSLocalizedString(@"_today_", nil)];
+        
+        if ([date isEqualToDate:[CCUtility datetimeWithOutTime:yesterday]])
+            title = [NSString stringWithFormat:NSLocalizedString(@"_yesterday_", nil)];
     }
     
     return title;