Commit Graph

22799 Commits

Author SHA1 Message Date
Matthew Chen
acdc51ba3d Respond to CR. 2018-05-10 13:17:34 -04:00
Matthew Chen
37b8b368a6 Show "share contact" flow in single presented navigation controller. 2018-05-10 13:17:01 -04:00
Matthew Chen
0f535217a0 Merge branch 'charlesmchen/contactViewStatusBar' 2018-05-10 13:16:37 -04:00
Matthew Chen
cb7f28ed34 Use dark status bar in contact view. 2018-05-10 12:17:25 -04:00
Matthew Chen
61343f6657 Merge branch 'charlesmchen/contactNames_' 2018-05-10 12:05:21 -04:00
Matthew Chen
6460493669 Surface organization name in contact view. 2018-05-10 12:05:07 -04:00
Matthew Chen
aa7cc4633a Rework contact names. 2018-05-10 12:05:07 -04:00
Michael Kirk
6ecaf01b95 Merge branch 'mkirk/contact-sharing-via-sae' 2018-05-10 11:57:47 -04:00
Michael Kirk
407ec997ab Add comment per CR
// FREEBIE
2018-05-10 11:57:30 -04:00
Michael Kirk
7631315227 Remove unused code
// FREEBIE
2018-05-10 11:35:43 -04:00
Michael Kirk
a16040f19f Fix avatar sending in SAE
// FREEBIE
2018-05-10 11:35:42 -04:00
Michael Kirk
adabf02732 Fix contact sharing (Avatar TODO)
// FREEBIE
2018-05-10 11:35:42 -04:00
Michael Kirk
e520451996 Merge branch 'mkirk/cleanup-share-avatars' 2018-05-10 11:33:22 -04:00
Michael Kirk
ed2945126a Remove contact share avatars upon message deletion
// FREEBIE
2018-05-10 11:33:13 -04:00
Michael Kirk
efa3c81f68 Merge branch 'mkirk/contact-merging' 2018-05-10 11:31:31 -04:00
Michael Kirk
c15fea4eca merge avatar with existing
// FREEBIE
2018-05-10 11:31:22 -04:00
Michael Kirk
95b93115f9 Code formatting
// FREEBIE
2018-05-10 11:31:22 -04:00
Michael Kirk
bf37f41164 Move CNContact logic into our system contact adapter
// FREEBIE
2018-05-10 11:31:22 -04:00
Michael Kirk
0c469764f1 re-use contact picker for "add to existing"
Required refactor of contact picker to be presented non-modally.

TODO: merge emails, address, display names

// FREEBIE
2018-05-10 11:31:22 -04:00
Michael Kirk
609746abec clarify naming
// FREEBIE
2018-05-10 11:31:22 -04:00
Michael Kirk
69aeb041ba Merge branch 'mkirk/codecleanup-contact-sync' 2018-05-09 21:56:38 -04:00
Michael Kirk
b1f3324514 cleanup contact syncing
It's largely a redundant check anyway, but the previous typo was a
no-op.

// FREEBIE
2018-05-09 21:56:33 -04:00
Matthew Chen
d0d9d5456c "Bump build to 2.25.0.13." 2018-05-09 17:57:53 -04:00
Matthew Chen
31bea605f6 Merge branch 'charlesmchen/contactViewActions' 2018-05-09 17:53:51 -04:00
Matthew Chen
65a516685d Fix l10n strings. 2018-05-09 17:53:40 -04:00
Matthew Chen
b4d24f1c72 Refine field actions in contact view. 2018-05-09 17:52:36 -04:00
Matthew Chen
e04e063fcc Merge branch 'charlesmchen/contactShareErrors' 2018-05-09 17:52:11 -04:00
Matthew Chen
3bb9e922d7 Surface contact share errors to user. 2018-05-09 17:52:00 -04:00
Matthew Chen
dad3d2b515 Merge branch 'charlesmchen/contactShareAssets2' 2018-05-09 17:51:35 -04:00
Matthew Chen
4079cdb600 Apply more contact share assets. 2018-05-09 17:51:27 -04:00
Matthew Chen
b7946fa904 Merge branch 'charlesmchen/contactShareDynamicTypeRTL' 2018-05-09 17:47:17 -04:00
Matthew Chen
0b8d9991ef Respond to CR. 2018-05-09 17:46:51 -04:00
Matthew Chen
f77731eb7a Fix h margins in "edit contact share name" view. 2018-05-09 17:46:05 -04:00
Matthew Chen
ff3524fb00 Improve contact share message bubble layout with large dynamic type sizes. 2018-05-09 17:46:05 -04:00
Matthew Chen
b4ef8afbf0 "Bump build to 2.25.0.12." 2018-05-09 16:18:07 -04:00
Michael Kirk
6d52636892 Merge branch 'mkirk/return-navbar' 2018-05-09 16:01:19 -04:00
Michael Kirk
ad4e4b0c4c return navbar after tapping message/call buttons
// FREEBIE
2018-05-09 16:01:12 -04:00
Matthew Chen
f6c5141cbd "Bump build to 2.25.0.11." 2018-05-09 15:53:03 -04:00
Michael Kirk
e5258770a1 Merge branch 'mkirk/cleanup-contact-share-view-helper' 2018-05-09 10:25:58 -04:00
Michael Kirk
42109593af Remove fromViewController state from ContactShareViewHelper
// FREEBIE
2018-05-09 10:21:00 -04:00
Michael Kirk
77bbbad70c Remove contactShare state from ContactShareViewHelper
// FREEBIE
2018-05-09 10:21:00 -04:00
Matthew Chen
0265787dd6 "Bump build to 2.25.0.10." 2018-05-08 18:35:21 -04:00
Matthew Chen
37da52413f Fix contact share protos: display name, organization name. 2018-05-08 18:35:11 -04:00
Matthew Chen
0b90c094aa "Bump build to 2.25.0.9." 2018-05-08 17:37:14 -04:00
Matthew Chen
946cc114ed Update l10n strings. 2018-05-08 17:37:08 -04:00
Matthew Chen
6c84f6eef5 Merge branch 'charlesmchen/contactActionsAndPhoneNumberParsing' 2018-05-08 17:24:15 -04:00
Matthew Chen
c2adf624ea Respond to CR. 2018-05-08 17:22:34 -04:00
Matthew Chen
44ceee5849 Add contact share actions to conversation view and improve phone number parsing. 2018-05-08 17:22:34 -04:00
Michael Kirk
445c10a7ea Merge branch 'mkirk/first-responder' 2018-05-08 17:12:20 -04:00
Michael Kirk
7e22d9e900 Prevent input toolbar from appearing over camera view, contact view or actionsheet
// FREEBIE
2018-05-08 17:07:15 -04:00