diff --git a/Signal.xcodeproj/project.pbxproj b/Signal.xcodeproj/project.pbxproj index 984dc36c3..df1e53038 100644 --- a/Signal.xcodeproj/project.pbxproj +++ b/Signal.xcodeproj/project.pbxproj @@ -310,7 +310,6 @@ B633C5841A1D190B0059AC12 /* backspace@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5021A1D190B0059AC12 /* backspace@2x.png */; }; B633C5851A1D190B0059AC12 /* blue-archive@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5031A1D190B0059AC12 /* blue-archive@2x.png */; }; B633C5861A1D190B0059AC12 /* call@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5041A1D190B0059AC12 /* call@2x.png */; }; - B633C5871A1D190B0059AC12 /* call_dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5051A1D190B0059AC12 /* call_dark@2x.png */; }; B633C58D1A1D190B0059AC12 /* contact_default_feed.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C50B1A1D190B0059AC12 /* contact_default_feed.png */; }; B633C58F1A1D190B0059AC12 /* contacts@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C50D1A1D190B0059AC12 /* contacts@2x.png */; }; B633C5921A1D190B0059AC12 /* contacts_tab@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = B633C5101A1D190B0059AC12 /* contacts_tab@2x.png */; }; @@ -497,7 +496,6 @@ FC31962A1A067D8F0094C78E /* MessageComposeTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FC3196291A067D8F0094C78E /* MessageComposeTableViewController.m */; }; FC31962D1A06A2190094C78E /* FingerprintViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FC31962C1A06A2190094C78E /* FingerprintViewController.m */; }; FC3196301A0814130094C78E /* SettingsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FC31962F1A0814130094C78E /* SettingsTableViewController.m */; }; - FC3BD97B1A2CD385005B96BB /* call_dotted@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FC3BD9791A2CD385005B96BB /* call_dotted@2x.png */; }; FC3BD97C1A2CD385005B96BB /* signal_dotted@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FC3BD97A1A2CD385005B96BB /* signal_dotted@2x.png */; }; FC3BD9841A306483005B96BB /* signals_error@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FC3BD9831A306483005B96BB /* signals_error@2x.png */; }; FC3BD9881A30A790005B96BB /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FC3BD9871A30A790005B96BB /* Social.framework */; }; @@ -507,14 +505,6 @@ FC7C7A961A581AF40091823B /* TSAdapterCacheManager.m in Sources */ = {isa = PBXBuildFile; fileRef = FC7C7A951A581AF40091823B /* TSAdapterCacheManager.m */; }; FC9120411A39EFB70074545C /* qr@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FC91203F1A39EFB70074545C /* qr@2x.png */; }; FC9120431A39F9E00074545C /* qr_scan_fingerprint@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FC9120421A39F9E00074545C /* qr_scan_fingerprint@2x.png */; }; - FCA52AE61A2B676C00CCADFA /* call_canceled@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FCA52ADE1A2B676C00CCADFA /* call_canceled@2x.png */; }; - FCA52AE71A2B676C00CCADFA /* call_failed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FCA52ADF1A2B676C00CCADFA /* call_failed@2x.png */; }; - FCA52AE81A2B676C00CCADFA /* call_incoming@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FCA52AE01A2B676C00CCADFA /* call_incoming@2x.png */; }; - FCA52AE91A2B676C00CCADFA /* call_missed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FCA52AE11A2B676C00CCADFA /* call_missed@2x.png */; }; - FCA52AEA1A2B676C00CCADFA /* call_outgoing@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FCA52AE21A2B676C00CCADFA /* call_outgoing@2x.png */; }; - FCA52AEB1A2B676C00CCADFA /* checkmark_light@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FCA52AE31A2B676C00CCADFA /* checkmark_light@2x.png */; }; - FCA52AEC1A2B676C00CCADFA /* message_error@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FCA52AE41A2B676C00CCADFA /* message_error@2x.png */; }; - FCA52AED1A2B676C00CCADFA /* reply@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FCA52AE51A2B676C00CCADFA /* reply@2x.png */; }; FCA52B071A2BBAE400CCADFA /* call_tab@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = FCA52B061A2BBAE400CCADFA /* call_tab@2x.png */; }; FCAC963C19FEF9280046DFC5 /* SignalsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FCAC963B19FEF9280046DFC5 /* SignalsViewController.m */; }; FCAC964019FEF99A0046DFC5 /* InboxTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = FCAC963E19FEF99A0046DFC5 /* InboxTableViewCell.m */; }; @@ -923,7 +913,6 @@ B633C5021A1D190B0059AC12 /* backspace@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backspace@2x.png"; sourceTree = ""; }; B633C5031A1D190B0059AC12 /* blue-archive@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "blue-archive@2x.png"; sourceTree = ""; }; B633C5041A1D190B0059AC12 /* call@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "call@2x.png"; sourceTree = ""; }; - B633C5051A1D190B0059AC12 /* call_dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "call_dark@2x.png"; sourceTree = ""; }; B633C50B1A1D190B0059AC12 /* contact_default_feed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = contact_default_feed.png; sourceTree = ""; }; B633C50D1A1D190B0059AC12 /* contacts@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "contacts@2x.png"; sourceTree = ""; }; B633C5101A1D190B0059AC12 /* contacts_tab@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "contacts_tab@2x.png"; sourceTree = ""; }; @@ -1212,7 +1201,6 @@ FC31962C1A06A2190094C78E /* FingerprintViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FingerprintViewController.m; sourceTree = ""; }; FC31962E1A0814130094C78E /* SettingsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsTableViewController.h; sourceTree = ""; }; FC31962F1A0814130094C78E /* SettingsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingsTableViewController.m; sourceTree = ""; }; - FC3BD9791A2CD385005B96BB /* call_dotted@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "call_dotted@2x.png"; sourceTree = ""; }; FC3BD97A1A2CD385005B96BB /* signal_dotted@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "signal_dotted@2x.png"; sourceTree = ""; }; FC3BD9831A306483005B96BB /* signals_error@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "signals_error@2x.png"; sourceTree = ""; }; FC3BD9871A30A790005B96BB /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; }; @@ -1224,14 +1212,6 @@ FC7C7A951A581AF40091823B /* TSAdapterCacheManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TSAdapterCacheManager.m; sourceTree = ""; }; FC91203F1A39EFB70074545C /* qr@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "qr@2x.png"; sourceTree = ""; }; FC9120421A39F9E00074545C /* qr_scan_fingerprint@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "qr_scan_fingerprint@2x.png"; sourceTree = ""; }; - FCA52ADE1A2B676C00CCADFA /* call_canceled@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "call_canceled@2x.png"; sourceTree = ""; }; - FCA52ADF1A2B676C00CCADFA /* call_failed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "call_failed@2x.png"; sourceTree = ""; }; - FCA52AE01A2B676C00CCADFA /* call_incoming@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "call_incoming@2x.png"; sourceTree = ""; }; - FCA52AE11A2B676C00CCADFA /* call_missed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "call_missed@2x.png"; sourceTree = ""; }; - FCA52AE21A2B676C00CCADFA /* call_outgoing@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "call_outgoing@2x.png"; sourceTree = ""; }; - FCA52AE31A2B676C00CCADFA /* checkmark_light@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "checkmark_light@2x.png"; sourceTree = ""; }; - FCA52AE41A2B676C00CCADFA /* message_error@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "message_error@2x.png"; sourceTree = ""; }; - FCA52AE51A2B676C00CCADFA /* reply@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "reply@2x.png"; sourceTree = ""; }; FCA52B061A2BBAE400CCADFA /* call_tab@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "call_tab@2x.png"; sourceTree = ""; }; FCAC963A19FEF9280046DFC5 /* SignalsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SignalsViewController.h; path = UITests/SignalsViewController.h; sourceTree = ""; }; FCAC963B19FEF9280046DFC5 /* SignalsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SignalsViewController.m; path = UITests/SignalsViewController.m; sourceTree = ""; }; @@ -2178,16 +2158,8 @@ B633C5011A1D190B0059AC12 /* backspace.png */, B633C5021A1D190B0059AC12 /* backspace@2x.png */, B633C5031A1D190B0059AC12 /* blue-archive@2x.png */, - FCA52ADE1A2B676C00CCADFA /* call_canceled@2x.png */, - B633C5051A1D190B0059AC12 /* call_dark@2x.png */, - FC3BD9791A2CD385005B96BB /* call_dotted@2x.png */, - FCA52ADF1A2B676C00CCADFA /* call_failed@2x.png */, - FCA52AE01A2B676C00CCADFA /* call_incoming@2x.png */, - FCA52AE11A2B676C00CCADFA /* call_missed@2x.png */, - FCA52AE21A2B676C00CCADFA /* call_outgoing@2x.png */, FCA52B061A2BBAE400CCADFA /* call_tab@2x.png */, B633C5041A1D190B0059AC12 /* call@2x.png */, - FCA52AE31A2B676C00CCADFA /* checkmark_light@2x.png */, B633C50B1A1D190B0059AC12 /* contact_default_feed.png */, B633C5101A1D190B0059AC12 /* contacts_tab@2x.png */, B633C50D1A1D190B0059AC12 /* contacts@2x.png */, @@ -2205,7 +2177,6 @@ B633C5351A1D190B0059AC12 /* logo_intro@2x.png */, B633C5391A1D190B0059AC12 /* message_bubble.png */, B633C53A1A1D190B0059AC12 /* message_bubble@2x.png */, - FCA52AE41A2B676C00CCADFA /* message_error@2x.png */, B633C5411A1D190B0059AC12 /* mute_off@2x.png */, B633C5421A1D190B0059AC12 /* mute_on@2x.png */, B633C54B1A1D190B0059AC12 /* photo@2x.png */, @@ -2213,7 +2184,6 @@ FC91203F1A39EFB70074545C /* qr@2x.png */, B633C54C1A1D190B0059AC12 /* quit@2x.png */, B633C54E1A1D190B0059AC12 /* red-delete@2x.png */, - FCA52AE51A2B676C00CCADFA /* reply@2x.png */, B633C5501A1D190B0059AC12 /* savephoto@2x.png */, B633C5581A1D190B0059AC12 /* settings_dark@2x.png */, FC1F90C41A223991004F8253 /* settings_tab@2x.png */, @@ -2942,13 +2912,10 @@ B633C5B51A1D190B0059AC12 /* lock@2x.png in Resources */, A5509ECA1A69AB8B00ABA4BC /* Storyboard.storyboard in Resources */, A507A3B11A6C60E300BEED0D /* InboxTableViewCell.xib in Resources */, - FCA52AE81A2B676C00CCADFA /* call_incoming@2x.png in Resources */, AD83FF421A73426500B5C81A /* audio_play_button.png in Resources */, FC1F90C01A22342B004F8253 /* group_photo@2x.png in Resources */, - FCA52AE91A2B676C00CCADFA /* call_missed@2x.png in Resources */, B633C5C41A1D190B0059AC12 /* mute_on@2x.png in Resources */, B633C5CE1A1D190B0059AC12 /* quit@2x.png in Resources */, - FCA52AEB1A2B676C00CCADFA /* checkmark_light@2x.png in Resources */, B633C5D01A1D190B0059AC12 /* red-delete@2x.png in Resources */, AD83FF441A73426500B5C81A /* audio_pause_button.png in Resources */, AD41D7B51A6F6F0600241130 /* play_button.png in Resources */, @@ -2956,10 +2923,8 @@ B633C5B41A1D190B0059AC12 /* keypad@2x.png in Resources */, B633C5DA1A1D190B0059AC12 /* settings_dark@2x.png in Resources */, B6C6AE561A305ED1006BAF8F /* textsecure.cer in Resources */, - FCA52AEC1A2B676C00CCADFA /* message_error@2x.png in Resources */, B633C5BC1A1D190B0059AC12 /* message_bubble@2x.png in Resources */, FC15B7BF1A1F80F200F59801 /* defaultConctact_light@2x.png in Resources */, - B633C5871A1D190B0059AC12 /* call_dark@2x.png in Resources */, FC5CDF391A3393DD00B47253 /* error_white@2x.png in Resources */, B633C5851A1D190B0059AC12 /* blue-archive@2x.png in Resources */, B633C5D21A1D190B0059AC12 /* savephoto@2x.png in Resources */, @@ -2971,7 +2936,6 @@ FC9120431A39F9E00074545C /* qr_scan_fingerprint@2x.png in Resources */, AD83FF401A73426500B5C81A /* audio_pause_button_blue@2x.png in Resources */, B66DBF4A19D5BBC8006EA940 /* Images.xcassets in Resources */, - FCA52AE71A2B676C00CCADFA /* call_failed@2x.png in Resources */, 70B8FEE21909FE360042E3F0 /* 171756__nenadsimic__picked-coin-echo-2.wav in Resources */, B633C5801A1D190B0059AC12 /* archive@2x.png in Resources */, AD83FF431A73426500B5C81A /* audio_play_button@2x.png in Resources */, @@ -2981,7 +2945,6 @@ AD83FF411A73426500B5C81A /* audio_play_button_blue@2x.png in Resources */, FCB626B71A3B067900FDB504 /* ArrowTop@3x.png in Resources */, FC1F90C61A223991004F8253 /* settings_tab@2x.png in Resources */, - FCA52AEA1A2B676C00CCADFA /* call_outgoing@2x.png in Resources */, FCB626B61A3B067900FDB504 /* ArrowBottom@3x.png in Resources */, B633C5B61A1D190B0059AC12 /* lock_white@2x.png in Resources */, FC5CDF3A1A3393DD00B47253 /* warning_white@2x.png in Resources */, @@ -3007,7 +2970,6 @@ E1370BE518A0686C00826894 /* r.caf in Resources */, B633C5981A1D190B0059AC12 /* delete_history@2x.png in Resources */, FC9120411A39EFB70074545C /* qr@2x.png in Resources */, - FCA52AED1A2B676C00CCADFA /* reply@2x.png in Resources */, FCB626B41A3B067900FDB504 /* ArrowTop@2x.png in Resources */, B633C5E51A1D190B0059AC12 /* speaker_off@2x.png in Resources */, B633C58F1A1D190B0059AC12 /* contacts@2x.png in Resources */, @@ -3016,13 +2978,11 @@ B10C9B5F1A7049EC00ECA2BF /* pause_icon.png in Resources */, E148751218A06AFD002CC4F3 /* HelveticaNeueLTStd-Bd.otf in Resources */, AD83FF471A73428300B5C81A /* audio_play_button_blue.png in Resources */, - FCA52AE61A2B676C00CCADFA /* call_canceled@2x.png in Resources */, AD83FF451A73426500B5C81A /* audio_pause_button@2x.png in Resources */, E148751318A06AFD002CC4F3 /* HelveticaNeueLTStd-Th.otf in Resources */, FC3BD9841A306483005B96BB /* signals_error@2x.png in Resources */, E148751418A06AFD002CC4F3 /* HelveticaNeueLTStd-Lt.otf in Resources */, E148751518A06AFD002CC4F3 /* HelveticaNeueLTStd-Md.otf in Resources */, - FC3BD97B1A2CD385005B96BB /* call_dotted@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Signal/Images/call_canceled@2x.png b/Signal/Images/call_canceled@2x.png deleted file mode 100644 index d1cf561e1..000000000 Binary files a/Signal/Images/call_canceled@2x.png and /dev/null differ diff --git a/Signal/Images/call_dark@2x.png b/Signal/Images/call_dark@2x.png deleted file mode 100644 index 0bdf09f5d..000000000 Binary files a/Signal/Images/call_dark@2x.png and /dev/null differ diff --git a/Signal/Images/call_dotted@2x.png b/Signal/Images/call_dotted@2x.png deleted file mode 100644 index 95d5a403d..000000000 Binary files a/Signal/Images/call_dotted@2x.png and /dev/null differ diff --git a/Signal/Images/call_failed@2x.png b/Signal/Images/call_failed@2x.png deleted file mode 100644 index 23cad05ee..000000000 Binary files a/Signal/Images/call_failed@2x.png and /dev/null differ diff --git a/Signal/Images/call_incoming@2x.png b/Signal/Images/call_incoming@2x.png deleted file mode 100644 index fcd31d941..000000000 Binary files a/Signal/Images/call_incoming@2x.png and /dev/null differ diff --git a/Signal/Images/call_missed@2x.png b/Signal/Images/call_missed@2x.png deleted file mode 100644 index 2d1a49022..000000000 Binary files a/Signal/Images/call_missed@2x.png and /dev/null differ diff --git a/Signal/Images/call_outgoing@2x.png b/Signal/Images/call_outgoing@2x.png deleted file mode 100644 index 15182d623..000000000 Binary files a/Signal/Images/call_outgoing@2x.png and /dev/null differ diff --git a/Signal/Images/checkmark_light@2x.png b/Signal/Images/checkmark_light@2x.png deleted file mode 100644 index 2fa7a0f60..000000000 Binary files a/Signal/Images/checkmark_light@2x.png and /dev/null differ diff --git a/Signal/Images/message_error@2x.png b/Signal/Images/message_error@2x.png deleted file mode 100644 index a606dbf74..000000000 Binary files a/Signal/Images/message_error@2x.png and /dev/null differ diff --git a/Signal/Images/reply@2x.png b/Signal/Images/reply@2x.png deleted file mode 100644 index f0bbcac0e..000000000 Binary files a/Signal/Images/reply@2x.png and /dev/null differ diff --git a/Signal/src/util/DateUtil.m b/Signal/src/util/DateUtil.m index 92e220086..fee1315f3 100644 --- a/Signal/src/util/DateUtil.m +++ b/Signal/src/util/DateUtil.m @@ -12,7 +12,7 @@ static NSString *const DATE_FORMAT_HOUR_MINUTE = @"h:mm a "; + (NSDateFormatter *)dateFormatter { NSDateFormatter *formatter = [NSDateFormatter new]; - [formatter setTimeStyle:NSDateFormatterShortStyle]; + [formatter setDateStyle:NSDateFormatterShortStyle]; return formatter; } diff --git a/Signal/src/view controllers/InboxTableViewCell.h b/Signal/src/view controllers/InboxTableViewCell.h index 6847b5947..b59ffeca1 100644 --- a/Signal/src/view controllers/InboxTableViewCell.h +++ b/Signal/src/view controllers/InboxTableViewCell.h @@ -25,8 +25,6 @@ typedef enum : NSUInteger { @interface InboxTableViewCell : UITableViewCell - -@property (nonatomic, strong) IBOutlet UIImageView* lastActionImageView; @property (nonatomic, strong) IBOutlet UILabel *nameLabel; @property (nonatomic, strong) IBOutlet UILabel * snippetLabel; @property (nonatomic, strong) IBOutlet UIImageView *contactPictureView; diff --git a/Signal/src/view controllers/InboxTableViewCell.m b/Signal/src/view controllers/InboxTableViewCell.m index e26995f54..a7bf729e3 100644 --- a/Signal/src/view controllers/InboxTableViewCell.m +++ b/Signal/src/view controllers/InboxTableViewCell.m @@ -31,8 +31,6 @@ _scrollView.contentOffset = CGPointMake(CGRectGetWidth(_archiveView.frame), 0); _archiveImageView.image = [_archiveImageView.image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]; - _lastActionImageView.image = [_lastActionImageView.image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]; - } return self; } @@ -77,9 +75,7 @@ } } - self.separatorInset = UIEdgeInsetsMake(0,_contactPictureView.frame.size.width*1.5f, 0, 0); - - [self setUpLastActionForThread:thread]; + self.separatorInset = UIEdgeInsetsMake(0,_contactPictureView.frame.size.width*1.5f, 0, 0); } -(void)configureForState:(CellState)state @@ -96,78 +92,30 @@ } } --(void)setUpLastActionForThread:(TSThread*)thread -{ - TSLastActionType lastAction = [thread lastAction]; - - switch (lastAction) { - case TSLastActionNone: - _lastActionImageView.image = nil; - break; - case TSLastActionCallIncoming: - _lastActionImageView.image = [UIImage imageNamed:@"call_incoming"]; - break; - case TSLastActionCallIncomingMissed: - _lastActionImageView.image = [UIImage imageNamed:@"call_missed"]; - break; - case TSLastActionCallOutgoing: - _lastActionImageView.image = [UIImage imageNamed:@"call_outgoing"]; - break; - case TSLastActionCallOutgoingMissed: - _lastActionImageView.image = [UIImage imageNamed:@"call_canceled"]; - break; - case TSLastActionCallOutgoingFailed: - _lastActionImageView.image = [UIImage imageNamed:@"call_failed"]; - break; - case TSLastActionMessageAttemptingOut: - _lastActionImageView.image = nil; - break; - case TSLastActionMessageUnsent: - _lastActionImageView.image = [UIImage imageNamed:@"message_error"]; - break; - case TSLastActionMessageSent: - _lastActionImageView.image = [UIImage imageNamed:@"reply"]; - break; - case TSLastActionMessageDelivered: - _lastActionImageView.image = [UIImage imageNamed:@"checkmark_light"]; - break; - case TSLastActionMessageIncomingRead: - _lastActionImageView.image = nil; - break; - case TSLastActionMessageIncomingUnread: - [self updateCellForUnreadMessage]; - _lastActionImageView.image = nil; - break; - case TSLastActionInfoMessage: - _lastActionImageView.image = [UIImage imageNamed:@"warning_white"]; - break; - case TSLastActionErrorMessage: - _lastActionImageView.image = [UIImage imageNamed:@"error_white"]; - break; - default: - _lastActionImageView.image = nil; - break; - } -} - -(void)updateCellForUnreadMessage { - _nameLabel.font = [UIFont ows_boldFontWithSize:14.0f]; + _nameLabel.font = [UIFont ows_boldFontWithSize:14.0f]; _snippetLabel.textColor = [UIColor ows_blackColor]; - _timeLabel.textColor = [UIColor ows_materialBlueColor]; + _timeLabel.textColor = [UIColor ows_materialBlueColor]; } -(void)updateCellForReadMessage { - _nameLabel.font = [UIFont ows_regularFontWithSize:14.0f]; + _nameLabel.font = [UIFont ows_regularFontWithSize:14.0f]; _snippetLabel.textColor = [UIColor lightGrayColor]; } #pragma mark - Date formatting - (NSAttributedString *)dateAttributedString:(NSDate *)date { + NSString *timeString; - NSString *timeString = [[DateUtil timeFormatter] stringFromDate:date]; + if ([date timeIntervalSinceNow] > (- 60 * 60 * 24)) { + timeString = [[DateUtil timeFormatter] stringFromDate:date]; + } else { + + timeString = [[DateUtil dateFormatter] stringFromDate:date]; + } NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:timeString];