From c8466912f09ac44dc689b6fc2152bb6e9b61ce9d Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 17 Apr 2017 15:13:15 -0400 Subject: [PATCH] Add muting of threads. // FREEBIE --- .../ic_mute_thread.imageset/Contents.json | 23 + .../ic_mute_thread@1x.png | Bin 0 -> 1762 bytes .../ic_mute_thread@2x.png | Bin 0 -> 2581 bytes .../ic_mute_thread@3x.png | Bin 0 -> 3401 bytes Signal/src/Storyboard/Main.storyboard | 369 ++--------- ...SConversationSettingsTableViewController.m | 607 ++++++++++++++---- .../ViewControllers/OWSTableViewController.h | 10 +- .../ViewControllers/OWSTableViewController.m | 59 +- Signal/src/environment/NotificationsManager.m | 4 + Signal/src/util/UIFont+OWS.h | 1 + Signal/src/util/UIFont+OWS.m | 5 + .../translations/en.lproj/Localizable.strings | 36 ++ 12 files changed, 636 insertions(+), 478 deletions(-) create mode 100644 Signal/Images.xcassets/ic_mute_thread.imageset/Contents.json create mode 100644 Signal/Images.xcassets/ic_mute_thread.imageset/ic_mute_thread@1x.png create mode 100644 Signal/Images.xcassets/ic_mute_thread.imageset/ic_mute_thread@2x.png create mode 100644 Signal/Images.xcassets/ic_mute_thread.imageset/ic_mute_thread@3x.png diff --git a/Signal/Images.xcassets/ic_mute_thread.imageset/Contents.json b/Signal/Images.xcassets/ic_mute_thread.imageset/Contents.json new file mode 100644 index 000000000..6a64bab41 --- /dev/null +++ b/Signal/Images.xcassets/ic_mute_thread.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_mute_thread@1x.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_mute_thread@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_mute_thread@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/ic_mute_thread.imageset/ic_mute_thread@1x.png b/Signal/Images.xcassets/ic_mute_thread.imageset/ic_mute_thread@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..1e5444c06b80dfaa4d94260393921ef0e0d9d850 GIT binary patch literal 1762 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 p**fcfy&#Nc3*-Aq_C*En%v_i2?e~PS literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/ic_mute_thread.imageset/ic_mute_thread@3x.png b/Signal/Images.xcassets/ic_mute_thread.imageset/ic_mute_thread@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..078dd3f127954277b2ebcee96eeefc70d890d69c GIT binary patch literal 3401 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 - + + - + @@ -369,298 +369,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -678,7 +387,7 @@ - + @@ -699,7 +408,7 @@ - + @@ -723,10 +432,10 @@ - + - + - + - +