From b573955650b2fedb022d8192ef6796aeb1fb21e7 Mon Sep 17 00:00:00 2001 From: phongphan Date: Thu, 19 Oct 2017 00:01:19 +0700 Subject: [PATCH 1/5] Use new workaround to hide Info button when building with iOS 11 SDK or higher. --- ios/AlmaZBarReaderViewController.m | 21 +++++++++++++++++++++ ios/CsZBar.m | 2 ++ 2 files changed, 23 insertions(+) diff --git a/ios/AlmaZBarReaderViewController.m b/ios/AlmaZBarReaderViewController.m index 0f8abf1..906154e 100644 --- a/ios/AlmaZBarReaderViewController.m +++ b/ios/AlmaZBarReaderViewController.m @@ -76,4 +76,25 @@ - (void) didRotateFromInterfaceOrientation:(UIInterfaceOrientation) fromInterfac } } +- (void) viewWillAppear:(BOOL)animated { + [super viewWillAppear:animated]; + + UIToolbar* toolbar = [[controls subviews] firstObject]; + if (![toolbar isKindOfClass:UIToolbar.class]) + return; + +#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 + // HACK to hide the Info button + for (UIBarButtonItem* item in [toolbar items]) { + UIButton* button = [item customView]; + if ([button isKindOfClass:UIButton.class]) { + UIButtonType buttonType = [button buttonType]; + if (buttonType == UIButtonTypeInfoDark || buttonType == UIButtonTypeInfoLight) { + [button setHidden:YES]; + } + } + } +#endif +} + @end diff --git a/ios/CsZBar.m b/ios/CsZBar.m index 45a15ab..9f91e41 100644 --- a/ios/CsZBar.m +++ b/ios/CsZBar.m @@ -71,6 +71,7 @@ - (void)scan: (CDVInvokedUrlCommand*)command; self.scanReader.cameraFlashMode = UIImagePickerControllerCameraFlashModeAuto; } +#if __IPHONE_OS_VERSION_MAX_ALLOWED < 110000 // Hack to hide the bottom bar's Info button... originally based on http://stackoverflow.com/a/16353530 NSInteger infoButtonIndex; if ([[[UIDevice currentDevice] systemVersion] compare:@"10.0" options:NSNumericSearch] != NSOrderedAscending) { @@ -80,6 +81,7 @@ - (void)scan: (CDVInvokedUrlCommand*)command; } UIView *infoButton = [[[[[self.scanReader.view.subviews objectAtIndex:2] subviews] objectAtIndex:0] subviews] objectAtIndex:infoButtonIndex]; [infoButton setHidden:YES]; +#endif //UIButton *button = [UIButton buttonWithType:UIButtonTypeSystem]; [button setTitle:@"Press Me" forState:UIControlStateNormal]; [button sizeToFit]; [self.view addSubview:button]; CGRect screenRect = [[UIScreen mainScreen] bounds]; From 0c75d9ef8e3f87f6f312dbe6f0ce374e7c8b7773 Mon Sep 17 00:00:00 2001 From: phongphan Date: Sun, 29 Oct 2017 22:37:03 +0700 Subject: [PATCH 2/5] Ensure camera is open when changing its orientation --- android/ZBarScannerActivity.java | 63 +++++++++++++------------------- 1 file changed, 25 insertions(+), 38 deletions(-) diff --git a/android/ZBarScannerActivity.java b/android/ZBarScannerActivity.java index 9f23fa2..ec3bbf6 100644 --- a/android/ZBarScannerActivity.java +++ b/android/ZBarScannerActivity.java @@ -15,6 +15,7 @@ import android.hardware.Camera.Parameters; import android.hardware.Camera.PreviewCallback; import android.hardware.Camera.AutoFocusCallback; +import android.nfc.Tag; import android.os.Bundle; import android.os.Handler; import android.support.v4.app.ActivityCompat; @@ -201,19 +202,7 @@ public void onResume () super.onResume(); try { - if(whichCamera.equals("front")) { - int numCams = Camera.getNumberOfCameras(); - CameraInfo cameraInfo = new CameraInfo(); - for(int i=0; i Date: Fri, 26 Jan 2018 09:47:21 +0800 Subject: [PATCH 3/5] change Android camera_flash.png, change IOS 'Flash' text to torch.png --- android/res/drawable-hdpi/camera_flash.png | Bin 0 -> 1715 bytes android/res/drawable-ldpi/camera_flash.png | Bin 0 -> 850 bytes android/res/drawable-mdpi/camera_flash.png | Bin 0 -> 1020 bytes android/res/drawable-xhdpi/camera_flash.png | Bin 0 -> 2161 bytes android/res/drawable-xxhdpi/camera_flash.png | Bin 0 -> 2161 bytes android/res/drawable/camera_flash.png | Bin 1065 -> 2161 bytes ios/CsZBar.m | 14 +++++++++++++- ios/ZBar.bundle/torch.png | Bin 0 -> 878 bytes ios/ZBar.bundle/torch@2x.png | Bin 0 -> 1217 bytes ios/ZBar.bundle/torch@3x.png | Bin 0 -> 1524 bytes plugin.xml | 11 ++++++----- 11 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 android/res/drawable-hdpi/camera_flash.png create mode 100644 android/res/drawable-ldpi/camera_flash.png create mode 100755 android/res/drawable-mdpi/camera_flash.png create mode 100755 android/res/drawable-xhdpi/camera_flash.png create mode 100755 android/res/drawable-xxhdpi/camera_flash.png mode change 100644 => 100755 android/res/drawable/camera_flash.png create mode 100644 ios/ZBar.bundle/torch.png create mode 100644 ios/ZBar.bundle/torch@2x.png create mode 100644 ios/ZBar.bundle/torch@3x.png diff --git a/android/res/drawable-hdpi/camera_flash.png b/android/res/drawable-hdpi/camera_flash.png new file mode 100644 index 0000000000000000000000000000000000000000..8ac6773d767e23bfe4c0bc52a3c6772624f54d1d GIT binary patch literal 1715 zcmV;k22A;hP)MOQ^7<9#YBu&>I;ho zYoJmqqOr;WaWCXVYt)aS1}66Aq%nLPeKKSn;iD2}(V?hnyau2sD5mhX?NmonQ~x&9w3V^*dZodAtG&9m<)eTwCY&`GV>U zUlL9gDd(1gE{6x*0;<4mpui!|0zOy8*Q#~|EK%;66jaR#S|DORxLO>K1{;)zBB54+ zYdqvn_pElPg|Bj1vKh}0>bcVOdd&q*%7Zk5iv!4;YUm~ zblzTwa^ALWS89^60=+4mJ`U!kaUgg*I3dd0Xu3d;Dm7{6pAQX{tb1D8J@{ z5T_ImD7E%-69tm5;@36IyWSAxzZF!zex@4IW`ZV8cY!H9RS47a!S_6mvv)~8HDx{M z5s|LZAP(69@Vq!)5=5p!)F9gAYvoz^Q81YozH}J*vKQonKR_|~U3U$d&Ek+XY81!f z)yR#UK97CV-o$2z^oItllFGHJ8*~dajF(Btj&W1dZQp`kP8YL}+61D7ugf_7Gw3it zpbqxMV&BI4tpTc0e{xHLdp-t#a(WaP$7$*m`wS4Mmwh1{4@QfQx=7S`)q223;GaYS zO$Secc?lfY4rXyiIbsjX1aYKD_VeX%nt~&~;LbaqRfDxWWN>U^W2{r7ES!w0ZN%Yz zlOnO4e928B4jDz2oRz2sz0V8d_b13?1Lzlv>jNy*2!jN&cSNX`|HWwG$C|u0?*6H_Op-LUh_1y zXcv>k$p#2CNeI-=K589F@8o~!ZFZdj0$nTKtY4cj)oA99+T!6sM05W$htmV>n|6VA z@bKQ^0p@hgwPzNmY1;Fp2?G5MUK7WUYZPdOsKJfwoA&h}dugGK=RGn06`Mj9hx)(I zx&NW55Upw+GNA_9^RU&TA6TWK_SA^Zc})=F435czTQtw(2n^e*LtL=066Nj#V@%x_ zo2_gKmxmzET}qjAP2X94MhR9ZPNO&!&2dPSw`M48JyRUuRweN1!ZegKkzRh*jvj)`-%0hCuO@;l09*yl+2OC7kcRfz0AeV2EXz$E7>}*$i;nyU>7f*({~wXNR`FAh`r>{8pVZP+zPKIl@g zl6P|H)2KU>YzhA_1d_Y2i@63uajv7cTR%4|nt1LH-BUyU06-Zp zy2}OlG823oW|?8sK~q#)J`W~aEHh%RwKcIJW0^m&l*IlOU;vg07_tOC(tH2_002ov JPDHLkV1in@BEkRw literal 0 HcmV?d00001 diff --git a/android/res/drawable-ldpi/camera_flash.png b/android/res/drawable-ldpi/camera_flash.png new file mode 100644 index 0000000000000000000000000000000000000000..a4e1536c88924b694cd289339ae24ab2a2fd07c2 GIT binary patch literal 850 zcmV-Y1FigtP)I%q^kGcX`a08@Vbb^wm&uk?f(|ccBv=O?1bst7E0_jFP{+O+FaW+-m7B==L4r17`yG_%v*MV3UULUH%jeY~$3bs` z9>zfL3v7O5hC% ze3l6p!8;90_8we_nq|^Xg9R*8qm;M};Eb1|>7&S(%*%ssU`5D)p0dnMgYmEhno2jb z;c$qhI!N0tooAVF%(fl)VJmG;=sfM^K;6fh<{AfR^I?~vu9U1Xu;0(&?B%otd}8Tg zFsM8$zeX3kM(T`$D)vd``4KdS4Jge5tHjxw>`!s#LoT+bsFPAAlA*6L`gXK+y9RBN zEM$Q{qVzupgWwQYN}a#*1ayJ})Ghbjqp$Pyoe!G!wY&fp9b}uqCCa93vIK7-Tfk)p zTaitJiJ%w736H(W;AZEvuUNLqL2bpExVe_?_JUzBq{x2#i>tJ$%vN^c+ls6OG&_7- zGaAriFbQ^o49Ky69+=PN&gs6}d$A3?a=5h?c+`aQYexJ9ElmdbAs=C?=fgTQHT|Tg ct^F2Y0OIy>w~%24qW}N^07*qoM6N<$f@|}SQ2+n{ literal 0 HcmV?d00001 diff --git a/android/res/drawable-mdpi/camera_flash.png b/android/res/drawable-mdpi/camera_flash.png new file mode 100755 index 0000000000000000000000000000000000000000..a406526139aa4ef792896622fd8b0495397141da GIT binary patch literal 1020 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 literal 0 HcmV?d00001 diff --git a/android/res/drawable-xxhdpi/camera_flash.png b/android/res/drawable-xxhdpi/camera_flash.png new file mode 100755 index 0000000000000000000000000000000000000000..15bc44b1e582411a7298fe1f212db7b1cbf4413d GIT binary patch literal 2161 zcmV-%2#)uOP)DM1yFirLJ+(~8 zGAO%3AByN62o`+_qN_wwbiZebMpx(p+0E!iMP`|$d8sTK+V|O6-^3P$CSf>Al7U{nq%7?nc`M&*!#F%TTGB=P^np+r=~0H*=V;(w=x z)>9aOPGANw2RJ6Q9^U}tfO)_jz}BJlqyTPC%qjf?oDo`+FM#o}js4seT2l((5o-Ad z7#~`fYk&zrkFxcp(7I9pM*+P`Xb&(Uv^G~{IHMOh&Q%#sXGVd^BJ!AsbR-VCrL_Ut9s4r*v6Gh}H z5gD8~+$SPaq9}SMPu^Yu&dz8lO}{(>I)KxG7lAHXrwf>k>5+BRFFB>-%#4;XsoA`O z08Gl`6kvPcCQMh>HOqh-f$bX9Vsl0ha8|xrYBRuD7DKv#EjMz_P~bN5wT4Dn1KbJ> z-H4t};4gJu`JB-YX{Yo7+hm+O9#~SR5?2Aw0#^cKflfb2fg!r82fM4t6xfnP- zL({gg=A<*u^jmA50Vc-3vR>di%ilYJ`!`ZyzXSIHV}PcodVoQ|k-*G2uPkO_X}!P= zu~WJjC_Tow(zmi4-xc^Qqk?|M{K_+LDJ|&O3b=~wXVa&^$c*bcUFj$!zyTQ*(+yk; z46dI`%Vl>0)8n!<%YXxXm0d`H(ZEtmWqb)7*hU=(0bf~kECoilOGi+EU4ZW`mGEeY z+X65Ic-*3Ak?r<1pa8av@6(#Qfne*YFc1EFExJAdwg{!mJHR~_qwfi=s~=2nPIG5y zU0wiAu^9UVEp%ml5x115mBtOgiJ`SQ1=xmkkE)QjgN)ni5-i>J(t?=|NwSUtcP%l! zFFoxuBeX6j03%5E_os)}RS)16rTK4Q$I!ZRgL%)MU6^dgUC z`9^CW<*T4fhhSE9>m@KY7GYntF-)cZa4Ws7tX64ln~VC&1~|BZjFY5#P}Hst2iUy1 zIw%gn7Rr`x_4nNM)lXInY4+{iAOgPe3xKxOe|-VBlU@#LV;PnvNP5a)hbBcA24F{J z%L>amx$3JOMtrA)?9p}+jsW&jwk-5jmd{?6eh}{Lu`J(c?b1 z(t2Ft44)49N~OIGrrLnku5ELMPltS|(noqM%Qr`;w6?AI09#W#7FiGM6k1oa#67I_ z2|If5xDDD{3yGp=jfl)wWsUV!o=1+C+IpHF+vWw|FIwiR^fb@q`QQSTo)<)g3ouK7 zlIxo`0N$pqT@#N#HYD`-0(#Q4T##Ox`E+PajRHKRv_BtOQ*MA`l~L3D&b3*HK4ltbbl>Fy7++~{=%!{ZGl*ZM-h|t=+0Gw~R70e2)s~_M_i@r-k>+%X_ zbEoFw0_Zx&qO1Jf+g7%T)!e1=>C%j0xHC zx6-nT62IYW3E*hbJFAuhd$v)-o}_zJJq(lqpbg+u;78yG)ZPkUGPQF>0AIJ`R)L8e z^o=Te129#cHwm-ieGzbqZ(Uv?9iC~i<(z9s^9Funoeajz7HFI!v zA2ZIiZP2D69i`*-}a8dC)f1QqEjpvyAg?kx0wq z6wKhSPZ`inooEP{kV)^W>;Ayu`v**Xu0K^7^Qp7%5jc@_2c!@6yeS-*hjh!ad*cdQ zsjh#}p}vPz-YXk*I3_ZlEi&oZuJkztI3tfU68Vf*d8`A5JJ2`MQlU*P=_EUla{HHt z)&p3egti=N9C%&jmHS;haH-1k)fV%yIpxE=`kVv2rkv4oFn&zHW8btqrXU@R|CLtr z@&>R^?3DTB3}=KHwE1S+oElG#ZG8>cJ5OFo3i}!rYQNy=nxcLYw0s-j2RKa!rVmBl zU$pNQ=ZdO@6pYFt1*39E!6=PGQ2V=qtEvCxgZ~Jrz4TzFIc)qC|9u3tdp4RTw2fI5 zwT1L%9Pi)XjTCqcm4`w)B#NR{mcze@$YoI!5k=8*5xGW0{%o(ZO&HRjJ=!HlUZYfA zg>_^hTS&|oDm{}HzE%)lbDui=dCRIcRe;O$Jhba@Noe~@2WH{3?b8-{SwNX%?}h}^ z{nanN^6(J@btQYdz^tLV1o)8j`rAfWhuLCq5mn3Z1E%GCT(yJ(fmzEn4R{;VMef4v nWxS9UzIR(uQBhG*QFi_XuViPh8U62o00000NkvXXu0mjfzfJj^ literal 0 HcmV?d00001 diff --git a/android/res/drawable/camera_flash.png b/android/res/drawable/camera_flash.png old mode 100644 new mode 100755 index b6cf70869974d248d26b930676a9b1b7ea855568..15bc44b1e582411a7298fe1f212db7b1cbf4413d GIT binary patch literal 2161 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 literal 1065 zcmV+^1lIeBP)gmVtJ$NJEQk3zLjqe5jX*is+#i(I^N+$R4^tV$y|F z#7b>Z+gdCCC;JV25B@yt{(YeH#7bA$D)E^(7@__?aV;ZfF9AEmu-LB38pTD} zsLC&i3*t6L&RzoQRj_-+5^+?OjiIbhmDMqF$pw3j8FE}@0To!|9A4jw!>%&Nc2^tu zrfo(zegamDpT+0mb+JmkjiBCB0XNn{=d=0SUA(`AV@(@_Xmd3q>@5ksu5YvBaa@oe zijP!%GxR(VbH$TUj_qY+y(gdzL7Tz1*9qcoJ*4Pal6qgE>VHHV=6xF@>pcNm5wuAR zNt?x1vCzY@MX0+8*AtU~-= z>-tS7J190g(^w>66bWt4#2{B=dm(^e2V&T-0@@X)ZUA+h`u#ELy~CO2e6G%v;CCc3 zp8qc|XTnC?d2gT+nJgGGpo58 zYXyrLQVFD6QK&8cg_c8&AC!ok; zzs0KEKTLo(b1n9p>skpUGaR9%T$&PZdtw$X{eWY~)3M}0`H$&75@v-;>Lrut1+v$5h07;lg z;in?TveF%_N@r3q_~w7A&B_F@IaYz+^ZK<4`e~ygnfuO!5JCtcgb+dqA%qY@2qA screenHeight ?screenWidth:screenHeight), 44.0); toolbarViewFlash.barStyle = UIBarStyleBlackOpaque; - UIBarButtonItem *buttonFlash = [[UIBarButtonItem alloc] initWithTitle:@"Flash" style:UIBarButtonItemStyleDone target:self action:@selector(toggleflash)]; +// UIBarButtonItem *buttonFlash = [[UIBarButtonItem alloc] initWithTitle:@"Flash" style:UIBarButtonItemStyleDone target:self action:@selector(toggleflash)]; + + NSURL *bundleURL = [[NSBundle mainBundle] URLForResource:@"ZBar" withExtension:@"bundle"]; + NSBundle *bundle = [NSBundle bundleWithURL:bundleURL]; + NSString *imagePath = [bundle pathForResource:@"torch" ofType:@"png"]; + UIImage *image = [UIImage imageWithContentsOfFile:imagePath]; + + UIBarButtonItem *buttonFlash = [[UIBarButtonItem alloc] + initWithImage:image + style:UIBarButtonItemStylePlain + target:(id)self + action:@selector(toggleflash)]; + NSArray *buttons = [NSArray arrayWithObjects: buttonFlash, nil]; [toolbarViewFlash setItems:buttons animated:NO]; [self.scanReader.view addSubview:toolbarViewFlash]; diff --git a/ios/ZBar.bundle/torch.png b/ios/ZBar.bundle/torch.png new file mode 100644 index 0000000000000000000000000000000000000000..42b6d879c2f727db05b33808541d71f7cd13d2ca GIT binary patch literal 878 zcmc&xYfn-E0KMj8;cLyxmY;OBwV5AmxmK-}IyGNorl_>c0g0w)n31W|Qu8rfAJRD` ze5Il(mN`(vqKAr=M%t3n1i^cGsk|Q-0pSw;iq3Y<+4**M4mAyZHNZE-7XW~Oq{O&% zw+H{@K~J}uin>v5J5GtmQZmT-ln3}SA`p{DCJ;lDO7I25bRs^l^6nz>5&(GArln%y zvwB25d`;U|HEee}5trSG46JAyKdS^gdvv~rI1U!FWs7q79!Ifl-tYRZft^S-ciZMb zNR#rCDft)3dU&68T?$eq|Su(D~^zxU1 z_)6+PT-afW)q%{4;i*5yLYAz5L51#H;|LA-ULm<-12WiU2ILkKocL{^OU%9B)MlHL zA<(5gTPyme;YlnE|NJ2T4?8`^(h8+Y?p3bIC zs?=zo{2V$}RycP7@bCdFe)BDz S0sgPt8vsf1=(zD%T>W2a{X0JZ literal 0 HcmV?d00001 diff --git a/ios/ZBar.bundle/torch@2x.png b/ios/ZBar.bundle/torch@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..fe6ab42b297d3b619fecedd813c362d45b3575b6 GIT binary patch literal 1217 zcmc(d`&ZHj0L8yOY|b;cxtgwYW@bB9nw5(9DoKgZatgNPR#Qswm=@DRIZgAOO>@~P zm9g-op42j*IixR6BNyehEn53-qF>D9`Y{`!~ z8wc-R*zhAR1eY@f8=DNFws=4s-@-GPz@#og4s{h?x467+D5R`VIjZlTaYy-@%HcIK zL$1`DvtFr9O^@*b&?BQsRdrI8Iwn07u}swXjI zCm#PZCeV_`Wf~APgO-_9oga}yTUOs2mOx1#AVfB-cJa=z_(rcNrAxq+=+RHPGK~q< zygbNN`c|`ZXdIb8xfY!{#i2|GQN?}^!7hZzB2olkgS zSljf>by%i1IWjrhlD*UOfJe>N^(GEo_mIlzqdV9-{T7%;qTy81?NCH?{uuJ-BLQ3F z1h70+-gQW_(Yynjd9KL$=3UJ?got~XqDAZ-Se&YMXfz~7X2C;o72AedJ6|hlai1T; z^>+?A`z z{MkgpmGGc|+Sk^5oWI}Kp99-ZO{}L5?!0AuF7|e9`pM2)c0At8A{R^C%RCRypN-o> zE1OZV(kWgq+)+Ei4qgaR&^zy6Eb4L2K2Dj!e%pMtt!UeuX^f4kpyaS$LvMKeT)o!- zIyAajbfyH)Sb86S#K)t9XaxB!j!i9em$#C?1WuNYK98}E*psFC=kck8%F@c%lTK;q zqpjI3P4+~Y``zJ$dB=kKnex9U z2^Pn%zlZd^vUP&k<9KoHc%S9mMrS&z>yM-8z|%#;+0QaD1$h`laNdpSRUcCRM5Lb= zV#gQz^IjzvQa^$Q;)IJXC9{R<>&Uh0V|&__a0282!sczoP;Bi1+{KKJ9D;{qI2Bdw zv9T}xp6~Ff7f~}onB5XU`PdcB+iL`G^_gfftZ)eCHq0@VE z=`h>oFLM0nMf}t{?8BS|ibz=%MK{p;>HM`#iC-lJQAaK8WGr#TUgeaOR)!gNrfZ(( zRZ0%1S@^NQ8)t43*+MXG)(kyug(A||MJ0Xg5r&|mkNu*HC6;U#53u40^owuCDt>V+ zFw+qY^d71pr-PZ*zD(hW#+EkuB1z5o+P7KmeF7t>j{cp(>!NVYUy;mSO%)HXB)2TO zm(AI{neLq9B{wsyUXz9w1!X^1&toTrTiZ8l7I-2FZC%9J5Oal+><;D#Lrh&0@r4qO zKvG0nkH*t3qDHS(Q-hirJ|7n+Rs<$R6A;`Cae1>*u!U}4Ifo@BHPL6-Th?z#CKdB- zG``*YdCZbvh$AvbPYo>z;<}jyJsVu{_NI87#oOwf=XO*0UGsu)Jk1_Y!;i0-qo<`( z>ES_V_Re6bNDt_ho%(+Ya9-Xu6abKY00!B4CJ{;KFdw4rfeeI)f}Xt0e)o<)fsW}O zivA9r#DUC7;xNk8}YV`ycpQ+UxB=o$MJ^X3uT1x% z6vmie@C}R8|18jx%Jrh|T>_`QK;|i>z3lgTUK10isY{@G`n%>ze1fFOO=?WPd}M|T zXRfU^`d5nOJ_>F>$S~jQM#7=OdwvxLRKq@!2&p8Dr~dACMK*j+FeWOJ?NWxx@jBz{Pv1=+n{<@)o_5$7umST z4nyrJW%npd0%Ff*;8n7bhBNExt*WK9VxZv&lPd2&JKa(qm&R?@M`FUHdz$Jr6Fr>kb9-0`QMW7$OshZo*<^bTuxhTe zZ)ia>{h_l5LCr=qJ;T~DmWpLqRQ|XH5VBGD$@&ZU=4N+XWI9JpoCg+PE$7+&EI*5@Fcd!6yhQ({dYq=w4kFguMm|9d%RiAz@19oAP%-5qG3c@ElIQJ|0P{jKlIGjk@w7N# zbiE;PWi_hhrCG1O!r+8ry9z4kCC~`$AQToMTD5}$b6Vba6PZ)8IBXkch|6lkO%H0C zK6M^;X^hRyI9<-Y^GP9 - - - - - + + + + + @@ -108,6 +108,7 @@ + From b2b5f5c6ce0040a86c6fa8dcda2789bfc7d90552 Mon Sep 17 00:00:00 2001 From: wux Date: Fri, 26 Jan 2018 16:05:15 +0800 Subject: [PATCH 4/5] modify camera_flash.png size, moidfy button and bar display. --- android/res/drawable-hdpi/camera_flash.png | Bin 1715 -> 1988 bytes android/res/drawable-ldpi/camera_flash.png | Bin 850 -> 628 bytes android/res/drawable-mdpi/camera_flash.png | Bin 1020 -> 719 bytes android/res/drawable-xhdpi/camera_flash.png | Bin 2161 -> 2794 bytes android/res/drawable-xxhdpi/camera_flash.png | Bin 2161 -> 3744 bytes android/res/drawable/camera_flash.png | Bin 2161 -> 1020 bytes android/res/layout/cszbarscanner.xml | 27 +++++++++---------- 7 files changed, 12 insertions(+), 15 deletions(-) diff --git a/android/res/drawable-hdpi/camera_flash.png b/android/res/drawable-hdpi/camera_flash.png index 8ac6773d767e23bfe4c0bc52a3c6772624f54d1d..01a2fa8bb3b925dc77695f64ff5721795c16414e 100644 GIT binary patch delta 1973 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 diff --git a/android/res/drawable-ldpi/camera_flash.png b/android/res/drawable-ldpi/camera_flash.png index a4e1536c88924b694cd289339ae24ab2a2fd07c2..ccd0755b8c904da02bd5a5c4fdf168629e947f0b 100644 GIT binary patch delta 601 zcmV-f0;c`a2J{3WiBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_>mzfe-=qZ zK~#9!q}ESJltCEB@!fVeEq7b`Lv#sNDNsyBR3Z^-lRX&Tia-=Pco95!lIRwC&`XG5 z(50a69ZJ!IhbZVD7Dg&q)TzW4A@LttA=`K2x3Ipx@4NHTzz3F@cjlRQ=Xqu~l*{Ep z0n}j>M{VaE2nA~=aSmf2R}ofUL_uq? zhzwE%b4oFUd;8Y(IGk=QB7s^=;2WOl^J^?&499Q@U(w`T%P#|}(1|Y?Mk68`D?&n07q0SKhdkV*~XgRrDp1&!txAEI=?~O_OhG9XY^U@-c)-Jo?vs|sL!q{RjuhF zyT6IID!xF4b{4((q@r_sf99Gh{R+<528iftm_rf+_@JtFR{FB8jC%Y~z&-2zo8)Nc z@eo~jr)+wPUzpczX}n9UHXn=9CvU*IsYAT$8%Zd#HeMZZXm72+w}$&>i2J!g=7x&FS&kHvbqQ#*!;V2 nJ7ljG(*ZVMQs+{%{S{yUVcmLt2kZ(Q00000NkvXXu0mjf<(L&L delta 825 zcmV-91IGOH1kwf}iBL{Q4GJ0x0000DNk~Le0000a0000a2nGNE0O0_bn2{kUfAmR2 zK~#9!%$Uz_Oi>ia-_w~+8)UQ=B~@Bx2#H9#7;P*dY+c^hu>Nnh{zanF7CoqNw6)3Pi> zLpus$peL%Mn4za_(B(^4Ky!ihe?J9OrOA)BfF9}!$dHe^0$Feaq+E1@lBUmWB^}cx z%UZ!L@ENp$f`iUR>doQ*MQ|TnchFq|?t&y(2Ob1{LqaQ<21QWEz8Ww9zF3u;$ofHo zHe&l7l<2eKn0{V!2RO^;)gZ?~Z-O4M93+W6_fjV932jXJX!jZ~$ohA1e~>ZI=|g`# zcuAXfzvK7~W-%BCuR%kANr>)SE?1MzfUa_;%R*+Bv@5y-T1$t05z>8tJ~BE2IteC0 zJVHR#Uby`k8b+(JUS9!5tyyWMnN1b)O0jF0y{WX4QNti zU;k{pd{t{e!M3?=r%c)|e+|dRZu*kvJ+`ri%X;NE^a5l-of7p3sONKB!yBsR-+C_J zGe!2nzGQL+-EnY|q->>zfL3v7O5hC%e3l6p!8;90_8we_nq|^Xg9R*8qm;M};Eb1| z>7&S(%*%ssU`5D)p0dnMgYmEhno2jb;c$qhI!N0tooAVF%(fl)e_<K)sCX%7AG5U72b-M;_k}PC_Kce(M2ZP`cSW2D0@&t5(1Jo_|-J`Gb z^qmiy_O-kK79C`pf59cnrfjkVZy{U2Wd~c4O@oP`7sUyWy~*Ha=d`a_w#q?m#hJLd zmhJX}VKAh~e*KH9w5iNicH!HKtOYbXd|NXb&|@$Oc7hDZv40+z&*jePzT11T4ZL!= zwHA2Pgz{@f`~@vd2KgZ$VXEiDIy5!?q^GU@7GMD4_Hnn64`BtP00000NkvXXu0mjf D=>~|5 diff --git a/android/res/drawable-mdpi/camera_flash.png b/android/res/drawable-mdpi/camera_flash.png index a406526139aa4ef792896622fd8b0495397141da..8cf5bf8ff7c82a4408b0e0a494f76edaf52fb918 100755 GIT binary patch literal 719 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 diff --git a/android/res/drawable-xxhdpi/camera_flash.png b/android/res/drawable-xxhdpi/camera_flash.png index 15bc44b1e582411a7298fe1f212db7b1cbf4413d..f4cd8771b01bb6d35e6ae4d2b14e3a88a03b0364 100755 GIT binary patch literal 3744 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 KMNUMnLSTY$?+6nB literal 2161 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 diff --git a/android/res/drawable/camera_flash.png b/android/res/drawable/camera_flash.png index 15bc44b1e582411a7298fe1f212db7b1cbf4413d..a406526139aa4ef792896622fd8b0495397141da 100755 GIT binary patch delta 975 zcmV;=12FvY5c~%riBL{Q4GJ0x0000DNk~Le0000o0000o2nGNE03JVxv5_Gf3k}x* z01ejxLMWSfkwzzf19?eAK~!jg?U~I>6;T+*XEe1BbCXx1Hra{!@IZ4aXrq%B1l%t}n-#en!IX-GzbQC2FVaS^o<@x33k)ml=Qw%|>D$Sio{= zd@zZBGhHM8+Nd&&Gl9=NY7%6cNWa=$hH)nFx%;z@$_03@?EvWnH3p@zJ1GqZC=RTX z%?a>t5%&a85*?A7Sd+x=VEHW-xGnA@HhIIu7URA70vxo++aS)@z#?0`QKAPV`VClb zfp0DFMVyT`Jer7~lkf;x%0n@D%J@@iI&af|V_X9zcwch>cY%eo;3&qcU;^~#^OCBN z`K$Ur1&qqbC6mRE_mOr{v9Ev?>hHn(luo7`#PkB)y+D5ze+m)J27Jwm`3zJC`tPgX zeu0jNk}0qq_^!Xm#Sd%%erSAc#DM1yFirLJ+(~8 zGAO%3AByN62o`+_qN_wwbiZebMpx(p+0E!iMP`|$d8sTK+V|O6-^Kt(N;LkdRakb+S;q+nDIDHxSQ3P$CSf-w*rvLx~U#i2x0!~mxO%i@2h zhSpOUfKFfrFb6m$v>x98j-se9XZaIF zXFV0+*uOjp)5%YYk!?Hbf#b4CwvR=!$lGr(CEL%M)1H*(ET;5PELhDKQf z+zJfch@MX1FLhn{oY44FR{_rgR{~>!QNVWU-zeaO_?+i}U+d(# z7&twDL({gg=A<*u^jmA50Vc-3vR>di%ilYJ`!`ZyzXSIHV}PcodVoQ|k-*G2uPkO_ zX}!P=u~WJjC_Tow(zmi4-xc^Qqk?|M{K_+LDJ|&O3b=~wXVa&^$c*bcUFj$!zyTQ* z(+yk;46dI`%Vl>0)8n!<%YXxXm0d`H(ZEuFOJ#fs9N0!32LWGMbSwo%w@XJ*fL(y^ zEtT+Sh}!}%1bEz{XOZppHJ|{tjPKK$yMbWqsW1=zdo8*?0k#OG%R9h57NhS8t*akQ zZ%%V(XkA_aPO%vK1TA!BeG#{mrJlv7_R@lx4oR|q zjskZrF}*K6?K2~^E++sZNcZ=rht^dO;1;F%Z(zsJx^jbg&z|HbU`YKd!-5%|>)Y(~ z(7JK~Y>t@_OmanNU5$d7x=FGUk246~!Mt2bvVs!L31J3}`UmB8sgdt4=ea8Vcoaq5 zp38Jb6h&)AlaQ!e3t*KQ=PlO)k zt1O?M9;4Flcr42|@2a%6%^5x&vY$$S;IS;amx$3JOMtrA)?9p}+jsW&jwk-5jmd{?6eh}{Lu`J(c?b1(t2Ft44)49N~OJj4W`=as8v&22D^$9zA@VE`yTMLPzXpM->S7nX$Rh~zVm)d%oAKT^y-!EF`s`NC^<@w+O zm7W(wg$poCfRgK*HUQqHu3Zz4KQ<)v_X2v-v|Ny0n)!5SO^pIPq_jVOA6ipxfMbuKX2kXFI$VbQA>$A#AA1mG=Y*qao5G7@+}X?`!XCT9T0kfyN9X)qx)G{=Y5v9e-ob;6Z=Q!MDn-|QBs1KCJ)xe0*+PnaqZ@CrB3azUj z;7*IaOGE4O3TAVs=Hdc>=sL%utNh*EdH};P+nI!vA2ZIiZP2D69i`*-}a8dC)f1 zQqEjpvyAg?kx0wq6wKhSPZ`inooEP{kV)^W>;Ayu`v**Xu0K^7^Qp7%5jc@_2c!@6 zyeS-*hjh!ad*cd!TdA&p(4oGERo*KbbvPz6o-H!z*{<|C1vn#*GZOiXS9z=hhC9$V z(o&&KE$JjXkaGK%hSmdEpoF#@Y8-f7<(2zgJaDPX^VJsfu{q_#y!xC2yr!Jdaxi{O zz+>OEJf zud+=T(w{wl+9gL`qf}mnbz~u1NX!>1J(Cu`RuErvpE~?`%c?e2fXnkdwCiw5X!}YB zX5q8#(-wJIK$&Cjh6L07)i1vC@DT%bC40NTtf9ID_>lDa+eTQ2* + android:textSize="16sp" /> @@ -49,11 +46,11 @@ android:background="#ff0000" /> Date: Mon, 1 Oct 2018 16:13:44 +0200 Subject: [PATCH 5/5] update for cordova-android >= 7 --- .../{libs => jniLibs}/arm64-v8a/libiconv.so | Bin .../{libs => jniLibs}/arm64-v8a/libzbarjni.so | Bin .../{libs => jniLibs}/armeabi-v7a/libiconv.so | Bin .../armeabi-v7a/libzbarjni.so | Bin android/{libs => jniLibs}/armeabi/libiconv.so | Bin .../{libs => jniLibs}/armeabi/libzbarjni.so | Bin android/{libs => jniLibs}/x86/libiconv.so | Bin android/{libs => jniLibs}/x86/libzbarjni.so | Bin plugin.xml | 42 +++++++++--------- 9 files changed, 22 insertions(+), 20 deletions(-) rename android/{libs => jniLibs}/arm64-v8a/libiconv.so (100%) mode change 100755 => 100644 rename android/{libs => jniLibs}/arm64-v8a/libzbarjni.so (100%) mode change 100755 => 100644 rename android/{libs => jniLibs}/armeabi-v7a/libiconv.so (100%) mode change 100755 => 100644 rename android/{libs => jniLibs}/armeabi-v7a/libzbarjni.so (100%) mode change 100755 => 100644 rename android/{libs => jniLibs}/armeabi/libiconv.so (100%) mode change 100755 => 100644 rename android/{libs => jniLibs}/armeabi/libzbarjni.so (100%) mode change 100755 => 100644 rename android/{libs => jniLibs}/x86/libiconv.so (100%) mode change 100755 => 100644 rename android/{libs => jniLibs}/x86/libzbarjni.so (100%) mode change 100755 => 100644 diff --git a/android/libs/arm64-v8a/libiconv.so b/android/jniLibs/arm64-v8a/libiconv.so old mode 100755 new mode 100644 similarity index 100% rename from android/libs/arm64-v8a/libiconv.so rename to android/jniLibs/arm64-v8a/libiconv.so diff --git a/android/libs/arm64-v8a/libzbarjni.so b/android/jniLibs/arm64-v8a/libzbarjni.so old mode 100755 new mode 100644 similarity index 100% rename from android/libs/arm64-v8a/libzbarjni.so rename to android/jniLibs/arm64-v8a/libzbarjni.so diff --git a/android/libs/armeabi-v7a/libiconv.so b/android/jniLibs/armeabi-v7a/libiconv.so old mode 100755 new mode 100644 similarity index 100% rename from android/libs/armeabi-v7a/libiconv.so rename to android/jniLibs/armeabi-v7a/libiconv.so diff --git a/android/libs/armeabi-v7a/libzbarjni.so b/android/jniLibs/armeabi-v7a/libzbarjni.so old mode 100755 new mode 100644 similarity index 100% rename from android/libs/armeabi-v7a/libzbarjni.so rename to android/jniLibs/armeabi-v7a/libzbarjni.so diff --git a/android/libs/armeabi/libiconv.so b/android/jniLibs/armeabi/libiconv.so old mode 100755 new mode 100644 similarity index 100% rename from android/libs/armeabi/libiconv.so rename to android/jniLibs/armeabi/libiconv.so diff --git a/android/libs/armeabi/libzbarjni.so b/android/jniLibs/armeabi/libzbarjni.so old mode 100755 new mode 100644 similarity index 100% rename from android/libs/armeabi/libzbarjni.so rename to android/jniLibs/armeabi/libzbarjni.so diff --git a/android/libs/x86/libiconv.so b/android/jniLibs/x86/libiconv.so old mode 100755 new mode 100644 similarity index 100% rename from android/libs/x86/libiconv.so rename to android/jniLibs/x86/libiconv.so diff --git a/android/libs/x86/libzbarjni.so b/android/jniLibs/x86/libzbarjni.so old mode 100755 new mode 100644 similarity index 100% rename from android/libs/x86/libzbarjni.so rename to android/jniLibs/x86/libzbarjni.so diff --git a/plugin.xml b/plugin.xml index c758e5e..ed6996a 100644 --- a/plugin.xml +++ b/plugin.xml @@ -24,10 +24,10 @@ - + @@ -44,25 +44,27 @@ #000000 - - - - - - - - s - - - - - - - - + + + + + + + + + + + + + + + + + +