Commit Graph

6817 Commits

Author SHA1 Message Date
Michael Kirk
36abd6ab73 Merge branch 'mkirk/media-title-view' 2018-05-03 17:56:54 -04:00
Michael Kirk
b32a1d5076 Fix media page title view on iOS9/10
We must specify the frame of the titleView

Previously the titleView was the stackview, but we don't want to
"stretch" the labels to fit the size of the stack view, so we wrap the
stack view in a container view which becomes the new titleView.

// FREEBIE
2018-05-03 17:56:46 -04:00
Matthew Chen
ed7fe90e15 Merge branch 'charlesmchen/contactView' 2018-05-03 14:31:41 -04:00
Matthew Chen
ff6b45abee Respond to CR. 2018-05-03 14:31:11 -04:00
Matthew Chen
1d56d56ca2 Clean up ahead of PR. 2018-05-03 14:09:54 -04:00
Matthew Chen
91d54360ba Add contact view. 2018-05-03 14:09:54 -04:00
Matthew Chen
fa5577eece Create contact view. 2018-05-03 14:09:54 -04:00
Matthew Chen
2738bcbc58 Create contact view. 2018-05-03 14:09:54 -04:00
Michael Kirk
9c661b220a Merge branch 'mkirk/errant-input-toolbar' 2018-05-03 12:45:55 -04:00
Michael Kirk
e604437e24 Don't become first responder while presenting
// FREEBIE
2018-05-03 12:45:48 -04:00
Michael Kirk
fff7b11961 Merge branch 'mkirk/new-loading-screen' 2018-05-03 10:49:01 -04:00
Michael Kirk
d98341697c format debug stats
// FREEBIE
2018-05-03 09:11:51 -04:00
Michael Kirk
f782ea97df Use loading screen whenever launch is slow.
Previously we had to manually account for each version that had a DB
change.

// FREEBIE
2018-05-03 09:11:51 -04:00
Matthew Chen
f2cc8cf9d2 Merge branch 'charlesmchen/contactSharePreviews' 2018-05-02 11:13:41 -04:00
Matthew Chen
00eadd629f Text previews for contact shares. 2018-05-02 11:13:35 -04:00
Michael Kirk
424bcbf83e Merge branch 'mkirk/contact-share' 2018-05-02 11:06:16 -04:00
Michael Kirk
5c0c01dea2 Contact picking
// FREEBIE
2018-05-02 11:06:09 -04:00
Matthew Chen
0e858bc090 Merge branch 'charlesmchen/contactShareMessageBubble' 2018-05-02 11:01:38 -04:00
Matthew Chen
411d5a3b4f Respond to CR. 2018-05-02 11:01:23 -04:00
Matthew Chen
783bf5b81c Clean up ahead of PR. 2018-05-02 10:52:29 -04:00
Matthew Chen
708b44e3c5 Improve handling of contact display names. 2018-05-02 10:52:29 -04:00
Matthew Chen
7e35a7e7d7 Sketch out rendering of contact shares in conversation view. 2018-05-02 10:51:59 -04:00
Michael Kirk
87abeb80be Merge branch 'ios-flip-camera' 2018-05-01 18:55:11 -04:00
Michael Kirk
0ab8fc2772 Proper flip asset
// FREEBIE
2018-05-01 18:55:06 -04:00
Michael Kirk
6fcbf05296 Merge branch 'mkirk/remove-assert' 2018-05-01 18:54:29 -04:00
Michael Kirk
d67a3b4167 WORKS GREAT
// FREEBIE
2018-05-01 18:54:14 -04:00
Matthew Chen
fff60e9bdb Merge branch 'charlesmchen/contactNormalizationValidation' 2018-05-01 18:09:01 -04:00
Matthew Chen
d1f6118e6e Rework contact normalization and validation. 2018-05-01 18:08:50 -04:00
Matthew Chen
d7cc7384e9 "Bump build to 2.25.0.5." 2018-05-01 18:01:19 -04:00
Matthew Chen
11591416e6 Merge branch 'charlesmchen/contactShareModel' 2018-05-01 16:10:13 -04:00
Matthew Chen
1520422b29 Respond to CR. 2018-05-01 16:09:53 -04:00
Matthew Chen
0316a98eb8 Undo renaming of contactShare property of TSMessage. 2018-05-01 11:26:01 -04:00
Matthew Chen
147368913c Gather all contact conversion logic in OWSContacts. 2018-05-01 11:03:25 -04:00
Matthew Chen
ee9a13cdf0 Update cocoapods. 2018-05-01 11:03:25 -04:00
Matthew Chen
bd7c8e4a4b Add conversion methods between vcard, system contacts and ows contacts. 2018-05-01 11:03:25 -04:00
Matthew Chen
0d8cfc5403 Rename contact share class to contact. 2018-05-01 11:03:25 -04:00
Matthew Chen
796958d87f Elaborate contact conversion. 2018-05-01 11:03:25 -04:00
Matthew Chen
e22e9a7842 Populate contact share protos. 2018-05-01 11:03:25 -04:00
Matthew Chen
757234d309 Populate contact share protos. 2018-05-01 11:03:25 -04:00
Matthew Chen
2a63423c3d Elaborate fake contact shares. 2018-05-01 11:03:25 -04:00
Matthew Chen
c854cc3de6 Fix fake contact share message creation. 2018-05-01 11:03:25 -04:00
Matthew Chen
521013a674 Fix contact share property synthesis. 2018-05-01 11:03:25 -04:00
Matthew Chen
7490a55f61 Sketch out "contact share" model. 2018-05-01 11:03:25 -04:00
Matthew Chen
4b8a2fa8a3 Sketch out "contact share" model. 2018-05-01 11:03:25 -04:00
Matthew Chen
6005747856 Update protos to reflect 'share contact'. 2018-05-01 11:03:25 -04:00
Matthew Chen
46354cdb11 Merge branch 'charlesmchen/noArchivedThreads' 2018-05-01 10:56:06 -04:00
Matthew Chen
2fe7596e04 Only show archived threads UI if there are archived threads. 2018-05-01 10:55:47 -04:00
Matthew Chen
6ab48cec97 Only show archived threads UI if there are archived threads. 2018-05-01 10:55:47 -04:00
Matthew Chen
f65757a1ee Merge branch 'charlesmchen/outgoingMessageFixes' 2018-04-30 11:02:51 -04:00
Matthew Chen
bb96454070 More outgoing message fixes. 2018-04-30 11:00:57 -04:00