From 67f979e014bbfce7d25f8a06273688d161931dc5 Mon Sep 17 00:00:00 2001 From: ryanzhao Date: Fri, 12 Nov 2021 17:01:57 +1100 Subject: [PATCH] update icons --- Session/Calls/CallVC.swift | 12 +++++++----- .../Session/AudioOff.imageset/Contents.json | 2 +- .../{AudioOff.pdf => audio_off_fill.pdf} | Bin 5362 -> 5063 bytes .../SwitchCamera.imageset/Contents.json | 2 +- ...wtichCamera.pdf => switch_camera_fill.pdf} | Bin 5773 -> 5311 bytes .../Session/VideoCall.imageset/Contents.json | 2 +- .../{video_call.pdf => video_call_fill.pdf} | Bin 5281 -> 5157 bytes 7 files changed, 10 insertions(+), 8 deletions(-) rename Session/Meta/Images.xcassets/Session/AudioOff.imageset/{AudioOff.pdf => audio_off_fill.pdf} (59%) rename Session/Meta/Images.xcassets/Session/SwitchCamera.imageset/{SwtichCamera.pdf => switch_camera_fill.pdf} (55%) rename Session/Meta/Images.xcassets/Session/VideoCall.imageset/{video_call.pdf => video_call_fill.pdf} (74%) diff --git a/Session/Calls/CallVC.swift b/Session/Calls/CallVC.swift index fa3f7fdc2..aeac31c80 100644 --- a/Session/Calls/CallVC.swift +++ b/Session/Calls/CallVC.swift @@ -116,19 +116,19 @@ final class CallVC : UIViewController, VideoPreviewDelegate { private lazy var videoButton: UIButton = { let result = UIButton(type: .custom) - let image = UIImage(named: "VideoCall")!.withTint(.white) + let image = UIImage(named: "VideoCall")?.withRenderingMode(.alwaysTemplate) result.setImage(image, for: UIControl.State.normal) result.set(.width, to: 60) result.set(.height, to: 60) + result.tintColor = .white result.backgroundColor = UIColor(hex: 0x1F1F1F) result.layer.cornerRadius = 30 - result.alpha = 0.5 result.addTarget(self, action: #selector(operateCamera), for: UIControl.Event.touchUpInside) return result }() private lazy var operationPanel: UIStackView = { - let result = UIStackView(arrangedSubviews: [videoButton, switchAudioButton, switchCameraButton]) + let result = UIStackView(arrangedSubviews: [switchCameraButton, videoButton, switchAudioButton]) result.axis = .horizontal result.spacing = Values.veryLargeSpacing return result @@ -347,7 +347,8 @@ final class CallVC : UIViewController, VideoPreviewDelegate { if (call.isVideoEnabled) { localVideoView.isHidden = true cameraManager.stop() - videoButton.alpha = 0.5 + videoButton.tintColor = .white + videoButton.backgroundColor = UIColor(hex: 0x1F1F1F) switchCameraButton.isEnabled = false call.isVideoEnabled = false } else { @@ -361,7 +362,8 @@ final class CallVC : UIViewController, VideoPreviewDelegate { localVideoView.isHidden = false cameraManager.prepare() cameraManager.start() - videoButton.alpha = 1.0 + videoButton.tintColor = UIColor(hex: 0x1F1F1F) + videoButton.backgroundColor = .white switchCameraButton.isEnabled = true call.isVideoEnabled = true } diff --git a/Session/Meta/Images.xcassets/Session/AudioOff.imageset/Contents.json b/Session/Meta/Images.xcassets/Session/AudioOff.imageset/Contents.json index 710e3736b..f53aef847 100644 --- a/Session/Meta/Images.xcassets/Session/AudioOff.imageset/Contents.json +++ b/Session/Meta/Images.xcassets/Session/AudioOff.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "AudioOff.pdf", + "filename" : "audio_off_fill.pdf", "idiom" : "universal" } ], diff --git a/Session/Meta/Images.xcassets/Session/AudioOff.imageset/AudioOff.pdf b/Session/Meta/Images.xcassets/Session/AudioOff.imageset/audio_off_fill.pdf similarity index 59% rename from Session/Meta/Images.xcassets/Session/AudioOff.imageset/AudioOff.pdf rename to Session/Meta/Images.xcassets/Session/AudioOff.imageset/audio_off_fill.pdf index 93a3af9457845f16bb335274c93957b83fc36e17..4d054f40b101f93471ad135c9cc5aae7ba8ce2e2 100644 GIT binary patch delta 1732 zcmah~XHXM{0)`d^!jd5Y!ichDn3qYy2!R+GRRS{NLuS}RMi@dB8m0+L2x$>T#+k+g z5)cS!5kUk52`wNIB49y8pE4{OMu33Q>wACRo$u~_zrJsd)vCibSHpj*fuT zw3JA40w7a1q00HjzigBVJC21AXtA67k6q)69iy_2$I^1@Wbz;2DqLqp8RoqGpwmn( zf4`~nEmtYS#M6N1rZL9*J$7aPTPF7%Hnz&FH(=ufTc86T?5SqoqAjOkgPY#1ifC-c z!|%*}OD6cG5f1{;lT*~xTEd-!>XtpX`@12rEKEfVCsN;7t)AFjY=X zWm4bf{LVQ(Y5X#QTRpKoU-**)ZQ60v-d8}1u3w<1M_NDNQ!n(+O1HS22(~}5E9jbl z(GYVjgmR`c*iP&+-RXQ=c7(4x2$D-lFdm<`c+%mPQNgKDh`wb@mkB;1KUI7qXFWc_ zjYL_KsD1b_*&aThUFv1^hBf=J6Z;g>z-i zN7eOQFFnJ>$dV%MylNqKmCr_&*z(@Abo#JYX_(D`NtCL)Ge0}-t@{;~C!wZkoenKG zD{8k^HO}LM){BYqT8m3p!L5Eu>NP7SL5&R_s~Kig9G`aY5=0XgHBC(MFzLA9w@owL@ARd8Brlm#{QUN`oKEMVgn z?@j@qP*%!fnZ(@*m*BR$;inB$`aGwFPrqMPmOH2If!E8hb5`dc*P#HneB8I!-#u2tCvvTO%*y2qwtdOG@P$=`44!cwizgGlRtv7H#%iQ^5P}9;{oUl)G}*l0L{x z3e#%s>{Yzw)b@n2^ya+zM;!c_xD(eo&#AAqL9?|BGaeY}&g0^XZVF*=M%<~EfpYqG zx^_j0;=CoxH5da_N>V8)VYLNdZH=tLhVXo+qRJAFpKsh*aj;qHx)>Q?$V5#us7c&2 zK}QYl_4ALu5)WSY25RgOaeaZGkTv_G$Cf7bBR6LV5~M5KUdR3qoe{4q7@0ML)B#zm ze-y~X4ejOy2KJpYjaMOxZ9SSvnT9z?>ty~|Td2oqXnSiH0utDTnoahjo6FPBW15yv z&Z)Z+!S_hIi_$n}#&(=E+Y(HLX}>t4&*=~?P-M(pB=wk7YpcGLAzga$DI=%o(7^QP zP8KoB+&x%ITW0W>X8vJgCFdvn;bL;eV6N;8P?Wg`UW}2$>P>Fyn5DiEA0JBy_E$5! zulnY9EX!l1tmj7gRTK)q zxtaHtN#s|JxkbEvoKXmFvV7~s-ZO%GS<7C9A9Vw7-cNWVEs>70oiu>BP0Zc)i^0M*}w=6*y--~#Jd679^fckdnNUxzU z?u5Zd?*DWoKh${h|7UzmDL z_#~E|eGF1^90sw6^|f@lk}S{BR;X(qD8C#nIejV1?y>lbG}l`p>j20!D>>vD$rmZf z!kA4O4*@V33=T!1;7~L(QB(K7B|{SpL?Pi|=-&V*f&u>~P$Uw8X1>xi^|68fj|}>i z2eYw-ezk#uVZQck(9DZk4k2N11QZ63f<=(gVPqRJ3?2?cV{FkVC>a9}gTlfc0S^DS c0uK7mL6K9^GE*X>07x|47GP?6*3$*>7mubCSO5S3 delta 2071 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 skw_RkoDfbxV-RR-faU*1z$gFH*WrXiV=_^ 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 delta 1143 zcmZ3gu~2h@U6O^Vf}I^#aY<2XVlGz&qjm^Kh(^eTay_#U54|u0hQp6iSeb2&TYVO^ zC`LG34{*HhaqxtLqGk9&O_n1Jjb3M_pf#bjb3 zz;OAmi2cSj(LC&i&X%rbrf!q@cmtVCjW;LqRxrZF9`KbhnoJJo58$`7Fi_CmAvXw`3*UTFR-^WKdoz+-n+R`ch!i4A1rh%kE}g zFDko!_vW46MF%>po+`E!3I5`Dc@YvI8M0hYcFKnY@$Ofb6i-Th|GMv{p%+)x;qQN+ zegD0;^8LrN>8YRDwmq~GxpK_MmRbEsWZT`&jgKm)-)A@ybm_ul(R#kw8*NWEy>6HI zuIjt`!KceTSCe1fSXSS<^ZFI;yjmUO>p{CRLq1L2-E((l$+@DRlE?byOf@YDHVyjt zWhZx50C$Ga;l#D6D`psOnYLnH!M8ONH*E>q#=do$qw@4~>B(+>+?fI~N1GRaunJZE zZM@{r>3MbrwvYJhTZ7*IIKA3Eum05Zr~E6w_U@9;hzMz)sTH$Y=udC{witescQ;mS zmN(V0nj3SOkw3g^b-s(R@xxuFHtxKi_wE;YU}3lUk?WqA_u4SH>dAuP#@U=cVxPdZIGt=kHrim40C< z^<9%g5~u1%eD~4JH|(E&XJWHe=7D?uhp&V^tZ2Mm(ykU;Ci?gkbC2^q3BFlNGy|U~ z`Ts}>vD4hYx_;sNEpD%$a#XWsym;oh+wj4z&tIn8`xv!Q(mnFP9HC<}^LE#XyS_~q zS<2zHM#Ny@3XMmTUf)|5{Y~oQIs3m-t}bk$e+n+ttM7J^pQ|Ik%B8F76!#V{?LMOx zyHvqi3suSTy8V^$FBGHZ_N