Commit graph

11170 commits

Author SHA1 Message Date
Michael Kirk 284357137f Photo/Movie Capture 2019-03-14 12:20:21 -07:00
Michael Kirk 95b11ddf8c Merge tag '2.37.2.0' 2019-03-14 11:42:44 -07:00
Matthew Chen 152a4a8c54 Merge branch 'charlesmchen/imageEditorDesign12' 2019-03-14 13:29:57 -04:00
Matthew Chen 684cebf2df Respond to CR. 2019-03-14 13:29:40 -04:00
Matthew Chen b7d3a99f39 Update "crop lock" assets. 2019-03-14 12:54:49 -04:00
Matthew Chen a48c3d8d20 Ensure attachment approval becomes first responder if app returns from background. 2019-03-14 12:54:49 -04:00
Matthew Chen f9445359d9 Fix layout glitch related to attachment approval input accessory background. 2019-03-14 12:54:49 -04:00
Matthew Chen a559b61056 Fix keyboard return behavior in attachment approval. 2019-03-14 12:54:49 -04:00
Matthew Chen 660f35147f Hide status bar in image editor modals. 2019-03-14 12:54:49 -04:00
Matthew Chen 25e7818f56 Ensure proper z-ordering of item layers. 2019-03-14 12:54:49 -04:00
Matthew Chen 4176d9a156 Merge branch 'charlesmchen/imageEditorDesign11' 2019-03-14 12:54:16 -04:00
Matthew Chen d824c49c07 Respond to CR. 2019-03-14 12:53:54 -04:00
Matthew Chen d80f086f31 Rework attachment captioning. 2019-03-14 12:40:29 -04:00
Matthew Chen 625656deb9 Pull out attachment text toolbar and text view classes. 2019-03-14 12:40:29 -04:00
Michael Kirk 256d308e30 pull latest translations 2019-03-14 08:32:48 -07:00
Michael Kirk 83a9d386ce Merge branch 'mkirk/notification-none-tone' into release/2.37.2 2019-03-14 08:30:24 -07:00
Michael Kirk a342660943 fix "none" notification tone 2019-03-14 08:30:10 -07:00
Michael Kirk d5664dae4b Change to non-crashing assert 2019-03-14 08:28:57 -07:00
Michael Kirk cadb9ea9a1 Merge branch 'mkirk/ios9-crash' into release/2.37.2 2019-03-14 08:28:40 -07:00
Michael Kirk 72ab6507ea fix crash when presenting alerts on iOS9 2019-03-14 08:28:28 -07:00
Michael Kirk 6d6d1de782 "Bump build to 2.37.2.0." 2019-03-14 08:28:17 -07:00
Michael Kirk 48dfdae0c5 Merge branch 'mkirk/fix-overzealous-assert-2' 2019-03-13 09:47:58 -07:00
Michael Kirk 91ec9ebf9d Fix overzealous assert 2019-03-13 09:47:56 -07:00
Michael Kirk 6ad5faad12 Merge branch 'mkirk/fix-overzealous-assert' 2019-03-13 09:47:19 -07:00
Michael Kirk 268dd33e7d Change to non-crashing assert 2019-03-13 09:46:37 -07:00
Matthew Chen f4ba7d2110 Merge branch 'charlesmchen/imageEditorDesign10' 2019-03-13 12:43:57 -04:00
Matthew Chen 581d0a7bff Respond to CR. 2019-03-13 12:43:30 -04:00
Matthew Chen 4fd16a7614 Remove top gradient from attachment approval. 2019-03-13 12:25:02 -04:00
Matthew Chen 745ec2adb8 Remove top gradient from attachment approval. 2019-03-13 12:10:56 -04:00
Matthew Chen 102eed8bab Merge branch 'charlesmchen/imageEditorDesign9' 2019-03-13 11:46:01 -04:00
Matthew Chen 0826864525 Decompose attachment approval into multiple source files. 2019-03-13 11:45:42 -04:00
Matthew Chen fdf3da8b0a Merge branch 'charlesmchen/imageEditorDesign8' 2019-03-13 11:44:41 -04:00
Matthew Chen c315c1c9ef Fix translation normalization of the image editor transform. 2019-03-13 11:44:31 -04:00
Matthew Chen 2ce057bcd0 Merge branch 'charlesmchen/imageEditorDesign7' 2019-03-13 11:43:21 -04:00
Matthew Chen 88c07fc534 Pinch to change text size in image editor text tool. 2019-03-13 11:41:44 -04:00
Matthew Chen b86ff1425e Merge branch 'charlesmchen/imageEditorDesign6' 2019-03-13 11:40:55 -04:00
Matthew Chen d6c91c2753 Respond to CR. 2019-03-13 11:40:43 -04:00
Matthew Chen fedbe3a5d0 Fix shadow on palette view. 2019-03-12 17:34:31 -04:00
Matthew Chen 75cfd979ba Modify brush stroke width to reflect current scale. 2019-03-12 17:34:31 -04:00
Matthew Chen c0ca55b1e0 Fix shadow on palette view. 2019-03-12 17:34:31 -04:00
Matthew Chen 337e32a909 Fix a shadow. 2019-03-12 17:34:31 -04:00
Matthew Chen 66efcb4639 Update rail icons. 2019-03-12 17:34:31 -04:00
Matthew Chen 2f7880af8e Fix hit testing of text layers. 2019-03-12 17:34:31 -04:00
Matthew Chen 575de76a43 Merge branch 'charlesmchen/imageEditorDesign5' 2019-03-12 17:33:59 -04:00
Matthew Chen 7521b3a145 Update "attachment has caption" indicator. 2019-03-12 17:22:46 -04:00
Matthew Chen dd16986d79 Avoid layout changes due to selection changes in media rail. 2019-03-12 17:22:46 -04:00
Matthew Chen e63b1169a3 Hide controls while moving text items. 2019-03-12 17:22:46 -04:00
Matthew Chen 9e636b0fc9 Hide controls during stroke. 2019-03-12 17:22:46 -04:00
Matthew Chen c77835926d Tap to create new text item. 2019-03-12 17:22:46 -04:00
Matthew Chen fb6631df5f Remove cancel button from attachment caption view. 2019-03-12 17:22:46 -04:00