From 8f22facecc126ec78e3a14681df38c064ffadebc Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Mon, 26 Feb 2018 15:07:43 -0500 Subject: [PATCH] Respond to CR. --- .../table_ic_notification_sound@1x.png | Bin 1476 -> 1537 bytes .../table_ic_notification_sound@2x.png | Bin 1786 -> 1874 bytes .../table_ic_notification_sound@3x.png | Bin 2052 -> 2202 bytes .../NotificationSettingsViewController.m | 1 - .../OWSConversationSettingsViewController.m | 1 - .../OWSSoundSettingsViewController.h | 4 --- .../OWSSoundSettingsViewController.m | 31 +++++------------- 7 files changed, 9 insertions(+), 28 deletions(-) diff --git a/Signal/Images.xcassets/table_ic_notification_sound.imageset/table_ic_notification_sound@1x.png b/Signal/Images.xcassets/table_ic_notification_sound.imageset/table_ic_notification_sound@1x.png index 17f78166ab327a07619b7baa6910b5afb7f3fc07..c782fbb72fb3f13a8bfe4bbcb4109c55e7840e73 100644 GIT binary patch delta 435 zcmV;k0ZjhH3xN!<-2)FTFfuJNHdHY+IxsRiH!+j!1A%{DP2flX00DSOL_t(Y4b_#s zF9bmt#@9!p5Q#!UK_f(Qp%OZO0)XnY30 z=dzPb=4Q?9I0;YkyV;$2-{;-DGrN~0|3v*fXYn_lbqv!@xPz-k6==g~687K)K2y#a zf21z5=iq-7jHx|F6==e25LTfCwxN3+RbT+q+i#4oSzCu=xP;sqCgUC4r#)kC0eV2% z1@9)eR+qDXWc&dwphAbR1qbj1Mq2kOR6t28umc-#0=X0_(2UyyEWu4K=QLOb^+;zw zO7#|qGFMWg3g|F+71{%DQaU-rI0E_(wL@kR)-r!3gEI6w5%b(Xf_XpQxV~^=s<$yM z>L7C&G#aTBI&C!y6?m@6ND|HIO}3?XWyPK_*SPyTC48#kt-2)FgFfuwaGaxZFIxsRiH8_*(1A%{it>F0p00BEmL_t(Y4b7Fm zO2beThm#;EDlOD5b`xDXbm&(54raID8}tSA4Y~>X1Q`Uusc+DsQ0Oys)k*i#;rbm& zB)Pd9Vs0uP__*o$^ZO;YH*FC7=P<@}VWQn*q!qOq!dKMiFxL8N86X}bx`1o=Y|H@R z2<{PlgI<3s9BKv!S}|WkxWnfsQ1?7PBiEG-5Wl210d>Dc(2kM;Vv;+C6KKN#W^e(& zj)DQ=&nU=Uif{`~;RtF+!2p#J3~Q@72JK^d?&$GK*#?JRYK~#sz|rEDvJJL=a^-2; z;G^8)m$6UL3OO;|&oK?da9ZO TU~&r&00000NkvXXu0mjf;Y6(| diff --git a/Signal/Images.xcassets/table_ic_notification_sound.imageset/table_ic_notification_sound@2x.png b/Signal/Images.xcassets/table_ic_notification_sound.imageset/table_ic_notification_sound@2x.png index 48b1a26cad0353b6c0d83ca7e2e905007ddb9c0b..57e5da9c4830bcbcd5577561d72733c332c8b1b3 100644 GIT binary patch delta 774 zcmV+h1Nr>=4bl#<-2)FTFfuJNHdHY+IxsRiIX9E+1A%{*s%CBg00PNLL_t(&1?`wS zYZXBlhU5K$msrIs9#RQ{l^78%R1oa6u@gZQw6V0&A0P-;7Gem3AW_7^!b>3-#7Zm_ zEux?hF&Gf*zw=A-D%lbh>O?1FI2y9ENj*I}>eXU>ah# z!Ug!)M0i^nScup?aNAR~6R)z;f1rVYqwpBgqAb5FF|ZE7r{Prz;m%|<19K6(1Fk}P z8gxRe<ao3j5+ zR&QEE+XM+e3y)Hj=kR+<>e%aNSp!~;BuRHD``{92pa+Ro8~BP!?Q^tAy8+)JXtc_} z2r9Mm>bbrjRB`5Jp$$ApM4zX8k!hyZv79qo(NEyx6*1e)Iw&}-$R8B zupG4b=>_I4n78M#4Xi@s3D^eu+>(y>9GDlwmH~=wUTfC5)z+7k#Kiyq6U1mBAP7PV(LhL(>L3A&5Db=DrLhtl@dq2xLJ8Q2jg^&^ zMT%4jVv#C{1OgEh63|?pPj6v4mYd!A+g-R1Ugl?azIoo++1p#aLZKPvD^RUg%V^3x zQwkXXA4Pv((0U5fn@tJyI66lX?{u=Y=nOI)18fP+k>?Y7Qp@*OC+`EDK_+7W?`8Zl zdR>>NSl5o#^lAY3L8!LSNG!S-CwbdKz`um&$R@n_^I`z_56rcLp30;)!|4_RydBsj zB%d%^dt7DKnE~MYnS2FJsvt~`J23$KFi^W_zyyCT&RFaB0Ptf>yzK*C3|ch+{4_cD z(U2tf5k^}G;8q~zMty_?ejZ7mw`gbpz-~x-kN`>vO$0a@LWm6;qRQLXAfNAp@st1{sAhSYJTGEmk@>T`_BfaTG`+2rWh`)#epQW!XcMs;)rpA7tM`W;0n;U4h$7Qiq^a22{sGsnV&c058G%gED(B zsJ>3m0Kb6p`9f1H7JmXSii|A0QbvO5cFIdV`h|4jt+R2p0fEKDcMAC@#s;b) zC*jP1&|=~my{9^huB6X)I5iN!Vq%qg1^o#6Y?WRN2rMQJD4wGeY1;~K1_T%rrxfxr zyC-cM;njcuW8#A14f=>~P=15Qbp`#dJ+>Ef=>+)Trv~ze U>OI>&TL1t607*qoM6N<$f+I^aBLDyZ diff --git a/Signal/Images.xcassets/table_ic_notification_sound.imageset/table_ic_notification_sound@3x.png b/Signal/Images.xcassets/table_ic_notification_sound.imageset/table_ic_notification_sound@3x.png index 429e224251dc5a62893ce4f34d8e556719c837cc..27b4da3a9e0f7adbc11eacbe2e621e929e3ce331 100644 GIT binary patch delta 1105 zcmV-X1g`sp5SkIN-2)FTFfuJNHdHY+IxsRiGBcCx1A%|cmx(g~00a?9L_t(|0qvVR zXcR#lhc)qqf*Oek+Gr9I(9TLtFd7RH6vR>uM6naB)G}I#HiC_fpz#$SASj9fLC`~j zTKWz?6HyVtx1wT<`u!khHfOlKo7v~x{Ndwvvpcgh-_7jJ>`q3Fa^Va(1I~bzff`b8 zw927G6E}ZRuMYSCec%EElVKfPfdTk4NDrT79ktZH9UeheiubcD1&v0=VmJcoMqVMg z+hrwa3Nl(D1Kw_wE5*BC7J}*!vJ;+wxAKK-m#m-)WHiHZ_-G&|E3f1PO+`iG5wP66T+bf2;uh12jNr(B8I zjatwTYJL?C!X@|yiH@iR>G6gptf`5Lh)aJO>o1Z?U85Ehb&EA|GAvEhf`(l@4LeSd z&$r|RIYB-Kd=9%7SJNV>fy(L)$9(XMah!ip z?{`w6$I~EaI+f8w{ker!D#-H!>#IQ)DkraP?8hQUq25*n`~ zN`s&WRInA^8yM;&O}jz5e@Se|K^lLf%mEGmwd_q@LhspoLBsz62qL=3M9YZxz;f{W zReH%edqJ(osthKA)aq728!QCL@rL@mn)Df%+m7{cRP|~3rwTAm9l8%wiWKfzqp-q(dUJ;V|Id>mK^>0yJD*mXV z2;1Qf=t0y-ElP{SHPvW_REIU+q%U9PG_=>V;(1UDnz(8%^c3#GD{$cqI0Mc=J_CON X!?UiS;ST3K00000NkvXXu0mjf6d3xE delta 954 zcmV;r14aCr5rh!1-2)FgFfuwaGaxZFIxsRiH8zv%1A%`n5^bRX00VnTL_t(|0qxvP zh)z))$MJbI6!Mn0g`_Yg3l>sH881a_gd!B#+GrLw)-wwv7A%Q{QcPAtUQ)!Cg_Kef zJH1-rh zLSsw|eZYSh#{=dh8wiQZ#J;3#9O(xK>JN6_S9l;6E;r!EWLt&9I1jBJ2%G_C{*)|t zuAt(bs(;LbbBOi7jfErjYJtEx&;0I?nKIE>rS5+c14icbknD_wVvnl|2%MEn?ipEO zPcmj-%_RoTejwgy!jW%`3LtQXnae#gTPCHcqF-X*$o*!wCKP)v(as=X=8>D4aRe&L z83fE4#=b!|$s{ya?Pm};djWYu)Z@rEu2vv$h8S~{ER(@gsNk0v2=a%e{4|B?mnwQ9Uq_uv6!W1AYW`stW#2d!KvIl)*R)FL96qr00KG zIOTx?9-vkrnKwueXm*h|vaP*p2NDpFKG5tTw`4nD$r~$zRumvv0Z2c|3A&F0u4o|O zvHl$@8c?wikmO7nAu8V-5gkaNKsrZrkjSqQs!9crh=6pTW*zw~+geHukbr>niDosC z&xfffRX`#F(jOwf23#P~?@Q`{1WA7iq_Z@KNz~86s|A`wx=XvBe39)Kr5Z>;IFmlo z$bIRBY}Z}tfdmAkaWY8v3h9vADhZ%M1Ee$bkCS$>uj)1_Ai)6XHq8d|O}4A9uVq1poj507*qoM6N<$g5e>yApigX diff --git a/Signal/src/ViewControllers/NotificationSettingsViewController.m b/Signal/src/ViewControllers/NotificationSettingsViewController.m index f02e3bbde..df653f7e9 100644 --- a/Signal/src/ViewControllers/NotificationSettingsViewController.m +++ b/Signal/src/ViewControllers/NotificationSettingsViewController.m @@ -51,7 +51,6 @@ } actionBlock:^{ OWSSoundSettingsViewController *vc = [OWSSoundSettingsViewController new]; - vc.soundType = OWSSoundType_Notification; [weakSelf.navigationController pushViewController:vc animated:YES]; }]]; [contents addSection:soundsSection]; diff --git a/Signal/src/ViewControllers/OWSConversationSettingsViewController.m b/Signal/src/ViewControllers/OWSConversationSettingsViewController.m index ea333a0b5..55e4a44f4 100644 --- a/Signal/src/ViewControllers/OWSConversationSettingsViewController.m +++ b/Signal/src/ViewControllers/OWSConversationSettingsViewController.m @@ -512,7 +512,6 @@ NS_ASSUME_NONNULL_BEGIN customRowHeight:45.f actionBlock:^{ OWSSoundSettingsViewController *vc = [OWSSoundSettingsViewController new]; - vc.soundType = OWSSoundType_Notification; vc.thread = weakSelf.thread; [weakSelf.navigationController pushViewController:vc animated:YES]; }]]; diff --git a/Signal/src/ViewControllers/OWSSoundSettingsViewController.h b/Signal/src/ViewControllers/OWSSoundSettingsViewController.h index 7d7ac11e7..27b89e488 100644 --- a/Signal/src/ViewControllers/OWSSoundSettingsViewController.h +++ b/Signal/src/ViewControllers/OWSSoundSettingsViewController.h @@ -6,14 +6,10 @@ NS_ASSUME_NONNULL_BEGIN -typedef NS_ENUM(NSUInteger, OWSSoundType) { OWSSoundType_Notification = 0 }; - @class TSThread; @interface OWSSoundSettingsViewController : OWSTableViewController -@property (nonatomic) OWSSoundType soundType; - // This property is optional. If it is not set, we are // editing the global notification sound. @property (nonatomic, nullable) TSThread *thread; diff --git a/Signal/src/ViewControllers/OWSSoundSettingsViewController.m b/Signal/src/ViewControllers/OWSSoundSettingsViewController.m index 340770211..ce7be75b2 100644 --- a/Signal/src/ViewControllers/OWSSoundSettingsViewController.m +++ b/Signal/src/ViewControllers/OWSSoundSettingsViewController.m @@ -27,14 +27,10 @@ NS_ASSUME_NONNULL_BEGIN { [super viewDidLoad]; - switch (self.soundType) { - case OWSSoundType_Notification: - [self setTitle:NSLocalizedString(@"SETTINGS_ITEM_NOTIFICATION_SOUND", - @"Label for settings view that allows user to change the notification sound.")]; - self.currentSound - = (self.thread ? [OWSSounds notificationSoundForThread:self.thread] : [OWSSounds globalNotificationSound]); - break; - } + [self setTitle:NSLocalizedString(@"SETTINGS_ITEM_NOTIFICATION_SOUND", + @"Label for settings view that allows user to change the notification sound.")]; + self.currentSound + = (self.thread ? [OWSSounds notificationSoundForThread:self.thread] : [OWSSounds globalNotificationSound]); [self updateTableContents]; [self updateNavigationItems]; @@ -74,12 +70,7 @@ NS_ASSUME_NONNULL_BEGIN soundsSection.headerTitle = NSLocalizedString( @"NOTIFICATIONS_SECTION_SOUNDS", @"Label for settings UI that allows user to change the notification sound."); - NSArray *allSounds; - switch (self.soundType) { - case OWSSoundType_Notification: - allSounds = [OWSSounds allNotificationSounds]; - break; - } + NSArray *allSounds = [OWSSounds allNotificationSounds]; for (NSNumber *nsValue in allSounds) { OWSSound sound = (OWSSound)nsValue.intValue; OWSTableItem *item; @@ -131,14 +122,10 @@ NS_ASSUME_NONNULL_BEGIN - (void)saveWasPressed:(id)sender { - switch (self.soundType) { - case OWSSoundType_Notification: - if (self.thread) { - [OWSSounds setNotificationSound:self.currentSound forThread:self.thread]; - } else { - [OWSSounds setGlobalNotificationSound:self.currentSound]; - } - break; + if (self.thread) { + [OWSSounds setNotificationSound:self.currentSound forThread:self.thread]; + } else { + [OWSSounds setGlobalNotificationSound:self.currentSound]; } [self.audioPlayer stop];