From 67ee970ce58cecaa76936a88a140f04ce5b0c073 Mon Sep 17 00:00:00 2001 From: Moataz Ibrahim El-DiSooQi Date: Fri, 20 Jan 2017 09:40:49 +0200 Subject: [PATCH] Add Data Matrix code (Beta) and add some features to sample app --- .../taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes .../2.14.1/taskArtifacts/fileHashes.bin | Bin 488062 -> 488062 bytes .../2.14.1/taskArtifacts/fileSnapshots.bin | Bin 6202662 -> 6202662 bytes .../fileSnapshotsToTreeSnapshotsIndex.bin | Bin 60534 -> 60534 bytes .../2.14.1/taskArtifacts/taskArtifacts.bin | Bin 190122 -> 190122 bytes .../localClassSetAnalysis.lock | Bin 17 -> 17 bytes .../localJarClasspathSnapshot.bin | Bin 21268 -> 21268 bytes .../localJarClasspathSnapshot.lock | Bin 17 -> 17 bytes .../localClassSetAnalysis.bin | Bin 23345 -> 28276 bytes .../localClassSetAnalysis.lock | Bin 17 -> 17 bytes .../localJarClasspathSnapshot.lock | Bin 17 -> 17 bytes .../java/com/pureix/sample/MainActivity.java | 26 ++++++++++++++---- .../app/src/main/res/layout/content_main.xml | 5 ++-- .../main/res/menu/activity_main_drawer.xml | 4 +-- .../encodinganddecodinglib/EncodingZxing.java | 17 ++++++++++++ 15 files changed, 42 insertions(+), 10 deletions(-) diff --git a/Sample/.gradle/2.14.1/taskArtifacts/cache.properties.lock b/Sample/.gradle/2.14.1/taskArtifacts/cache.properties.lock index 0f6fbd866c5a3ff6e443211b18ed1aba704cb32d..68ea59e60ac788e15216934ef8569593dd442b54 100644 GIT binary patch literal 17 VcmZQRAKOy;|8@H(1~7JRgcF+C)+u3zSoy|;U{`}`V z-#O>|&wuj&+#dXMd+^$?m|k;OsK2wqy)R|gYiaI?vBSR(v|dmsn5ieMm-PzrQDwlo z5v(45H-yzfdL$EOoO-M-&--nadga0EBM($m-X-|qMOqo(Oz`5~Nahl&UwX|^+uELFXe9fUMz}czGjpr-Fa|W`4D(8LZuZ~$1rs&wMloDGASRIlup-!QKQmA zejF2v=#y|Xj`8542G&{lVAvMP8pOZGGdVuEcTS8R%LJ>G*6Rwtxcs@Mo2%d7TlwmDZ+iapWu}NTs$mJ)&{nNG?g4CO}R$qg9#)_=#(> znFHc;b!z%fuAAy4&Kk@f>i2AoOas(UX#}W|R(yRZds#}gMl=s+pQvzk61GM0+LDUt zYFhksGaHB7)sPv&8)2KIM}wK&k6RVsGl~xuQHHfXJ|^8)vT%?xgEN40EF*{+@$3gE zi6<6rB(XMJI3U2m+7SFF3bsP`B9$I;9IO_tiLl1OhJ-Ax2`dVzacU0xy>mo7erF9m zwj0NZi+3heqVC3}z4`~qf0*D^+i@}V{IuU(ryvilkyqV-fDwp#|Hwbu{$BW(#MplM zEo&G11j|$&Ld9$tUXt>uep6~Pi(e&vRbpzg*X%Bod&T&--S6%8^z*#cKD&Ogsew3J z78z;UfqjG?uH5DZijO0>P8GV0KVF>Z>}&5;M;z)tx}0iQ@P5JE2Q7-E2T0otB_DhM1k7se>Xmoo7l{;SO z_V537gE24ypy}*rM7yah>6*pPfR=ZaMHP0 zp>hvr$3+6%l@=y#J%pAbl}UGyQmKX#e10k7@o-@~T5<6?oHX+`)d`dC5HMwA>kybC z=~g+o$~YUM%3)_DZx zOdN(~o}*S_Ftni+R32_I%JUe0MaQsoy4u&;uEI;8=02?QW0 zATohuDJUsGm_o9AH-Y3Jc)=eN2!X&;yS@)9CoqCBE~wmf=ErvLeCM!W7 zDb(xfELf35C zKaIxLjP^qGvqjUFQM4?Yh@$P*7#m$aubxb_R&A+Y&Q;&P{g`BLE~ZmivGp3cNhQ;H zov6>`#|AtbA2}?Wa#OsB_(9&rg=N*v?)tu*@G`IX^$|1ia^iEsa&8=fvT1endC)PJ z*D}V9I|mnJfB4(ta{;@0G*=q&av?URi(W@|;VCH%F(!w<#QgW~S;2xUnGs;dd~$SZ zaLnh6vHaBE_g49>@_(iIO>ud+BRYa|b*9i1HA9KC`j!ovRa0)|{&ZXj8-MKHgxv&X zGUUUM1^hS9XZhy;VHq?-VzEPRF8`4+t;G$^<%{y8N_#>NZr`M#>9kN86j}>O$9Q5- z#*mn_lz`0ZAD#MPa?@mr>Uf`q;|n2lJZlJfHb{Q1AV|_f-@kF!;ro^I3pQ$Ye_2=C zFh#Dv4yqRNL$EU6-1-!A$E4=IVK4g?sX7M|yJcw_4HYz1N=P>-)ITHZo%J=B3|Vzr z$DPikl|2-9*7jnav-YQWFy3>X2aN>x>+=Ar7xDWMY<{E1bhus^y zYVs!K72wd8nssRwqTg; z9Od?mY1AC<-9$lI@&NaJNI+HDhFqq6N6BaL`wIhCw}#40@*is8Dsq^{ISa}^sLyJh zscULnv#BfnLm72|#`FD{bdUZ?+_J6ChL^{txhs;!%-w1sD66LdlJocwW9*DVmtVs6 zLjkuh`yc6em3E-H_!i~R6HN{9NglaI8aTayktURrP47R~%=H}2QRXe%y!MLBd4YKG O;d@AAk#q4YnEwF4$-`X$ delta 3131 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 delta 13467 zcmd^m2Ut@{yMImy2?-@9krF^55fuU`0ShINLJcMK04gfzs-S=%R&1amU;{n7j=C0# zYg<%Ul~L9LxHfE{*wzB-ie16AA-dklIl{8;?)QE7KKI`L_uT(^p4SY&nKLtI$~(XJ zeaEf!@9A5S6j@p-^ekyKnmH00&HrU6jmA)tX-&!xtA>ddc#BPGH1V$_6qj|DM)RCX zrsZe0qjV;jj*)iIXnr@zbU>#)s)tXeRe7y6+H5JA4#YfYw8eBXJwnlp(o8ZP-Fm1y z9qAfO!`iG#+&;b!jqaN#ApZz^c?|uLPo|BmexcDP`c*!UFvGkFg}|985D0AR9v^7E zAf85+@CfSs^!dqt*3xM>dc#~27w@1E6#@}ATfA%8G2`z^%z45d;*=oVZqbeUM8h+N zH6$o6qIXrW=s|1l6vwNZDLi{4ft$N?S0scbayurGnEHDiBF@~M*kQg6&wIDxLS1N9 z9ho8CVNR$lL`05-gj=$6F}xfk!*5gv2|G*+hY*fNQYyd*RX-9~L-fo1jj{sjI+cDzj)Rpte4ByJt zgsM+CzUD#`=c||NWF)9L)xPf(jErCWki=EWCZes6 zJJ&KX@#5ymAtdJds)%s2O2RjIFPf#9zUejvK0QgSwGt7JtR&oB%l$qc$mf!{;?Y6^ zw+<(^TdV9!ZZ-{TOd0{mjQIV!T`iW}J!188gZMOwd#CCX53NOeMM4&aZ+%`a{ZQ9` zADQFdzL^k;MBEAKy%#riEjytZ;U;qDE*%^>tlq~@?VxafJQ%}@$l zdB3Z<9k17H_EO4ck+^;Ied3fzL|}ab@SV5!<-#)?vd9c|>oP*o7j?X^IXBX4@Nvz$ z=M)}tl{nBh3EzEXO>tc6x$z_@zV(a{*a(Sm8*{EDkIs5r7fa&))sKk;8xgnhic8;* zJD-r4=GaN12w|4$^E(&TOr*-SA0W2dR1z8e1l)qO@#B3zy(4kw38#qce(v1&>F?4ui-<`PL-wdz* zZMQ2cu753=5%P>hJVY7p1IFM-MtATJwb=QQ8KE|OqG*7KxHG_vP}rJtg$Z%}D{hS- z^E?mtCcGilkh#}p=dNxZWc5)ub07Y_oQ|$f=kEv{Kl0JC_N|7<`D-RBDhmehS#kwjiWmA$&C;=RuJzT1^D&3d3hbT z?hGI^f&;4vw}Ebon<<@c8^=vfq`<;cT{Yj_Bly_X8&E@`$!zSxZ}scP9DaW>r54qG z1d%i_f@mD*gx_kO8$Xy`i*zY^;y#)a?*@vvKTmc2HJR8!Vu7Em3A;fe+k1WX4~<2r7_rH}2+{fYcRXeBuX5_gLS2Xyj?2Im|i z*+oFCa}jW(rac}xHe@ULl4epJQRCuH@CHkW;e)pm=0jB6bAxZSi307&{E%ltB5nxM zu0tdQd#D-y{u}w7HDhXAs21ZHgkY$Mh!{GHo4mcRjmg`uNIVY8h?=3O(qR%JW7tQ! zl{b;@YD%{nLH$gnewI={rPNO~^>dN>d5nI{Fgp3Kh4x=!it9RHdqE}uu@_{{iz3|e zBHS<}bR;@R7)W$sgd6i!C(9FU9?uavKosm8Komt7fuaVv1vG!GuiUdHhuwos9v z54J`{^T4V^#S|bBD)|6^6l{#Utt`2jn(;$g#r0Uj)yjLvfU`Y48dUtOZ~`@XN<$Dn zBN&IBmdZ#5pGUhCs+!4(jNd(JUW^H>5?EE8tEulx>yp(xfmP{Y8c*q zV7yCMGzN}@Yj~i2D(gEiFG7O@tW!4{6kQBff&``us(s6FKB!GrezWGg;k|og3hm;o zz@071WFTx0a0HUl0DX`g-Q#^9P|Wex2iC*Gc!0hm_8Xv>sWJpD8dRjwot3kuSkVt` ziqY^v=_zhBY?;Nng~655utPd|y7O5`^pLQTaFFODF@U=B4O@#@G{aUJ66kEBZqwo6 zj*L^>VaJc>?YawWLLM?5pr}%@fR4Z1f9Q!XzFz#}#4W}bYm+X*JA>7YI{310BZ5UG z%k+;w*}XfpWyw9b3Mw)&D4e7=z(C?!ehLroW3#uV)x`76wFY-V&3TZ z1_^ihdO&zM(7+s@dn5Krs_Z~%mZ(_3~g~VHiB_LH{Bb`pExC+2O-8rIP9SFA1#9e zmf(-ZF%3@8Xa*->%Tw`L?7wk{bm#_6c_j=#Siq zRs^Pjk|%*0P%+utaLwQVW5C^MrVr;;2A;w2I%#>7?Jzr8@}%Cv>jN4Z0h+fDdF=!r zNiQVENKBBJA~8cEKw^%>0*NJ(-bnf&u|i^vM2JL$q%RU1B>j-|M=}73Eo>+3JepyO zhrAaZ*XM^VA9``<>P>G96Mx;_y9z`Esxu+p=DLZF4TZb_Rg5lP(faVz!!_?+td426 z)Jx*-!P@)&@7cI9I6Ig|6Cu9ELPsl05AwcOPe+UJ%PL_>k>&&+ZO5k*^Py0uUd|PT`rb3@O>7-#PeH0BfouPh z9w1B`hKEdy_R9%`el1zjb=;N`;KQ?jL|b2QmPrYK2bQ1h71FFObmNJ`yNg zO*nZgt&Nay;Yw@#kUMaymf(37HwGbbf)+OwnmZ|P60BS#cgD~ZH5*>lf5SL8Pc`a(+SmYx zQlPx3hyi=jHI4$h>9adVcjMVL!EKAyeml~H8Wx5-Se5J|hQ)go2~1cp&e@UXAuk$$#HCdZcG*%m%@{;6Q3On`pKthNA9_iY1G<; zU(In|&gi+6csyErM<`R*@XR)=_@!@+68nRQcXnPNeYCd+R164uOoywkg$B{#4u_ce z9AK3p?~`}5${C3ZlEFxZAQ_5e7(80#${Y5_=`^v$jGLoI#QGdT>#pXYoKdhv}xU0LE3(>p_JcPZvIA@C=!7 z(9PHs7u@mV&o_KqR|H2sdwjHf%ZXL+PGI0$E|6{*eiW^OJM$&8)f-+G4Lx$NVg0Qd zD;RM{bxs$*#&5xn@Belt}})>+n71M`>riJ=)YekO56=}WNZgiL71 z+Pg#Vo8PJ^d);}#!>-b-UxMC0xjghTS=yfK3r?PpxdF42GL;>>b0EF2;t-m6^st6_ zb-lvL^J;Bbk}!e9HJOh=>`9pj7M+xZW87>Pmy6rukkyYK%?d+s^_0w=t3E!_{G2T^ z|IrhjIuEc;%fi8w)3WWjY1B1g*noLLGAp!i2jJGr)^Yb4@9cc>Jca~^ANm<=u9sy4 z*E5KeO*|u$;8u=|q9@?NN-|%Q!UEgQ$lP$N4IfwNDf7mXXb77DuAV_n%Wbf6!MnAN z4;sz&Sq5O8MfIoh>lPd3=a8T}WFRYR%)s08GIL;e z0i_U`Ou+3sy_Ue#{5-N`;HhLH!OhLivF2jHtO<)LUr0>O<*q>U=^r!xxt;MQR zqR7n+AM}#9EVs6HI$47}!-}YJbLWoTQ}?XTtqc-VZ#hb|AxtNdJ$dD*ZB)5}UWA*w z5O-OAQ%~IX4dt8&eVq+HHK3I>#lO7s&BwcBNpW5s7}F>V#|L*@Ye`AFQAMJP((7Pb zBl;%0i!zn1!TRiVQ&(;va}12kySnSzkmT0uL@8whDV@p*+#{L0W1n+c!|rslY|u;z zk?tYl4!pAa`E&hiBqlGi1oBHV5jV6&>6QMTGA}ffpA*F%;kcCl?IO-p(2pz`n)C=j zR5Et`cgNpbcu-4e#82IpzqCWM@IdLWd&t58E|RWpc}`9qYnlwMlekLh*^OsZ7R&D8 zY7$r5*bom<*Bpvib9Qklt29R1vRdkf%SKJ+@IP2AC(8vL)&paj(2N_(mbf2LQ>P;f zJR-JBg}8Ek^FzT}Y!q42K3YoDNGrLzUYSQrmuw_4|2Nx-Bu{s6;Id3Y9P~`EHOZg$ z@V5$TG0AgRbal-?Pq%_LGm>&d1$opGxK{*s=kbdl7miet6~(4nfD2b-*?6Gk{6{C= zrBN1~T;xkMcnR^qTVrxI4}U;8R^sFe;-MFE2FMbC-8ETFY-L3SrwkuQ*5g>brK`;_ zi`25ht+}owuH44y#w#0n(OZ{IBXLE1Y!@DG^CZf{twWc@{ofPIs3e0v~x{xKmcmQ{=xyj}!lUqDCpi)B(5n%VEav( zgzI{D{5#i`!DQ)Jt9)?bChB#Nbhf&|el7`yu=@}~ZxJ!vdluL61^anX2r^;Nqj;o4 zobndpV@Jzo(}S?3Bp8skiD>Z_ftFjc0Q{?(QPpp)UQ=qoX_EzE=i?62Z_5(60-rZ! zuIDK$UHtSSQS1|rPrQ2W;yrcNZ)82{5M$z@PXrO+Ylf%TB-dRE3ZmAJI_fns%U1}l zHX|j;YLQ9oru6zy9I)mH9jTPqsKg>G@|BHDpBLRRxvf?-t~;h0Ti*3 z=Y(_>o;tgkIFUD)vbGhEzU{&@trf~D>559SQ{qe;BHS;Tn>pBZ=Tq|ts-vlchzh?P zZkAJFRoy=7i_~Sm5O)5R-0^2d9zSxHvg`vf5z*i;;uf!q+fbidP&Ejew8{nz{K6>8NLig-GJj{xgoB>m=`#l3(Atg7 zdY`FTKY{&p@QqLoDU$(?v5^~^LD3FzhZRgJ(>!LwuyOKE9`xxY-_3#V7RX0ota8+$ zKX7Y+-olZYKt4SPwP4e(!=X*rNBh(+?Zq=adpLk9(UV=nriF49lcha%au8i_TVRn?l|aR zPIK?%r!I4fEPp5&Uk;sDgwz|*%>@7}4idu_KbHY~xYHqKItSvrf(muDUJi3SSKA>^ zbX@vuh&l(6CN)>vT zK2T0o#)68%U^8&7RMD4OLw{q3aZZ4e4f0{o`dj%qV|c7i5jX(&DOF#C;ztU`zxW;H zcjI~vq1L4Y{O-m57rq0`bW(c3=Xol32Ozl_i-T37u&p3nPh$yd5?D?8T3(C;`Wb;I zC>|L&5QI-u4g-oLB^&>eDQg`{Yhc5(fESEE(PfBSQI}X47bFG`PXRSvVZGpj^C}k| zIBm9a(?F&_THO9q!Kx0K3P{!~#PHA%*5Lo?{xq>bum#c;NL|ZyfR>1B#h>>%zQ|_`r2xzSvmK-{)=SJVb43y*_u6Mw zwNg8BjKT0gilz*MZ-4baNM|w}5#$JKQZySeynck;tH~4k=Pt6DEr;8i+k2Sl5!n*{ zO_&oOKjysWg`+!p-Ddi46Jw95{Cz$ozxio}V)-`M!%R=!b8zA6(b?wxoZHSPf4z`m zzchviXg3LVg81IhbGG2qB?S&dX{tO>)}-J=UQ*0iHmDgM%7SAD28>d|skYHRW`FbX z_=UL1Y*714U@mA2b1{U4@j-9((8O$#EyD4oUw|Ha$PpTC$Pqd%3S?xMt_8yWE;cZGyUP<6Y^W3mnvx#m z?m?I9<6k%Em6f~-zMfxe{~{-g|BPw{I}4Nym$9%SSfOCTpn0l^98gjiYy$ATu?3)} zFqj4K&VasbzYi#I`+-gy4_Cbo9pnIzEzJMpUcaahEKeX$b;(5KR&Ya`>e|rH82>i@ z~1?O_$=1~FDIpmyTKfs*IxM~Je%~NgVutV}` zw2*u{ZOT6w1LXIEbHZ;Iu9o%R`1r$4SDv1BK(^xr;W|^DjDz|IEtweKzI%q&O(Nn7vpBtg=yS zfMNnq1jig6{?Q1(;GO?~HEyrV-u)gazg$m>1fnu!ezzaRh>2TDw@({ZU4NMoUq1Rl z_(m64%hHT=!CSpHNF!&>aGmS!pm|U*<>shTPkJ6*@%)Dw zj**Qy4glK~vS6EJUx*IJyq8wv{jT-Q|K!D`RMTH;z?;a2bKjrCf%lIEBDdSc5`TTB z;7dLDnM>Iai4!Kl26MTHA@KUO{%VEC)^&Ei1DEL=-z}wzpmScd&QS^5&TEEZc)#aw zUF7dZHt5D~OY(@Exn4`H4sxKxLtV$#s?xV?==5tK&j7wJRTwZq+RT_Pn#t@3a_-aT z0KD8~Fg&|Mk*teUPLZFY@b;qpE52*i$faumL@6o}e4$cyX#LgSb+pZO zU;b%O?@LaRPqPO!lj;u+8y#?)(tOxnn2{a4j{&BfaN!$KotNg2q%IMPGsVj}(0;s} z!=W3m0kzS=3Q#k1ZsV2>bKJ)E-`{L{_1rbHHLBm|5pnxFUny<1q`SX%7Jm!g zS823sp09P?m4XD@Tb|vsIEAZK`^6k!(izZ)?T4&hzvFb;bf}yeG}=Ks4~SjQpBWRw z0Y!zu3Z{P=8uqmRGS~WdAN9E)aT+V5n_@caprPBFH8ux|nMk=EI#ZN;APL;^jy8?ha;Rcs9Gl?bzMd)B6NY zsACu=8Ndu>SR@9rZUyr|Mn7IM!2868f`lt7GfV(@O{$SpdKt(l2$=}eHE!b=caJvFH}Y!e}jb?&R5w??IspEL1iy_1*fNN+(Y>d(FRxAdmUQ6tjufQ{L`D_Qe+MN ze_!XMzG{5qVg|#!y#WiXe;Tq9VxBPum|(|)q-{g%>+i=p_uAcN^A?$S+6URxIX?0v zSd$lc!WjG}3gvgRq|X63*k-8KHwFz)T?+)^?RRNY9*&nDdbHGlHQ~*2st#Hy+MK<@ zLCYsiFYx}h*p4HtMdbd0RAOzI7Qi6TINy@r^r8fR;Dcs-ly zGGO|tcmI)hqY#N19i2C|_SU1xC>!rjQMMlTJ9nsdM6o`oo8M>!hzjJ3(D;2h6yS)~ zn}LO>Z^QN=HI4zL6Vnw~z4SK%Qe%4~^Vk(LET=VR%aWxq=J2@Qi>c4X=FA0+er}Oa zk{KgofbUWROzG%&;f=I^30_C3`@&mF)l$x1GR^mF?Ws7O46B>!z?aqj8+$4;ICZxA zYkM;M1+aKWbC596nFq4`)MhxXTKh>%^hv*S|8Fsvv{hZkfc29!`q)8(~ z;v2EqSq`!v2N}TPO@WOpC~t7NiQ&0d=DAu-PiWXSjlr3t+GYQ{T~NvtWa}TawzFNq zzg*-y_vz>)cWQ>Dxgh7Z;upAROlTVWe@P($C!gV|AZ1S|M|TE|CY=FgGlLQx;I^pf zX+8Wr7If(nu*wh5(%LYW*uXC}+RFe1&HavPrTf4E=(V-nFRr(MJ5yA%pk#`w7Xt+_ zzqrl4CEPl)aF4GYd2``i(ZeLfI*+_V=;{z(kJJQZ&@ zb7)p?o3m!yp^>xumqu=~3q;}9s(pXHpAbs#c@qJD8TB%Ldd<0pT-NTmt;@@9f+sc3 z{W-LaXx4t$fPmqr7T~lpZQry(Xbh1UEDi7;DUv|r5*IIk&u3b6t3Ni7ER-{Nc-Yju z(9tip`CXD8;Ey*di3gRJ_%Yq34AE+7J`izefP0xzC z6%W#qNEcPAr64`XvjU9f^=5+enVNpgo;OB5J5tGDc;ctNp+I6H?+X{~R8(ot&wq3P zvMjaVHLM)2YE^4YwN`Dm5VkFF?y&kBM+CZSBG=byr}H>dd;@u>Zh$)+0~Kia8nt*p z9yfx#cv9D!?T79R`JL$AoG@u(%ybL(|6RuY1^0s+&%|70Fhfw#C#2(d%BzF@f9(Q* z$OX`WK|&{Zh@}iy?WRrfar=U273G$YqXdtMKNLNG>R(xx19OryoJ)mT0Q8AqK#5?NkKaEGZ8^b z%M@o*s#%)51hnfa`T|Ktj5Y9*#*_jt7{_KxdomYf^G>(W`@#_Zg3j_vCnYEf9BZ3$I)jGgVG;kM@MPTzwabKCXZvndx{Z07U&fC-*TxZ zR)w~dBC=T7K@h88YXvOD1+>)4B5NRsh>Dtbm zWxigxor;Qz-t>F=70#aiV1BPIah%CkT@9{mTaxy&u=B6=Fa8%&**_10*gW#MLbYp#)Det=>&4+hvCu#IC&UYr|}Cyi)eE$masQps6264o_xH`LFOo z>luYueI8uWuZ0uy<-jwrp-wiRn;Cvfdk_OVDUcX&$#-cgu9l%?nusB=*FYvXea!J| z>$xr`(RzPlMm-bYcy7njb@u2(bD-6LNBpCsug+2rLhHK#TthJ-E59`btzNXSDF`wQ z0)-)mKdbQ1XP$ZyboK_*?~h!Y$HqQS^3ivi!?>XsJdHeDGmGELT<7Hn<+~ukND7)<4zc>ucx%itUG(7iGB%e|1y>#izTgSr z5^pO=j5%a)GU*61D!@=g2>2RHq1ISJT`2jJ-?&fJ1`E9pQ%!gvHrWcrCTyx`x0Pn) zKUgoH1S~=CqZqF}KT3MK50{}2I6^FcdgbxiWN_!`e+uQ|TftYL_4O_9GehymKAS4K+u64$1y?eine1zCv%nVxhQ>x@- z#3~*1?wyR+bLIx>7{CVfb}hIqkdZCbg4Vv=Fi@9HYSN4%>^h69{Hdp zD(iacd9>a!5Lk%G+GhhFoPSOqLC+@;X~BhB3(px7A3a(3u)zc<%PK)@Th(EkM}bmo z=#$7ysrAjIZ9>q?@6o$%L#-uO@PMP;BFUa(jwsJ#!VfNMl>~XL*GKP0 zBbKbXElHK=14B@3B}%pCkltG%DJ|;sJ^e@r1lBy#yyNJ3r?@XM+8qy(*3*m8x<=6T zx1QIXBI#o+w7*T+X_?ws9Cuxd3Wy;$Wjtm+BuKS5H|{ zbp;E9Sr8uvjdY-j z$v)nvK6|l9%Mi2PXCTs+N50ATx)rY6hSqT&5^SeWz3o1tIcF|akozHe#1RnM@yLPj z3a93>9JJm%kW5?djn+e=E+aIB9mws(M76o-(zSC((fUt8-n99oYW(`Ijvrdza%i~F=7v7xUM63pp$g$n=^$|;st>@`Nmq5WOeos2i{q_UIpsd<;CrE% z?ODw90ZA7;VMc)jb`-EleQEvKHR?ro2wEL}_N}AO~*h-!RImN{gUUC9-OZQTGo!Vim z-UQI=ND&M1rCdtCZBp*?_ct@Kg`ylXN=1}GR_*t#lW|3e{npS|DgwtcTR2#j!gp-B z@Wt^v3amw_F|#rbjfmV(IOdBUItGU2T*~<0mdXIlo<)cQ8Q@qROjtUg!nzFPP?fQhOT@L zO%+@L|Ms;O{kyB^?Le`eIW&Rxi~C+hUoFINuPO9Z@JP;Xe>3hW=D9MGD&kUtg5Un_ zbof{cbA!JETO@|H7j0ZEbQA_@U(Ji93tXmS3%k^r&-dpZL+>nn=Nn%(mBeeOqYoT` zq>Ezy-QQbTzAtL%Y(0~;x~N*s*&45n-q8*zqBL+5>%vr}Cwag0sl&`nHLUfeLXcPl zNmXpPTII=C`}B&rOEi53dN(osIhrkr*H1OPNsk=@Q&qC1R{8fVZG;nO$_Gr=$!>Jq zE#b`&dRGwRqQ=i2)hLx~&?BTkImc4sCw@i&ZvB~v-Rr=xng{vL9@IzPD^JW=e4Y81 z(g}stJQ7i;^|{K2^uEx46BN!;fs6BDohN2#^x7S~&kX0%S}mxseqDk+he;sgvX~^4 zc^ai9&?{$f1LS=)LF8GRa=e$GrjI}!G_HurrQ@?^I)qz6?B;$X6A;K-#<{JPNw z!+}~NChiTU_P-pUO_>O;OL$;&buT3uafmL{h<%9Ro@}_iL`EVNPF5Ce^tEam0ijDU z9IUD3UtXGBC)i9cnyy341lArARx0a^%(0JNR}d{d1OC@I#6G%#mHhE5bOjsgmj;uv zVdD1p+i@I`4KRl?w57w*CvXasd$@T?ccq0w+m$AvZ1Aob% z4n4;P1M{K%h6qNMd6MXp*&cfuYtcLWAiR!Ch01ed56uo~MC_k}j5-mu^X$=FzG_xG zV$W4*suLXyyR)=DxMP$~M$Bg>8m>KOD$&c{mJT0dJfba4kLzss8+wEzuAk!H+`@!L8*-si|UpXmqnn zvRGOXEd?sbW<;K)0Sf|dNL_GY5l9FDDYY$SQTx))P479}$@%_&mOIRyxwHLCX8V^E z7#R$|QBhGbQ2Z&b;St4+`u$S3-bIt9>J6SW2RKfnG1}$L()-pa|0Jp;s{KV>8Lx&H zm+ve+j9t(Ibu>3jYjy>H<_6 z&|%IX6^B|4{4G*Cig<#@~V1m}FRAbYBs7w;r4Htnvv>nVDD}<~esb`eL5#9{P;5fNgb54PoZ9%dIS*kU z=>@`+2bHFN%nL6bx;%*4UW5aQM#>&9jI^4(F17B)KJ*jFOvy%)uAxd)OkZ|;({9;> zBV*fuPLgO(l2P`hKylW-LuV_E;o0kP^|2(>W{+n z?q2JJ*b`{bMUtRu=1Wu$HXXZmyEF|468C|pnPT8(`Y6cVspFH9Y3wo@G@Hc`wT}zS zLgMf4#waC#W=;p5xjr&np{5~k55_)e0g>h;dhpoM>}~ZVwkd5WP?%xhz3QXlz1YU> zpwhe^_FK@<@r2#GH~ck6)lY^D3ocqnS}0qRa0J`HW9U+tSE1Sx^Em3?G!+hW76M4M zq@gr}ud0u?FU7edrI2UIg{PK!M9aHcwnm6$8`a?$$P@vtRRqzxb6)4hFmodgjG91! z6$vk`^uUv$kLZyhmURQ$act-i@E9aw@8GD|C2^?yX~dC(AJUyJ7J3sK!3MY-o zfn&?@d=aYJAl>IBP4m$={V74%011qa=>Ql!riw z9T#yEZyWy*b^u$v9pu?{L596QytEgh>}AgBWiP+QG3f&ESair^`4KYdbN)!;qhE1A zwg^kmo=`n}Z%P z-E+j6%=}9Y2PB@*>yQZoM;eqk($Llvd02En1&+zif!L7?E1Xym>Qo8(ANrxYP6IQf zKNH90Hz4Fg#h&^h3pAbeh=niLy)29nJ5oKq1DZ1ld}kpNRGOKu`twul6D}ZjRy69u zg8eRU)l9r0iLI+i*2OW^TU8mNmL8u^^H zDXPIxaoL}tm3E`yQ8hI&(hbUqc`qXMBQkk39uH@f1JcWUwBkTR{q?k4*v9L?u7+gv zG<1B!7H!5h`Ak_~eM}OydHM9A{t^M>ZR-e;xK<)~ybtR~2W%c4O)7!Ag9AR^P z21x5^pxeMAOxCY_-(X3;(8T6|tEt|-ih3K5qf?(-Gy z$u`9nJFA>b+dEcu2d8|fT{|%w3OF3X?)8e3$J*Ks;^aXO5OcWN(O24E84v8oCWl`* zu4qY+W^DeB?=S^60EbH_98bMiYCZEM^@%Xi2esGuDADKg;_TbMKYJ9{WCdt9^9ZN; z{^7WU=OT0$wDzvN>fxlWzEvL;}9c0p^KKK$yb#|)Ma-L4q7r}m8TXyq_Mbh1k)1|-yc#}Q|} zNVHr>W0yFr1Ghb)1~jiaBJ6&seVTY`9%F(dh`s1Uc*`=@?*YfDXO`qczZVI?H(7{1 zvU`r5{}E0e)PnSzB--Sb8rW-d7+ZV~(7j0r^%kNvzi3Vu1W2*V^PtO{PDJnYNLAaU zdIIBEKMX69&-~;|d@A12@~6ok)GI%l1I+bYFztv$wDq$W+4ra;GR+Rk*7JzHPww`O z2By8kt;l2`Th9mn20bFqT+sgWrcKHn#|VTQ=#bM%15qc7nfSq*GT*{h>Qh{hqnxQE zmBNLOBVJM4oh$&v8;U)X14f_jkM&(e4fM4#IXQI*I&+h skkX!vQCxrYJ<#qULDP2z*tdnKh;hrY*pxb@1rLGlXV>`Cod(nY19KcOjQ{`u diff --git a/Sample/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin b/Sample/.gradle/2.14.1/taskArtifacts/taskArtifacts.bin index 16ee770a7841849e04d5ef35fa3a9da1d1314771..7f5d96cbee982364e9ba9a8ae1ac5eb5e7b193b1 100644 GIT binary patch delta 2179 zcmZA1X&{t~8VB%sUz!=jvAdb6dF_$4EQMq{#~u-)i6OU?kfkEoOUODyW9ei+jhV<2 zlTen9tw=&RMl;!$P(zku>YAgvbMN=x|9QSV|A*YoNABjUD8xa`1My7OWS`6|Ntq&P zZ5x=1cR8Umb{WxxKTmG94t`Bwq)$~B;&y`sdO4!H{wzWg+8c1hkTk6HwqOkSphz^* zw3ywntjX8@5E&kru@)xYOlY#`gdFZQof&dR-kGrEmsHj?u*2sZjH< z*^RT;kMkpV>GaU8X_m99RpIzmVcAe(x+7p-{l2IhfKoRCG+KF(2j(vKo2z{??VPsk z?f4dr=(k$!*XcFm1~{nGn?EQjXl;v3pVs*V9i9eweuUTMEi&?0aM@Ur$=2u(`WC3R zosdF6n~n7kT;^cmqtY8A?@qbnmm&xJ6NK&%vI-Q9aV3$|9pAG=0H8W_6|qzBJtM-t zd-L?IuokM{0#iooYAD@!tAW_UCBi{7td*8CDKy`Ll^N&fMxbNWF#d*`h!nZgY2fBV z#{1|W)CYtXeZtf%Mzr+2RCn*%l@*pjKN|Vj zVd6R3$~cv|7~e>8xhy>1{1 zngROM%U6IA5ZbK6GasWX9q8&=XPL?uJMi50{16OS2~33t&Jxc&K|sz6f%wInvVBcA7 z+18Yom;isVJCxi7njEFl0z^TS)kY)vC>YnoyWmGWy z&>I?Jv17;D_`YyU#l-cAEeFq>YxArkZtu6C;sU`~ZYTu9Cma0qb~0(%bQ3#|RClR- zA=U8u+RA&kvPy}J#avDsTUOiZ(B(D}-FV@6!TQD?4Z|6pwKm33iWAAzou$_Q)5asA zi6V?9|2s>&Ff*q*RzY}0ThP}EvEt~lqQD0ZB@;6=qDB#5PPOv}BtguoQ*5j?^Y6qd zocz!exq79qipB=ghiK1joX!l9XZI4-ivWuq3hg!iT<2_dm)9{V&Pw-1?=2(05EuWN ztD%KGu$L-TA%#E3LLfCb25jJkg5jBUJrXsN-m&r~1N}1#6*|I|a0?gJm`R?`=wr2f zL?Jq0N$ed5JP4FOPC%jko5f$Tc$g(4s1EJo1DKL>{FIS~T>6*h0K0S**Z<@G2S0s^ z|Ep<}RZ=e5>(D~cNpLH5Q?A+v6E1vK)1pWDU(Wto#5-x=I<(Gzq<>s)F^t^<>^Bj0 z9t0D1f-jSxMqzQ``Z4AgC1?kOt#%h9-VFR-lm z-h|1EoK`j*49I%G!_S5Cu%cyz+e#7St(!t-pOwzbH(ijHGUBjA%`8v?`eNevUgWrg zYzCHRn=v*qpC=&02En*zCxgPPR-xc3roRX^|FqqJ)W0gz z$da;oeZs2QFP+iBQUa(8e)6jJx7}itR1VfCU>gWV_898ceQ+9(`Z#@~D8G{qg)2j* zd?j+%O{Y)kvaLJ4zcqvZqbsL{*@#L^rRee+_VMIC2ZAb!`ffI}?bXTq2dZv3c5ztZ zeb?>!=#+q|NT}dL^E_eUsbJl1y=DEr$4QD^^1O2>Lc3Onca`SSLOFH&yVC$@7^#v! zETMe`_3pHS*C=C6nB-n^G?O$f#I5Q$F^wU7XQ5g3=HF7srL9`b#@Bx1Ws*)x(osl; zHzVP12_5YY2R0iAsIAqYAOI=0*DGdUn)Ogv9;p|zh{mqGpdiMDJuZ*sp0YRd9!;le z)Pwur(4TP;2HtOISDwA7Hpt2=(>GFVw<%g%=%*SqOM1xG{eecTmPts`+iZ2}yMh~l12iNbnK9!`4@vFl>l zBToUk8BO5diDxl69b^7O)DxrNX)b6yQZy^f#4dzqrhG6n!c#|Gbt;z4_T0x4Da?S{ t?@Xp4Y*5akJT7kEp*3Ga!POfCxjSt3utEG~$%lmfJB)z)3l8!|{Ra>e?b!eT delta 2176 zcmZA1dpy&P9tZIKeqj_nDwpLlznnwvm(wEmTXKsqVM5C-mrk1HtmGECCDk?>$|~s* zt!1{giXN9)NsZjPxP=u-+In1)q=!d!cFzCr&+GeoeP7?tx0=7Mn!m259Lv0MKo*2P zZG7P0S9Owh*blMT$Jm#|+9ju=T&$Ja`Ko>~Raw)8JVN}yydN&D0`YFg`l?m08*D9? z+bhpcF{ZsdUf?{A$gmVGm9(T-xRM*)9z(PHS-CD-lh$h-vX1ZS?HYY^^y?J)iac$+ z&A}JbuWhXPc5mu*Q=OtR!TJkBUKv5@NQy8w!xdHYmr(~ZGkt3aG?{he zlF4=T$~iA7u7@>|@j|=h>2oCh4 z5gWavgF>zG$v3wJe=ARq?7)aoS=UY}8Z*2>!|b0i0U*kz<6wYl-L(F;hh3zN==zN9 zKWR6>-1BA&94h$-VrLMrZF7RZ+Id`unaG%LUH!J+nf-Ch#IjTA1Y^~=3&{YaV;QhW zYui25JX>5cAefQYwD%Rx*Y3_%46>8h^U3(S7`4e6QC0_^kL)o{i_al75X^*E9=30A z?pH6|0ZlTWEBvH!AoQqTDUfb@&hspaYs^D3hHTijUy9^#RyV$5+Nwmyx31EgGo^qI zfXBg7VbU=9%Kn@eiNuX7kzCmV{y-Y)(n_T3_X+Yue(2oKNI3w>nnoO|@%)1+l5NK& z_Y}ov)Bv6(Jj!Sst#5F%`|KxfQI65* z^T8J@H$D4L{gbC{ox$ryPN&B-&u*cMHu?|*AH*yt{RBWHK~FujJyLPzSJMnKEqL>y z-mY|#%fX}HAC%!fVp)mj;y9-3!4e6`jny7&)eB`C9fzVFn#|73F{bvKZ@cE^_$f21 zXIxu<%8y{UXpf^wESfukaIKxtX~VIQt2weS2k2`mN^sR{*cD}(_s=HKDj08@Lbf=l-B1E z%7$UUo$^co93bEP-3J=>yEsE@`DmaxTo7)=mOC_-T`d!D-yONUPbfmB=E?tY#4XH- zc1c|RIZg7^=2qgTh3?er_8-=mtVt}6eXs13@V}fqOovnQ&x7+&|ADb^AEKywr3k15 z37IZ|ze;5-Yl7}CdR_X-GUD&+=1da7ZUCBoCzqO}TI9RZ1V60j!Ty$s_=E~MqZpai zs(gFKthiONNH4r@l-nwaVsa zDiNm6rSN0zu9w~qHn~-PRSd(cD2zADep?L)FM)TKpPBw8mvEuQ0A-LCe1h3#Hxw=x z)NOIA)Sr`^6kSJpC2ljE#x;-O7DMIO8Nw{CCfuvSukrIECtA^i`+2$}21~yzAJ}r} zaQ5A^4e8UC7ShQMxVkQ_(~@!8M!q?6;2y)QcG3BIvV*S%XORky16w>eZK<_fRh}Mw zL#R_W%Mv4IVbuOz$sSFYGOtbz&8_#Rcv zQm8@8{V~4|o|A^oU}P1$?@5#p-VZBCmat3cbDb~HJRgH(&7Idu3-M1l%kO;w0)WG1g7N@FK^EifZCMvcLWr7F^+Kkn-H;7?SjzCu{BrgDMFTX) zv<^f{K>@;-A={OvLrP^AkTaROKJUNo&_9!OrdrTp^%603o&JN>3^EB`eaxK)Zgibg z8`sl^3zPmBUfcdviE;If`{g>-RYoazw0sAzzs~9_g(1B|UT+$^*R=nQcVnv{p-ep` ziWL6+&%y!%r4b9-b8hs42~tpzU)ABgi9NmSVZ||+4h>5!SL4kh56BTt4PcB7xFg~g z)pQPBQB?}2!(&I>3h$T_RSlz3WCGO^d?o?A(F*97&69#`I9)#G7i<*`f(I39U18h^ zOds84aD8Nv3hn9Y=p*u#0pah5=QXG0~3F+ qr24l`8O{SZK%Rv)Kbu*5Yutpg!hpOPFNJ%Lv{o4z+b;#KP5%r0U-FFr diff --git a/Sample/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock b/Sample/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.lock index cf88dcfb74ca9bcb2d77891563d1e65bf38a2335..b60c91b6a72db70992fd7b25d8b958ed9ef2cf1e 100644 GIT binary patch literal 17 VcmZRcyoZ5dirK}N3}C>x8vriS1d{*& literal 17 VcmZRcyoZ5dirK}N3}C?64FE2p1Y-aI diff --git a/Sample/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin b/Sample/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.bin index 44479f411ed807e53410bb7b0edbd1d5864345e2..1b0e54a1f5f810c8234eaeaca99c2a06beae980d 100644 GIT binary patch delta 51 zcmV-30L=fCrU8_u0kB<20j{%NNTmi75di5qIHh{xOAwO+qF0?@E^*eA5m985Z%Gid JiBE|G0lWz>6X5^= delta 47 zcmV+~0MP%GrU8_u0kB<20j;xMNTmi65L6N{6zs(~G@?l44BlA}_12TYQFOD4Pl*Ep FyS&A=6Z`-G diff --git a/Sample/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock b/Sample/.gradle/2.14.1/tasks/_app_compileDebugJavaWithJavac/localJarClasspathSnapshot/localJarClasspathSnapshot.lock index b17019afe0414f95d44ba275c50e4451695fd266..ab6a81ad0f9bc24df27fa12a73ebeede32e32898 100644 GIT binary patch literal 17 VcmZRU_!w&VbN6gT1~6bu2LLi#1Zw~Q literal 17 VcmZRU_!w&VbN6gT1~6c>1pqQJ1VI1* diff --git a/Sample/.gradle/2.14.1/tasks/_encoding_zxing_lib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin b/Sample/.gradle/2.14.1/tasks/_encoding_zxing_lib_compileReleaseJavaWithJavac/localClassSetAnalysis/localClassSetAnalysis.bin index ca6572a6bd780c700509cc0d64e75d2a1bf092d5..a5a7b487c4dc71c98259d372ea7bd12a61d383ed 100644 GIT binary patch delta 132 zcmdnEjq%GJ#tEXLj0|Al5x~G8^bo>kP}->YMSQZHgaK2u;pPB|hfYFgj2Re&O@UY! zf*JHDPxMpW-0pFTOLuK@ey(16etvpRs$Nw^W?s5pN@7W3ZemGMW`&*$km(C%h8Ja) Tq!vwn=wrG$F!&xjldv@a4b&&o delta 37 ocmexzhjHUJ#tEXF3{W7p(eSPKLe06a?tH~;_u literal 17 UcmZRszOeh1y7QBK1_&qu06aDYBLDyZ diff --git a/Sample/app/src/main/java/com/pureix/sample/MainActivity.java b/Sample/app/src/main/java/com/pureix/sample/MainActivity.java index f7a68d4..235d77e 100644 --- a/Sample/app/src/main/java/com/pureix/sample/MainActivity.java +++ b/Sample/app/src/main/java/com/pureix/sample/MainActivity.java @@ -20,10 +20,12 @@ import com.pureix.encodinganddecodinglib.EncodingZxing; public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener { - private static final int QR_CODE = 0; - private static final int PDF_417 = 1; + private static final int QR_CODE = 0; + private static final int PDF_417 = 1; + private static final int DATA_MATRIX = 2; + private static final int AZTEC = 3; - private int currentEncoding = 0; + private int currentEncoding = 2; ImageView imageView; @@ -53,6 +55,18 @@ public class MainActivity extends AppCompatActivity .encodeToPDF417("Encoding with zxing", 500, Color.BLACK, Color.WHITE)); break; } + case DATA_MATRIX: + { + imageView.setImageBitmap(EncodingZxing + .encodeToDataMatrix("Encoding with zxing", 26, 12)); + break; + } + case AZTEC: + { + imageView.setImageBitmap(EncodingZxing + .encodeToPDF417("Encoding with zxing", 500, Color.BLACK, Color.WHITE)); + break; + } default: { Snackbar.make(view, "Error", Snackbar.LENGTH_LONG) @@ -117,10 +131,10 @@ public class MainActivity extends AppCompatActivity currentEncoding = QR_CODE; } else if (id == R.id.navPDF417) { currentEncoding = PDF_417; - } else if (id == R.id.nav_slideshow) { - + } else if (id == R.id.navDataMatrix) { + currentEncoding = DATA_MATRIX; } else if (id == R.id.nav_manage) { - + currentEncoding = AZTEC; } DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout); diff --git a/Sample/app/src/main/res/layout/content_main.xml b/Sample/app/src/main/res/layout/content_main.xml index 2609ac5..d94e0bf 100644 --- a/Sample/app/src/main/res/layout/content_main.xml +++ b/Sample/app/src/main/res/layout/content_main.xml @@ -14,9 +14,10 @@ tools:showIn="@layout/app_bar_main"> diff --git a/Sample/app/src/main/res/menu/activity_main_drawer.xml b/Sample/app/src/main/res/menu/activity_main_drawer.xml index 846b34c..62b33ec 100644 --- a/Sample/app/src/main/res/menu/activity_main_drawer.xml +++ b/Sample/app/src/main/res/menu/activity_main_drawer.xml @@ -11,9 +11,9 @@ android:icon="@android:drawable/ic_dialog_dialer" android:title="PDF 417" /> + android:title="Data Matrix" />