From 1fe7ab5afb80b52bfff23aee872811583f5df565 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Sun, 14 Mar 2021 10:28:53 -0300 Subject: [PATCH] Respond to CR. --- .../add-emoji-outline-24.imageset/Contents.json | 11 +---------- .../add-members-256.imageset/Contents.json | 17 ++++------------- .../approve-28.imageset/Contents.json | 11 +---------- .../arrow-down-24.imageset/Contents.json | 11 +---------- .../Contents.json | 17 ++++------------- .../block-24.imageset/Contents.json | 17 ++++------------- .../camera-outline-24.imageset/Contents.json | 17 ++++------------- .../camera-solid-24.imageset/Contents.json | 17 ++++------------- .../chevron-down-256.imageset/Contents.json | 17 ++++------------- .../Contents.json | 11 +---------- .../Contents.json | 11 +---------- .../compose-outline-32.imageset/Contents.json | 11 +---------- .../compose-solid-32.imageset/Contents.json | 11 +---------- .../contact-avatar-1024.imageset/Contents.json | 17 ++++------------- .../contact-avatar-84.imageset/Contents.json | 17 ++++------------- .../contact-outline-24.imageset/Contents.json | 17 ++++------------- .../contact-solid-24.imageset/Contents.json | 17 ++++------------- .../decimal-32.imageset/Contents.json | 11 +---------- .../delete-32.imageset/Contents.json | 11 +---------- .../deny-28.imageset/Contents.json | 11 +---------- .../error-20.imageset/Contents.json | 11 +---------- .../Contents.json | 17 ++++------------- .../group-outline-20.imageset/Contents.json | 17 ++++------------- .../group-outline-24.imageset/Contents.json | 17 ++++------------- .../group-outline-256.imageset/Contents.json | 17 ++++------------- .../group-outline-32.imageset/Contents.json | 17 ++++------------- .../group-outline-40.imageset/Contents.json | 17 ++++------------- .../group-solid-24.imageset/Contents.json | 17 ++++------------- .../invite-outline-256.imageset/Contents.json | 17 ++++------------- .../invite-outline-40.imageset/Contents.json | 17 ++++------------- .../leave-24.imageset/Contents.json | 17 ++++------------- .../mic-outline-24.imageset/Contents.json | 17 ++++------------- .../mic-solid-24.imageset/Contents.json | 17 ++++------------- .../mobilecoin-24.imageset/Contents.json | 11 +---------- .../note-112.imageset/Contents.json | 17 ++++------------- .../Contents.json | 17 ++++------------- .../payment-cancelled-20.imageset/Contents.json | 11 +---------- .../payment-request-20.imageset/Contents.json | 11 +---------- .../payments-32.imageset/Contents.json | 11 +---------- .../payments-outline-24.imageset/Contents.json | 11 +---------- .../payments-solid-24.imageset/Contents.json | 11 +---------- .../payments-toggle-24.imageset/Contents.json | 11 +---------- .../phone-number-256.imageset/Contents.json | 17 ++++------------- .../phone-number-32.imageset/Contents.json | 17 ++++------------- .../phone-number-40.imageset/Contents.json | 17 ++++------------- .../Contents.json | 17 ++++------------- .../photo-album-solid-24.imageset/Contents.json | 17 ++++------------- .../photo-outline-24.imageset/Contents.json | 17 ++++------------- .../photo-solid-24.imageset/Contents.json | 17 ++++------------- .../play-solid-32.imageset/Contents.json | 11 +---------- .../play_button.imageset/Contents.json | 17 ++++------------- .../plus-256.imageset/Contents.json | 17 ++++------------- .../Contents.json | 17 ++++------------- .../Contents.json | 17 ++++------------- .../qr-24.imageset/Contents.json | 11 +---------- .../recovery-phrase.imageset/Contents.json | 11 +---------- .../refresh-20.imageset/Contents.json | 11 +---------- .../retry-alt-24.imageset/Contents.json | 11 +---------- .../Contents.json | 17 ++++------------- .../Contents.json | 17 ++++------------- .../search-25.imageset/Contents.json | 17 ++++------------- .../select-24.imageset/Contents.json | 17 ++++------------- .../send-20.imageset/Contents.json | 11 +---------- .../send-mob-24.imageset/Contents.json | 11 +---------- .../share-ios-24.imageset/Contents.json | 17 ++++------------- .../sound-outline-24.imageset/Contents.json | 17 ++++------------- .../sound-solid-24.imageset/Contents.json | 17 ++++------------- .../sticker-outline-24.imageset/Contents.json | 17 ++++------------- .../sticker-solid-24.imageset/Contents.json | 17 ++++------------- .../stop-20.imageset/Contents.json | 11 +---------- .../timer-24.imageset/Contents.json | 17 ++++------------- .../timer-disabled-24.imageset/Contents.json | 17 ++++------------- .../view-all-256.imageset/Contents.json | 17 ++++------------- .../view-infinite-24.imageset/Contents.json | 17 ++++------------- .../x-circle-solid-16.imageset/Contents.json | 11 +---------- .../PaymentsDeactivateViewController.swift | 2 +- ...mentsRestoreWalletSplashViewController.swift | 2 +- .../PaymentsSendRecipientViewController.swift | 12 +++++++++++- .../PaymentsSettingsViewController.swift | 2 +- ...entsViewPassphraseSplashViewController.swift | 2 +- .../BaseGroupMemberViewController.swift | 2 +- .../Payments/SendPaymentViewController.swift | 2 +- .../Stickers/ManageStickersViewController.swift | 2 +- .../AddToGroupViewController.swift | 2 +- SignalMessaging/Payments/PaymentsImpl.swift | 6 +++--- .../Payments/PaymentsProcessor.swift | 2 +- .../OWSTableViewController2.swift | 2 +- 87 files changed, 243 insertions(+), 908 deletions(-) diff --git a/Signal/Images.xcassets/add-emoji-outline-24.imageset/Contents.json b/Signal/Images.xcassets/add-emoji-outline-24.imageset/Contents.json index 7415323761..b79e28d0d4 100644 --- a/Signal/Images.xcassets/add-emoji-outline-24.imageset/Contents.json +++ b/Signal/Images.xcassets/add-emoji-outline-24.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "add-emoji-outline-24.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/add-members-256.imageset/Contents.json b/Signal/Images.xcassets/add-members-256.imageset/Contents.json index fd24f19ba6..d1798f3f8b 100644 --- a/Signal/Images.xcassets/add-members-256.imageset/Contents.json +++ b/Signal/Images.xcassets/add-members-256.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "add-members-256.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/approve-28.imageset/Contents.json b/Signal/Images.xcassets/approve-28.imageset/Contents.json index e72eaaaf48..b16cd16a84 100644 --- a/Signal/Images.xcassets/approve-28.imageset/Contents.json +++ b/Signal/Images.xcassets/approve-28.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "approve-28.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/arrow-down-24.imageset/Contents.json b/Signal/Images.xcassets/arrow-down-24.imageset/Contents.json index 14693dd92a..b660b8f0f9 100644 --- a/Signal/Images.xcassets/arrow-down-24.imageset/Contents.json +++ b/Signal/Images.xcassets/arrow-down-24.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "arrow-down-24.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/bell-disabled-solid-24.imageset/Contents.json b/Signal/Images.xcassets/bell-disabled-solid-24.imageset/Contents.json index 6490c612da..a5a217fee8 100644 --- a/Signal/Images.xcassets/bell-disabled-solid-24.imageset/Contents.json +++ b/Signal/Images.xcassets/bell-disabled-solid-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "bell-disabled-solid-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/block-24.imageset/Contents.json b/Signal/Images.xcassets/block-24.imageset/Contents.json index 0c9574c97b..cb810cd095 100644 --- a/Signal/Images.xcassets/block-24.imageset/Contents.json +++ b/Signal/Images.xcassets/block-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "block-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/camera-outline-24.imageset/Contents.json b/Signal/Images.xcassets/camera-outline-24.imageset/Contents.json index f48db509eb..b91b365902 100644 --- a/Signal/Images.xcassets/camera-outline-24.imageset/Contents.json +++ b/Signal/Images.xcassets/camera-outline-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "camera-outline-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/camera-solid-24.imageset/Contents.json b/Signal/Images.xcassets/camera-solid-24.imageset/Contents.json index ec90a2fb86..8aca8d7774 100644 --- a/Signal/Images.xcassets/camera-solid-24.imageset/Contents.json +++ b/Signal/Images.xcassets/camera-solid-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "camera-solid-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/chevron-down-256.imageset/Contents.json b/Signal/Images.xcassets/chevron-down-256.imageset/Contents.json index 4fdb8d112e..01d10f4d42 100644 --- a/Signal/Images.xcassets/chevron-down-256.imageset/Contents.json +++ b/Signal/Images.xcassets/chevron-down-256.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "view-all-256.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/circle_incoming_grey_40.imageset/Contents.json b/Signal/Images.xcassets/circle_incoming_grey_40.imageset/Contents.json index 8448f26c37..ae99d10ba5 100644 --- a/Signal/Images.xcassets/circle_incoming_grey_40.imageset/Contents.json +++ b/Signal/Images.xcassets/circle_incoming_grey_40.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "circle_incoming_grey_40.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/circle_outgoing_white_40.imageset/Contents.json b/Signal/Images.xcassets/circle_outgoing_white_40.imageset/Contents.json index 6ef9ba72f2..6fbca436b8 100644 --- a/Signal/Images.xcassets/circle_outgoing_white_40.imageset/Contents.json +++ b/Signal/Images.xcassets/circle_outgoing_white_40.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "circle_outgoing_white_40.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/compose-outline-32.imageset/Contents.json b/Signal/Images.xcassets/compose-outline-32.imageset/Contents.json index 7025aeaa33..95c1e595b1 100644 --- a/Signal/Images.xcassets/compose-outline-32.imageset/Contents.json +++ b/Signal/Images.xcassets/compose-outline-32.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "compose-outline-32.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/compose-solid-32.imageset/Contents.json b/Signal/Images.xcassets/compose-solid-32.imageset/Contents.json index 3ca552f8ce..82d46c5417 100644 --- a/Signal/Images.xcassets/compose-solid-32.imageset/Contents.json +++ b/Signal/Images.xcassets/compose-solid-32.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "compose-solid-32.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/contact-avatar-1024.imageset/Contents.json b/Signal/Images.xcassets/contact-avatar-1024.imageset/Contents.json index 8ffbcdfbb4..c784ea3d8a 100644 --- a/Signal/Images.xcassets/contact-avatar-1024.imageset/Contents.json +++ b/Signal/Images.xcassets/contact-avatar-1024.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "contact-avatar-1024.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/contact-avatar-84.imageset/Contents.json b/Signal/Images.xcassets/contact-avatar-84.imageset/Contents.json index d347f46e9c..f03b623f2a 100644 --- a/Signal/Images.xcassets/contact-avatar-84.imageset/Contents.json +++ b/Signal/Images.xcassets/contact-avatar-84.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "contact-avatar-84.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/contact-outline-24.imageset/Contents.json b/Signal/Images.xcassets/contact-outline-24.imageset/Contents.json index 6bac2e995b..f0d5600c14 100644 --- a/Signal/Images.xcassets/contact-outline-24.imageset/Contents.json +++ b/Signal/Images.xcassets/contact-outline-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "contact-outline-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/contact-solid-24.imageset/Contents.json b/Signal/Images.xcassets/contact-solid-24.imageset/Contents.json index 91144a46ca..a932608199 100644 --- a/Signal/Images.xcassets/contact-solid-24.imageset/Contents.json +++ b/Signal/Images.xcassets/contact-solid-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "contact-solid-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/decimal-32.imageset/Contents.json b/Signal/Images.xcassets/decimal-32.imageset/Contents.json index e94b6faf00..616f278882 100644 --- a/Signal/Images.xcassets/decimal-32.imageset/Contents.json +++ b/Signal/Images.xcassets/decimal-32.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "decimal-32.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/delete-32.imageset/Contents.json b/Signal/Images.xcassets/delete-32.imageset/Contents.json index a9d01692b8..53b909fb3e 100644 --- a/Signal/Images.xcassets/delete-32.imageset/Contents.json +++ b/Signal/Images.xcassets/delete-32.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "delete-32.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/deny-28.imageset/Contents.json b/Signal/Images.xcassets/deny-28.imageset/Contents.json index c39d360303..548b07d51e 100644 --- a/Signal/Images.xcassets/deny-28.imageset/Contents.json +++ b/Signal/Images.xcassets/deny-28.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "deny-28.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/error-20.imageset/Contents.json b/Signal/Images.xcassets/error-20.imageset/Contents.json index d28dd44b44..4e383ae603 100644 --- a/Signal/Images.xcassets/error-20.imageset/Contents.json +++ b/Signal/Images.xcassets/error-20.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "error-20.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/file-thin-black-filled-large.imageset/Contents.json b/Signal/Images.xcassets/file-thin-black-filled-large.imageset/Contents.json index 00bbda0116..6bcedbb5ce 100644 --- a/Signal/Images.xcassets/file-thin-black-filled-large.imageset/Contents.json +++ b/Signal/Images.xcassets/file-thin-black-filled-large.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "file-thin-black-w-shadow-large.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/group-outline-20.imageset/Contents.json b/Signal/Images.xcassets/group-outline-20.imageset/Contents.json index cdd6a8d24c..edf82fc7a8 100644 --- a/Signal/Images.xcassets/group-outline-20.imageset/Contents.json +++ b/Signal/Images.xcassets/group-outline-20.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "group-outline-20.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/group-outline-24.imageset/Contents.json b/Signal/Images.xcassets/group-outline-24.imageset/Contents.json index cdda38e5d3..a9db537df6 100644 --- a/Signal/Images.xcassets/group-outline-24.imageset/Contents.json +++ b/Signal/Images.xcassets/group-outline-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "group-outline-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/group-outline-256.imageset/Contents.json b/Signal/Images.xcassets/group-outline-256.imageset/Contents.json index 4301edb5f4..a4c5bf8f3a 100644 --- a/Signal/Images.xcassets/group-outline-256.imageset/Contents.json +++ b/Signal/Images.xcassets/group-outline-256.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "group-outline-256.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/group-outline-32.imageset/Contents.json b/Signal/Images.xcassets/group-outline-32.imageset/Contents.json index 69aea5b759..bcf5d24184 100644 --- a/Signal/Images.xcassets/group-outline-32.imageset/Contents.json +++ b/Signal/Images.xcassets/group-outline-32.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "group-outline-32.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/group-outline-40.imageset/Contents.json b/Signal/Images.xcassets/group-outline-40.imageset/Contents.json index 2c8b929e90..02665dba12 100644 --- a/Signal/Images.xcassets/group-outline-40.imageset/Contents.json +++ b/Signal/Images.xcassets/group-outline-40.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "group-outline-40.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/group-solid-24.imageset/Contents.json b/Signal/Images.xcassets/group-solid-24.imageset/Contents.json index d3f2086656..ee08aeb34e 100644 --- a/Signal/Images.xcassets/group-solid-24.imageset/Contents.json +++ b/Signal/Images.xcassets/group-solid-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "group-solid-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/invite-outline-256.imageset/Contents.json b/Signal/Images.xcassets/invite-outline-256.imageset/Contents.json index ed6809b46c..39ae8ee27c 100644 --- a/Signal/Images.xcassets/invite-outline-256.imageset/Contents.json +++ b/Signal/Images.xcassets/invite-outline-256.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "invite-outline-256.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/invite-outline-40.imageset/Contents.json b/Signal/Images.xcassets/invite-outline-40.imageset/Contents.json index d8c9ca39e8..8cd5aadff7 100644 --- a/Signal/Images.xcassets/invite-outline-40.imageset/Contents.json +++ b/Signal/Images.xcassets/invite-outline-40.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "invite-outline-40.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/leave-24.imageset/Contents.json b/Signal/Images.xcassets/leave-24.imageset/Contents.json index 58198fdc2a..846dd71797 100644 --- a/Signal/Images.xcassets/leave-24.imageset/Contents.json +++ b/Signal/Images.xcassets/leave-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "leave-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/mic-outline-24.imageset/Contents.json b/Signal/Images.xcassets/mic-outline-24.imageset/Contents.json index 1f604bdf6b..e939882ed7 100644 --- a/Signal/Images.xcassets/mic-outline-24.imageset/Contents.json +++ b/Signal/Images.xcassets/mic-outline-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "mic-outline-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/mic-solid-24.imageset/Contents.json b/Signal/Images.xcassets/mic-solid-24.imageset/Contents.json index b2a8d981e8..5d54e51f4d 100644 --- a/Signal/Images.xcassets/mic-solid-24.imageset/Contents.json +++ b/Signal/Images.xcassets/mic-solid-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "mic-solid-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/mobilecoin-24.imageset/Contents.json b/Signal/Images.xcassets/mobilecoin-24.imageset/Contents.json index 3438c65ccf..8422635094 100644 --- a/Signal/Images.xcassets/mobilecoin-24.imageset/Contents.json +++ b/Signal/Images.xcassets/mobilecoin-24.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "mobilecoin-24.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/note-112.imageset/Contents.json b/Signal/Images.xcassets/note-112.imageset/Contents.json index 8af344b7c8..010aed029f 100644 --- a/Signal/Images.xcassets/note-112.imageset/Contents.json +++ b/Signal/Images.xcassets/note-112.imageset/Contents.json @@ -1,24 +1,15 @@ { "images" : [ { - "idiom" : "universal", "filename" : "note-112.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 }, "properties" : { "preserves-vector-representation" : true } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/onboarding_splash_hero.imageset/Contents.json b/Signal/Images.xcassets/onboarding_splash_hero.imageset/Contents.json index e4663220c4..f86080d25f 100644 --- a/Signal/Images.xcassets/onboarding_splash_hero.imageset/Contents.json +++ b/Signal/Images.xcassets/onboarding_splash_hero.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "onboarding_splash.png", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/payment-cancelled-20.imageset/Contents.json b/Signal/Images.xcassets/payment-cancelled-20.imageset/Contents.json index e11570e89d..77ae0e0186 100644 --- a/Signal/Images.xcassets/payment-cancelled-20.imageset/Contents.json +++ b/Signal/Images.xcassets/payment-cancelled-20.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "canceled-20.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/payment-request-20.imageset/Contents.json b/Signal/Images.xcassets/payment-request-20.imageset/Contents.json index a2f98001cd..c844b388a5 100644 --- a/Signal/Images.xcassets/payment-request-20.imageset/Contents.json +++ b/Signal/Images.xcassets/payment-request-20.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "request-20.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/payments-32.imageset/Contents.json b/Signal/Images.xcassets/payments-32.imageset/Contents.json index 42d61bd894..3476669f3f 100644 --- a/Signal/Images.xcassets/payments-32.imageset/Contents.json +++ b/Signal/Images.xcassets/payments-32.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "payments-32.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/payments-outline-24.imageset/Contents.json b/Signal/Images.xcassets/payments-outline-24.imageset/Contents.json index 1a2a8d3721..e27241fdec 100644 --- a/Signal/Images.xcassets/payments-outline-24.imageset/Contents.json +++ b/Signal/Images.xcassets/payments-outline-24.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "payments-outline-24.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/payments-solid-24.imageset/Contents.json b/Signal/Images.xcassets/payments-solid-24.imageset/Contents.json index a426e9a3f4..917b8e8962 100644 --- a/Signal/Images.xcassets/payments-solid-24.imageset/Contents.json +++ b/Signal/Images.xcassets/payments-solid-24.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "payments-solid-24.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/payments-toggle-24.imageset/Contents.json b/Signal/Images.xcassets/payments-toggle-24.imageset/Contents.json index 476e368fa5..5b63af6f52 100644 --- a/Signal/Images.xcassets/payments-toggle-24.imageset/Contents.json +++ b/Signal/Images.xcassets/payments-toggle-24.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "payments-toggle-24.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/phone-number-256.imageset/Contents.json b/Signal/Images.xcassets/phone-number-256.imageset/Contents.json index 22907194c4..385eac3418 100644 --- a/Signal/Images.xcassets/phone-number-256.imageset/Contents.json +++ b/Signal/Images.xcassets/phone-number-256.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "invite-friends-256.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/phone-number-32.imageset/Contents.json b/Signal/Images.xcassets/phone-number-32.imageset/Contents.json index 8f29bdd659..c9c6344a14 100644 --- a/Signal/Images.xcassets/phone-number-32.imageset/Contents.json +++ b/Signal/Images.xcassets/phone-number-32.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "phone-number-32.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/phone-number-40.imageset/Contents.json b/Signal/Images.xcassets/phone-number-40.imageset/Contents.json index 2c5c7e626e..db23bc9508 100644 --- a/Signal/Images.xcassets/phone-number-40.imageset/Contents.json +++ b/Signal/Images.xcassets/phone-number-40.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "invite-friends-40.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/photo-album-outline-24.imageset/Contents.json b/Signal/Images.xcassets/photo-album-outline-24.imageset/Contents.json index 84d6ba0310..63a98c74f4 100644 --- a/Signal/Images.xcassets/photo-album-outline-24.imageset/Contents.json +++ b/Signal/Images.xcassets/photo-album-outline-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "photo-album-outline-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/photo-album-solid-24.imageset/Contents.json b/Signal/Images.xcassets/photo-album-solid-24.imageset/Contents.json index dc042b5219..83773883be 100644 --- a/Signal/Images.xcassets/photo-album-solid-24.imageset/Contents.json +++ b/Signal/Images.xcassets/photo-album-solid-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "photo-album-solid-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/photo-outline-24.imageset/Contents.json b/Signal/Images.xcassets/photo-outline-24.imageset/Contents.json index 8165274e96..6467e41da8 100644 --- a/Signal/Images.xcassets/photo-outline-24.imageset/Contents.json +++ b/Signal/Images.xcassets/photo-outline-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "photo-outline-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/photo-solid-24.imageset/Contents.json b/Signal/Images.xcassets/photo-solid-24.imageset/Contents.json index 15381f1886..a1f5a0ce07 100644 --- a/Signal/Images.xcassets/photo-solid-24.imageset/Contents.json +++ b/Signal/Images.xcassets/photo-solid-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "photo-solid-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/play-solid-32.imageset/Contents.json b/Signal/Images.xcassets/play-solid-32.imageset/Contents.json index 29fbfe5d09..e72e4b101e 100644 --- a/Signal/Images.xcassets/play-solid-32.imageset/Contents.json +++ b/Signal/Images.xcassets/play-solid-32.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "play-solid-32.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/play_button.imageset/Contents.json b/Signal/Images.xcassets/play_button.imageset/Contents.json index a9902e0a30..e62d90839e 100644 --- a/Signal/Images.xcassets/play_button.imageset/Contents.json +++ b/Signal/Images.xcassets/play_button.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", "filename" : "play_button@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/plus-256.imageset/Contents.json b/Signal/Images.xcassets/plus-256.imageset/Contents.json index fd24f19ba6..d1798f3f8b 100644 --- a/Signal/Images.xcassets/plus-256.imageset/Contents.json +++ b/Signal/Images.xcassets/plus-256.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "add-members-256.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/profile-circle-outline-24.imageset/Contents.json b/Signal/Images.xcassets/profile-circle-outline-24.imageset/Contents.json index b42d54d16c..e97bb7c3c8 100644 --- a/Signal/Images.xcassets/profile-circle-outline-24.imageset/Contents.json +++ b/Signal/Images.xcassets/profile-circle-outline-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "profile-circle-outline-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/profile-circle-solid-24.imageset/Contents.json b/Signal/Images.xcassets/profile-circle-solid-24.imageset/Contents.json index 8a683b61fc..6c16fe8ba2 100644 --- a/Signal/Images.xcassets/profile-circle-solid-24.imageset/Contents.json +++ b/Signal/Images.xcassets/profile-circle-solid-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "profile-circle-solid-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/qr-24.imageset/Contents.json b/Signal/Images.xcassets/qr-24.imageset/Contents.json index b07bc70e14..e538597291 100644 --- a/Signal/Images.xcassets/qr-24.imageset/Contents.json +++ b/Signal/Images.xcassets/qr-24.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "qr-24.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/recovery-phrase.imageset/Contents.json b/Signal/Images.xcassets/recovery-phrase.imageset/Contents.json index ea94485e6c..c00cbca5d1 100644 --- a/Signal/Images.xcassets/recovery-phrase.imageset/Contents.json +++ b/Signal/Images.xcassets/recovery-phrase.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "recovery-phrase.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/refresh-20.imageset/Contents.json b/Signal/Images.xcassets/refresh-20.imageset/Contents.json index 11f3fd1285..8178aaea1f 100644 --- a/Signal/Images.xcassets/refresh-20.imageset/Contents.json +++ b/Signal/Images.xcassets/refresh-20.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "refresh-20.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/retry-alt-24.imageset/Contents.json b/Signal/Images.xcassets/retry-alt-24.imageset/Contents.json index 3ec281ae94..1953761ca5 100644 --- a/Signal/Images.xcassets/retry-alt-24.imageset/Contents.json +++ b/Signal/Images.xcassets/retry-alt-24.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "retry-24.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/safety-number-outline-24.imageset/Contents.json b/Signal/Images.xcassets/safety-number-outline-24.imageset/Contents.json index 02739a722b..886a1e977c 100644 --- a/Signal/Images.xcassets/safety-number-outline-24.imageset/Contents.json +++ b/Signal/Images.xcassets/safety-number-outline-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "safety-number-outline-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/safety-number-solid-24.imageset/Contents.json b/Signal/Images.xcassets/safety-number-solid-24.imageset/Contents.json index 98ed6e73dd..cd89e8bbda 100644 --- a/Signal/Images.xcassets/safety-number-solid-24.imageset/Contents.json +++ b/Signal/Images.xcassets/safety-number-solid-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "safety-number-solid-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/search-25.imageset/Contents.json b/Signal/Images.xcassets/search-25.imageset/Contents.json index 1fe245afc2..0d41163941 100644 --- a/Signal/Images.xcassets/search-25.imageset/Contents.json +++ b/Signal/Images.xcassets/search-25.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "search-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/select-24.imageset/Contents.json b/Signal/Images.xcassets/select-24.imageset/Contents.json index 25b3a8285b..30605818a8 100644 --- a/Signal/Images.xcassets/select-24.imageset/Contents.json +++ b/Signal/Images.xcassets/select-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "select-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/send-20.imageset/Contents.json b/Signal/Images.xcassets/send-20.imageset/Contents.json index 50b176dff3..0cdacd6ed9 100644 --- a/Signal/Images.xcassets/send-20.imageset/Contents.json +++ b/Signal/Images.xcassets/send-20.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "send-20.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/send-mob-24.imageset/Contents.json b/Signal/Images.xcassets/send-mob-24.imageset/Contents.json index a816a8620d..5b2e36cbee 100644 --- a/Signal/Images.xcassets/send-mob-24.imageset/Contents.json +++ b/Signal/Images.xcassets/send-mob-24.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "send-mob-24.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/share-ios-24.imageset/Contents.json b/Signal/Images.xcassets/share-ios-24.imageset/Contents.json index e84eaeece5..6c970f9a10 100644 --- a/Signal/Images.xcassets/share-ios-24.imageset/Contents.json +++ b/Signal/Images.xcassets/share-ios-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "share-ios-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/sound-outline-24.imageset/Contents.json b/Signal/Images.xcassets/sound-outline-24.imageset/Contents.json index 31e848aa87..5d73d1295c 100644 --- a/Signal/Images.xcassets/sound-outline-24.imageset/Contents.json +++ b/Signal/Images.xcassets/sound-outline-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "sound-outline-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/sound-solid-24.imageset/Contents.json b/Signal/Images.xcassets/sound-solid-24.imageset/Contents.json index b422ed2828..c30fe3ba33 100644 --- a/Signal/Images.xcassets/sound-solid-24.imageset/Contents.json +++ b/Signal/Images.xcassets/sound-solid-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "sound-solid-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/sticker-outline-24.imageset/Contents.json b/Signal/Images.xcassets/sticker-outline-24.imageset/Contents.json index fa18ff097d..a692c8b682 100644 --- a/Signal/Images.xcassets/sticker-outline-24.imageset/Contents.json +++ b/Signal/Images.xcassets/sticker-outline-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "sticker-outline-20.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/sticker-solid-24.imageset/Contents.json b/Signal/Images.xcassets/sticker-solid-24.imageset/Contents.json index 50433c3a84..18e6687de8 100644 --- a/Signal/Images.xcassets/sticker-solid-24.imageset/Contents.json +++ b/Signal/Images.xcassets/sticker-solid-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "sticker-solid-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/stop-20.imageset/Contents.json b/Signal/Images.xcassets/stop-20.imageset/Contents.json index ea2991e965..eb3165b22f 100644 --- a/Signal/Images.xcassets/stop-20.imageset/Contents.json +++ b/Signal/Images.xcassets/stop-20.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "stop-20.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/Images.xcassets/timer-24.imageset/Contents.json b/Signal/Images.xcassets/timer-24.imageset/Contents.json index 177ef6847a..2cd758fa2a 100644 --- a/Signal/Images.xcassets/timer-24.imageset/Contents.json +++ b/Signal/Images.xcassets/timer-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "timer-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/timer-disabled-24.imageset/Contents.json b/Signal/Images.xcassets/timer-disabled-24.imageset/Contents.json index 65746f7d6b..3605904926 100644 --- a/Signal/Images.xcassets/timer-disabled-24.imageset/Contents.json +++ b/Signal/Images.xcassets/timer-disabled-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "timer-disabled-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/view-all-256.imageset/Contents.json b/Signal/Images.xcassets/view-all-256.imageset/Contents.json index 4fdb8d112e..01d10f4d42 100644 --- a/Signal/Images.xcassets/view-all-256.imageset/Contents.json +++ b/Signal/Images.xcassets/view-all-256.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "view-all-256.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/view-infinite-24.imageset/Contents.json b/Signal/Images.xcassets/view-infinite-24.imageset/Contents.json index 04637f2433..04424226c1 100644 --- a/Signal/Images.xcassets/view-infinite-24.imageset/Contents.json +++ b/Signal/Images.xcassets/view-infinite-24.imageset/Contents.json @@ -1,21 +1,12 @@ { "images" : [ { - "idiom" : "universal", "filename" : "view-infinite-24.pdf", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Signal/Images.xcassets/x-circle-solid-16.imageset/Contents.json b/Signal/Images.xcassets/x-circle-solid-16.imageset/Contents.json index e4648eb3bf..d49527f731 100644 --- a/Signal/Images.xcassets/x-circle-solid-16.imageset/Contents.json +++ b/Signal/Images.xcassets/x-circle-solid-16.imageset/Contents.json @@ -2,16 +2,7 @@ "images" : [ { "filename" : "x-circle-solid-16.pdf", - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" + "idiom" : "universal" } ], "info" : { diff --git a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsDeactivateViewController.swift b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsDeactivateViewController.swift index baccc03c64..6dfa8eadde 100644 --- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsDeactivateViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsDeactivateViewController.swift @@ -21,7 +21,7 @@ public class PaymentsDeactivateViewController: OWSViewController { title = NSLocalizedString("SETTINGS_PAYMENTS_DEACTIVATE_TITLE", comment: "Label for the 'de-activate payments' view of the app settings.") - navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .stop, + navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(didTapDismiss), accessibilityIdentifier: "dismiss") diff --git a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsRestoreWalletSplashViewController.swift b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsRestoreWalletSplashViewController.swift index c018339fa6..1d7b438dd5 100644 --- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsRestoreWalletSplashViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsRestoreWalletSplashViewController.swift @@ -27,7 +27,7 @@ public class PaymentsRestoreWalletSplashViewController: OWSViewController { title = NSLocalizedString("SETTINGS_PAYMENTS_RESTORE_WALLET_TITLE", comment: "Title for the 'restore payments wallet' view of the app settings.") - navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .stop, + navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(didTapDismiss), accessibilityIdentifier: "dismiss") diff --git a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsSendRecipientViewController.swift b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsSendRecipientViewController.swift index 27b2048c38..4a44bd5f7b 100644 --- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsSendRecipientViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsSendRecipientViewController.swift @@ -39,7 +39,17 @@ class PaymentsSendRecipientViewController: OWSViewController { recipientPicker.view.autoPinEdge(toSuperviewEdge: .trailing) recipientPicker.view.autoPinEdge(toSuperviewEdge: .bottom) - navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .stop, target: self, action: #selector(didTapDismiss)) + navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(didTapDismiss)) + } + + override func viewWillAppear(_ animated: Bool) { + super.viewWillAppear(animated) + recipientPicker.applyTheme(to: self) + } + + override func viewWillDisappear(_ animated: Bool) { + super.viewWillDisappear(animated) + recipientPicker.removeTheme(from: self) } @objc diff --git a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsSettingsViewController.swift b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsSettingsViewController.swift index 31bb1d38fc..380284bc1b 100644 --- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsSettingsViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsSettingsViewController.swift @@ -38,7 +38,7 @@ public class PaymentsSettingsViewController: OWSTableViewController2 { comment: "Label for the 'payments' section of the app settings.") if mode == .standalone { - navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .stop, + navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(didTapDismiss), accessibilityIdentifier: "dismiss") diff --git a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseSplashViewController.swift b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseSplashViewController.swift index e0d43900ab..c0ef8e4857 100644 --- a/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseSplashViewController.swift +++ b/Signal/src/ViewControllers/AppSettings/Payments/PaymentsViewPassphraseSplashViewController.swift @@ -49,7 +49,7 @@ public class PaymentsViewPassphraseSplashViewController: OWSViewController { } private func updateNavbar() { - navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .stop, + navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(didTapDismiss), accessibilityIdentifier: "dismiss") diff --git a/Signal/src/ViewControllers/NewGroupView/BaseGroupMemberViewController.swift b/Signal/src/ViewControllers/NewGroupView/BaseGroupMemberViewController.swift index 1e3308630c..4db4496af6 100644 --- a/Signal/src/ViewControllers/NewGroupView/BaseGroupMemberViewController.swift +++ b/Signal/src/ViewControllers/NewGroupView/BaseGroupMemberViewController.swift @@ -289,7 +289,7 @@ public class BaseGroupMemberViewController: OWSViewController { return } if navigationController.viewControllers.count == 1 { - navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .stop, + navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(dismissPressed)) } diff --git a/Signal/src/ViewControllers/Payments/SendPaymentViewController.swift b/Signal/src/ViewControllers/Payments/SendPaymentViewController.swift index 4b1027847b..20b25a47f5 100644 --- a/Signal/src/ViewControllers/Payments/SendPaymentViewController.swift +++ b/Signal/src/ViewControllers/Payments/SendPaymentViewController.swift @@ -220,7 +220,7 @@ public class SendPaymentViewController: OWSViewController { view.backgroundColor = Theme.backgroundColor navigationItem.title = nil if mode.isModalRootView { - navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .stop, + navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(didTapDismiss), accessibilityIdentifier: "dismiss") diff --git a/Signal/src/ViewControllers/Stickers/ManageStickersViewController.swift b/Signal/src/ViewControllers/Stickers/ManageStickersViewController.swift index 7a24259c0f..2a2cc1e434 100644 --- a/Signal/src/ViewControllers/Stickers/ManageStickersViewController.swift +++ b/Signal/src/ViewControllers/Stickers/ManageStickersViewController.swift @@ -71,7 +71,7 @@ public class ManageStickersViewController: OWSTableViewController2 { navigationItem.title = NSLocalizedString("STICKERS_MANAGE_VIEW_TITLE", comment: "Title for the 'manage stickers' view.") - navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .stop, target: self, action: #selector(didPressDismiss)) + navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(didPressDismiss)) if FeatureFlags.stickerPackOrdering { navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .edit, target: self, action: #selector(didPressEditButton)) diff --git a/Signal/src/ViewControllers/ThreadSettings/AddToGroupViewController.swift b/Signal/src/ViewControllers/ThreadSettings/AddToGroupViewController.swift index e25c4584da..b4388f7e21 100644 --- a/Signal/src/ViewControllers/ThreadSettings/AddToGroupViewController.swift +++ b/Signal/src/ViewControllers/ThreadSettings/AddToGroupViewController.swift @@ -39,7 +39,7 @@ public class AddToGroupViewController: OWSTableViewController2 { navigationItem.title = NSLocalizedString("ADD_TO_GROUP_TITLE", comment: "Title of the 'add to group' view.") - navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .stop, target: self, action: #selector(didPressCloseButton)) + navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(didPressCloseButton)) defaultSeparatorInsetLeading = Self.cellHInnerMargin + CGFloat(kSmallAvatarSize) + kContactCellAvatarTextMargin } diff --git a/SignalMessaging/Payments/PaymentsImpl.swift b/SignalMessaging/Payments/PaymentsImpl.swift index 2564364a91..dd720447d4 100644 --- a/SignalMessaging/Payments/PaymentsImpl.swift +++ b/SignalMessaging/Payments/PaymentsImpl.swift @@ -165,9 +165,9 @@ public class PaymentsImpl: NSObject, PaymentsSwift { owsFailDebug("Missing countryCode: \(localNumber).") return false } - let callingCodePartsOfUK: Int = 44 - let validCallingCodes = [ callingCodePartsOfUK ] - return validCallingCodes.contains(nsCountryCode.intValue) + let countryCodePartsOfUK: Int = 44 + let validCountryCodes = [ countryCodePartsOfUK ] + return validCountryCodes.contains(nsCountryCode.intValue) } public var shouldShowPaymentsUI: Bool { diff --git a/SignalMessaging/Payments/PaymentsProcessor.swift b/SignalMessaging/Payments/PaymentsProcessor.swift index d36ffda2d1..fdbae06901 100644 --- a/SignalMessaging/Payments/PaymentsProcessor.swift +++ b/SignalMessaging/Payments/PaymentsProcessor.swift @@ -87,7 +87,7 @@ public class PaymentsProcessor: NSObject { operationQueue.name = "PaymentsProcessor.default" // We want a concurrency level high enough to ensure that // high-priority operations are processed in a timely manner. - operationQueue.maxConcurrentOperationCount = 5 + operationQueue.maxConcurrentOperationCount = 3 return operationQueue }() diff --git a/SignalMessaging/ViewControllers/OWSTableViewController2.swift b/SignalMessaging/ViewControllers/OWSTableViewController2.swift index f50a660d3e..6f048ac0c7 100644 --- a/SignalMessaging/ViewControllers/OWSTableViewController2.swift +++ b/SignalMessaging/ViewControllers/OWSTableViewController2.swift @@ -691,7 +691,7 @@ extension OWSTableViewController2: UITableViewDataSource, UITableViewDelegate { public func present(fromViewController: UIViewController) { let navigationController = OWSNavigationController(rootViewController: self) - navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .stop, + navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(donePressed)) fromViewController.present(navigationController, animated: true, completion: nil)