From 7e67fb19393c360660ea2a98affe47d5603791b2 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 7 Sep 2016 22:23:04 -0400 Subject: [PATCH] Some style for the QR code scanner. Also made identity key scanner appear faster. Previously we were waiting for camera to initialize. Now we do this after the view has loaded - with a black background, the affect is preferable than lagging on the transition. // FREEBIE --- .../AppIcon.appiconset/Contents.json | 5 + Signal/Images.xcassets/Contents.json | 6 + .../devices-icon.imageset/Contents.json | 26 +++ .../devices-icon.imageset/ic_devices_ios.png | Bin 0 -> 1211 bytes .../ic_devices_ios@2x.png | Bin 0 -> 2522 bytes .../ic_devices_ios@3x.png | Bin 0 -> 4040 bytes Signal/Signal-Info.plist | 2 +- Signal/src/Storyboard/Storyboard.storyboard | 151 ++++++++++++++---- .../OWSLinkDeviceViewController.h | 2 +- .../OWSLinkDeviceViewController.m | 36 ++++- .../OWSQRCodeScanningViewController.h | 12 ++ .../OWSQRCodeScanningViewController.m | 27 +++- .../translations/en.lproj/Localizable.strings | Bin 34096 -> 34398 bytes 13 files changed, 226 insertions(+), 41 deletions(-) create mode 100644 Signal/Images.xcassets/Contents.json create mode 100644 Signal/Images.xcassets/devices-icon.imageset/Contents.json create mode 100644 Signal/Images.xcassets/devices-icon.imageset/ic_devices_ios.png create mode 100644 Signal/Images.xcassets/devices-icon.imageset/ic_devices_ios@2x.png create mode 100644 Signal/Images.xcassets/devices-icon.imageset/ic_devices_ios@3x.png diff --git a/Signal/Images.xcassets/AppIcon.appiconset/Contents.json b/Signal/Images.xcassets/AppIcon.appiconset/Contents.json index 52e5f9a4d..710c64c90 100644 --- a/Signal/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/Signal/Images.xcassets/AppIcon.appiconset/Contents.json @@ -77,6 +77,11 @@ "idiom" : "ipad", "filename" : "launch-icon-ipad@2x.png", "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "83.5x83.5", + "scale" : "2x" } ], "info" : { diff --git a/Signal/Images.xcassets/Contents.json b/Signal/Images.xcassets/Contents.json new file mode 100644 index 000000000..da4a164c9 --- /dev/null +++ b/Signal/Images.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/devices-icon.imageset/Contents.json b/Signal/Images.xcassets/devices-icon.imageset/Contents.json new file mode 100644 index 000000000..32a80e337 --- /dev/null +++ b/Signal/Images.xcassets/devices-icon.imageset/Contents.json @@ -0,0 +1,26 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "ic_devices_ios.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "ic_devices_ios@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "ic_devices_ios@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + }, + "properties" : { + "template-rendering-intent" : "template" + } +} \ No newline at end of file diff --git a/Signal/Images.xcassets/devices-icon.imageset/ic_devices_ios.png b/Signal/Images.xcassets/devices-icon.imageset/ic_devices_ios.png new file mode 100644 index 0000000000000000000000000000000000000000..d9509fd735ae6d80b07e90f6dec00762e33ecaf1 GIT binary patch literal 1211 zcmeAS@N?(olHy`uVBq!ia0vp^TYz{12OE%F_`y*KNJ*BsMwA5Sr0Cfe(LKC1Ggn{M9q!o{g z<;{xBI(_BctiPX3x9;T8bqyDKN(iu`pspTqaXwU4JFEoGnCzI;`i z^&ZF%`{*^jc0ONx)wR1o4*^3d*UHD2OYotZ<-5gaTHK=he*bD0l**kUB&A@&<`(<5 z^UH2KK`A2>hm3{`3=0{7A;Pe*v9@^2>-Y^Xv-BO>*sM7An&l+!lw5pa>yGxNa*Hp7 zKa!ia`XXm+=+&j0l+()mHpAIE`n`J7%9BP3^Th=>72lTn<@oBe%#(>H{#qzCL%^HSt1b!7Rv*R=f{Ih3q@o$g5tDZ~F+$jzE5$rpc zFaLC&)$-I&Cb9_=$_w-6|C;`|By?U#>yr~v-T!y+-`hVY;nR{bIm;*4ifW!$I9px_ zUUhQI$myXhZzZl>hAe_Xk_$I7Sad&>UkooX@pkj-P?#;DcY z@}6_OyV|$!d+%K<`*-bo38(4FU$#n0PnUlpn|Jc#2bs!5iw|D!s&z{yT0OeOlQaL# ziTJ(ZyF6qwbJ@1}zrSAh=gTp#1zRO=$lYvpT=Tc0NY{PBR>>E7h2IhavhCwy=7d-k zX>OC?x>f{<24-NoWOM?OWhW;p9uS);`^)*dk;xR9hDpp7KK~{-#D&LBUk?oDIXTl`FI)br_S1X4l?VQLJi7bsqo%v6Nrq<0KZdW< z`KI4ETKr(5U$aFAY^zVzE(>xL8kaf<&06BrE6 WO8Fo2UwIc)D0sU1xvXv!q3Nj3r z+=|x#5+#NkR89qx7*?(rMxqcvNK_)11SaU8b!xY2cWb+<>-G2btM7GJfAy*_9d~tv zD8Li|0088O)8UfCq4_X006d-j~upjj~kogUOmAXfu-X1<^o3)E6)FIJ65l;O8SiLuL{8Jp(mwY zD?B}&dJoaQz2?xxL##3+oFw0ZUUp;Wl;IsZT}?;>DhXyo<<*<#`R_(5e|D?yxk2Mx z(eC^~8hlE2c~lFz6kPNw#uB9sY^&4NxPuf9MwaDES1SzBUHS>$?NvWBAs1|ff2XhQ zWfoGn7e_^TUXN_TVN->>{rIXVs)pgsvfIazkaU|469(UmK?-=ht{+tu4zcfOo3SlH z4i?n$z_phM^C9Dl25HHL48xFiDy#x!8mwb^5De63AlNmPxfu9LZ64ar`pgIy2NFa1 zXvFd>mYuLQ>Pi>1_A*1rCvC&W!p&sstjET?C)~}a>v}^}pd7HdpJp7suX2fT zhKO!g747MS*i&n>f
WYLQVJ44sk*kB9P^il@wvVXDKOYmyqC= z>HkFjCi|WIca{Hz{Qpk=>&2qq)oKD(tAej*iYATqb7^qJ4?ZRQ$?WF);hy5|=JY3F ziz{n0J8Q&FC|)7N|BLe8*^K zgzFiJ>msH3G*I)J><{%*Ejhhr@Lu#g?x8>y7Q~%j%=1kcxQ?vpPARk!d{Pclo*rtb zvpCgC2l++kXC&*e5UkoTznR^=oR#pQap!&-d{hoXn~$~oaFnRiFZ^0$Y%z~H(pW#` z+Y5#T4JO)Adyq~Y6Hma+SLgTnUHQcIMx}vP@&58Mu<1Kz?GP**YjLl#yfMp7F2klm zN(Kg?fS_vScYz|0*L~}eL4UXp8WVRk=R7}_-(_o`-h~Bi_D!h|?EHjW z0#4F_QC}rTNsh|XiJf5khx1to7V7Il(UKK|>2)SirJg@@;s~A^fKxzfVUUB{CQ~x7 z7L;}WyOp}88CY$KYj_?ny0mB_!-yBU)YBNqns^>zrxIFi`Eslc&BNjbjUOOaUsHGJ z58+CZKd)(Jyrq?RcXWRVU9@;=gCC^1up_b4nI#_GJzvtZ0&SmoC1lz^0K1(&IVgW>c-w=I*Xw@$l zKa62otM6lXFBjH%VFxITo#6x2FmQ?r(KqZtS%DVj7j($mdYtm~ot;AWstX&W;jmgQ zUZ_}Jl$k?sxtVg`WVH5yza_Jl@4KqY0E(-xE*T}odp7wwmXi;>GaDVq#<-C}O`+XG~_Wm?YGpAC!}kO_+zE^$l~g(wvjynxp)tqw2@@Gq0CA?_v3* zC*x2&}E#pMui+;a@yOeWb9r=tV{9jB6lTEM9;0R3-MCP z^uD95r;4_G0su>S!%z_Pm)>VbT>`B}Y5hw*$`VruKpzk_;jU49p`bFfzNpEzLbY{) z+|Md~&YbamNe!$hEq)%Qp%Cv1C0F1xD0m(?wR9fIU`~S8sbLihO}`!hO*Fm7%+2;O zi3BvRUNt%*Tc#}2OUO0JVPv;em$XUw$gXBqV(qJj6+@G+pgZXlMu7(tEQdV2>Z2f- z3<(_k7|Rp(ob6JjFNl2MM7z(IG$&+<*N}?pJpw9vf&a0`k+{Y~^r9J2Bt5k`a~6?m z5KcBRIBm9s0?x-J-&>+ZI>^~<0OzHxD3(SmoJf#(`Qs_8H$RNr3c9QmI%2{yV;8*Y z++zp`eXnDhj*&5UOweOLR^){?%-ok2YqLqQfa1ojd`pnIqxtytt~&(I6Qx!M8n2WK z)0dFV72)b0f>EiO#hcrkRB0;H@R3V4jxkCJx1v1Mhbdyd69rcoG9-6jXPeQeO>_X}U*y4s+M3qWwc7Ltg}FG4J# zSxo$^Jgz$6(C4r3^1UDbdqXsEc%%s!V;R4|eE#qg^t+s7Jsg^IwOp~w*iCrt166&~-J&D8JW(tH* z6Bh{O2o3j=2Jur_7_|8d=0%t6rW<)bnw$Q^lKXN2E^ln$z9EzZlgjnIgfrD@q4kyOaS*#bMv@E)I5f%U!?bZX`E9pvbkQ4vvLeljDw zO`yd95STai9BZ(uSxKmCAwNj=Po?il8YWhCOr<4P`@Y2~`SKqnv1~Y$ta{D%&u?zM zb{DtdQsxxRw+2;YI{CRPeIc#H;$tvOxVDUU0Wa!Q3>meiUhGiv)>`7OdTe6(WVQn@ zydTc*NFk1POGWE3=I*MKV&PeF&?z&9HD=%}2oi0Xo7J#DRC(s{iYqp6e%ObzidV;@ yf-166vzfCKAjez^<9B}i%3Dtj?GFV2X+S3$8A+NBo80^|9kF*keE%ox`9A@u>|SF4 literal 0 HcmV?d00001 diff --git a/Signal/Images.xcassets/devices-icon.imageset/ic_devices_ios@3x.png b/Signal/Images.xcassets/devices-icon.imageset/ic_devices_ios@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..c2cef2ebcf0f829db4b2fb6c20aa2a445c699db6 GIT binary patch literal 4040 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 literal 0 HcmV?d00001 diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist index c5f1ab30c..381959b4e 100644 --- a/Signal/Signal-Info.plist +++ b/Signal/Signal-Info.plist @@ -38,7 +38,7 @@ CFBundleVersion - 2.5.0.4 + 2.5.0.5 ITSAppUsesNonExemptEncryption LOGS_EMAIL diff --git a/Signal/src/Storyboard/Storyboard.storyboard b/Signal/src/Storyboard/Storyboard.storyboard index 398d17829..05dd1dd93 100644 --- a/Signal/src/Storyboard/Storyboard.storyboard +++ b/Signal/src/Storyboard/Storyboard.storyboard @@ -3,6 +3,7 @@ + @@ -365,7 +366,7 @@ A0 09 9A FF A8 8A 09 99 - + @@ -380,7 +381,7 @@ A0 09 9A FF A8 8A 09 99 - + @@ -453,7 +454,7 @@ A0 09 9A FF A8 8A 09 99 - + @@ -481,7 +482,7 @@ A0 09 9A FF A8 8A 09 99 - + @@ -495,7 +496,7 @@ A0 09 9A FF A8 8A 09 99 - + @@ -745,7 +746,7 @@ A0 09 9A FF A8 8A 09 99 - +