Commit graph

9207 commits

Author SHA1 Message Date
Matthew Chen 7b056d624c Merge branch 'charlesmchen/crashAppGesture' 2018-09-27 12:34:45 -04:00
Matthew Chen 2ef878bfc9 Add crash gesture to about view. 2018-09-27 12:32:09 -04:00
Michael Kirk 3518d37c3e use autorelease pool in migration to avoid accumulating memory 2018-09-27 10:30:28 -06:00
Matthew Chen 469bb3fee2 Merge branch 'charlesmchen/conversationColorsClass' 2018-09-27 12:25:20 -04:00
Matthew Chen 2b75c4034d Pull out OWSConversationColor to its own file. 2018-09-27 12:24:14 -04:00
Matthew Chen 5a99cd347f Pull out OWSConversationColor to its own file. 2018-09-27 12:24:14 -04:00
Matthew Chen c90c12702f Merge branch 'charlesmchen/conversationColorsFixBubbleSecondaryColor' 2018-09-27 12:22:57 -04:00
Matthew Chen 43dc362fc7 Fix secondary color within message bubbles. 2018-09-27 12:22:52 -04:00
Matthew Chen 4003e31852 Merge branch 'charlesmchen/conversationColorsDefaultContactAvatarAsset' 2018-09-27 12:22:20 -04:00
Matthew Chen 0e5f42defe Use new asset for default contact avatars. 2018-09-27 12:22:14 -04:00
Matthew Chen 1c1d305a71 Respond to CR. 2018-09-27 11:42:32 -04:00
Matthew Chen 8c6a396bd2 Merge branch 'charlesmchen/conversationColorsMapLegacyColors' 2018-09-27 11:26:30 -04:00
Matthew Chen 857cdf4368 Map the legacy conversation color names. 2018-09-27 11:26:21 -04:00
Matthew Chen 3c8639b8ad Merge branch 'charlesmchen/conversationColorsDefaultAvatarTextSize' 2018-09-27 11:25:25 -04:00
Matthew Chen ec0206ff01 Adapt text size of default avatars to avatar size. 2018-09-27 11:25:18 -04:00
Matthew Chen 05d4836c74 Merge branch 'charlesmchen/conversationColorsDefaultProfileAvatars' 2018-09-27 11:24:27 -04:00
Matthew Chen 6d14a1b472 Local profile default avatars should use steel background. 2018-09-27 11:24:20 -04:00
Matthew Chen 27488f078a Replace old "default profile avatar" icon with default avatar for local user. 2018-09-27 11:24:20 -04:00
Matthew Chen e4ab360716 Respond to CR. 2018-09-27 10:43:50 -04:00
Matthew Chen 2cb9de5ea3 Merge branch 'charlesmchen/converationColorsAppSettingsAvatar' 2018-09-27 10:26:54 -04:00
Matthew Chen b5c5d1c3ef Use local avatar as app settings button. 2018-09-27 09:53:40 -04:00
Matthew Chen 307a7ebf88 Merge branch 'charlesmchen/conversationColorsMediaShadows' 2018-09-27 09:52:59 -04:00
Matthew Chen cbaf40d4ce Respond to CR. 2018-09-27 09:52:12 -04:00
Matthew Chen d161e5ff3d Add inner shadows to media thumbnails. 2018-09-27 09:42:29 -04:00
Matthew Chen ade88966c8 Merge branch 'charlesmchen/conversationColorsProfileShadows' 2018-09-27 09:41:54 -04:00
Matthew Chen 547724b5cf Add inner shadows to profile pics. 2018-09-27 09:41:42 -04:00
Matthew Chen 352777765e Add inner shadows to profile pics. 2018-09-27 09:41:42 -04:00
Matthew Chen 228964905a Merge branch 'charlesmchen/conversationColorsVsText' 2018-09-27 09:31:40 -04:00
Matthew Chen ff6feafe8c Update text colors. 2018-09-27 09:30:59 -04:00
Matthew Chen b5dd8d0c7b Merge branch 'charlesmchen/converationColorsVsBubbles' 2018-09-27 09:29:10 -04:00
Matthew Chen 6715e3d1ad Respond to CR. 2018-09-27 09:28:16 -04:00
Matthew Chen b20cd57383 Rename OWSConversationColor. 2018-09-27 09:15:15 -04:00
Matthew Chen 3adc03fa2c Rework conversation message bubble colors; add "conversation colors" class. 2018-09-27 09:07:47 -04:00
Matthew Chen b3ad6e27dc Rework conversation message bubble colors; add "conversation colors" class. 2018-09-27 09:07:47 -04:00
Matthew Chen 26a2d568de Add "conversation color mode" enum. 2018-09-27 09:07:47 -04:00
Matthew Chen e5150267c2 Rework the conversation color constants. 2018-09-27 09:07:47 -04:00
Matthew Chen 5471e1ba9a Merge branch 'charlesmchen/converationColorsGroupAvatars' 2018-09-27 09:07:16 -04:00
Matthew Chen da63731447 Respond to CR. 2018-09-27 09:07:03 -04:00
Matthew Chen 8db4595bdc Rework group avatars to reflect conversation colors. 2018-09-27 08:55:20 -04:00
Matthew Chen 1c920c6be6 Rework group avatars to reflect conversation colors. 2018-09-27 08:55:20 -04:00
Matthew Chen 25d56b30c1 Rework group avatars to reflect conversation colors. 2018-09-27 08:55:20 -04:00
Matthew Chen 7ab76551c3 Merge branch 'charlesmchen/converationColorsVsAvatars' 2018-09-27 08:53:54 -04:00
Matthew Chen 2f9eae5caf Respond to CR. 2018-09-27 08:50:52 -04:00
Michael Kirk 04a52980a3 fixup migration
- nested transaction for enumeration
- save when complete
2018-09-26 09:55:23 -06:00
Michael Kirk fe7d69e9c6 Update thread's sorting order based on whatever the currently last message is 2018-09-26 09:52:34 -06:00
Michael Kirk 02692e42bd remove addressed TODO's 2018-09-26 09:52:34 -06:00
Michael Kirk c2f87c738a trivial replace of timestampForSorting -> sortId in some logging 2018-09-26 09:52:34 -06:00
Michael Kirk c21020d7e7 Use received date for footer-collapse supression 2018-09-26 09:52:34 -06:00
Michael Kirk 6f8eddc955 unread indicator uses sortId
- removed timestamp parameter. This wasn't totally obvious, previously we were tracking two pieces of state

1. `unreadIndicator.firstUnseenTimestamp`:
    the first unseen timestamp for a conversation that exists in the database
2. `unreadIndicator.timestamp`:
    the timestamp of the first interaction *after* the unread indicator that fits in the loading window

We don't actually need to track `2` because it was only used in a comparison like:

   viewItem.interaction.timestampForSorting >= unreadIndicator.timestamp

But by definition, unreadIndicator.firstUnseenTimestamp is always less than or
equal to unreadIndicator.timestamp. Put into terms of the `sortId` corallary,
the sortId of the first unseen interaction in the database is always less than
or equal to the sortId of the first unseen interaction that fits in the loading
window.

In other words, there's no situation where

   viewItem.interaction.sortId >= unreadIndicator.firstUnseenSortId
2018-09-26 09:52:34 -06:00
Michael Kirk 3240e0d9d0 Be explicit about receivedAt time
We were often using `timestampForLegacySorting`, which is convoluted for when
we actually just want received time.

In some sense this is a superficial change, but it's part of auditing that
we've completed moved away from timestampForLegacySorting.
2018-09-26 09:52:34 -06:00