From be25857ede8158bfbaef4ae943b9f8f16b3e6aeb Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Tue, 7 Feb 2023 10:28:06 -0800 Subject: [PATCH 01/40] updating logo --- .github/mlb-plugins-logo.png | Bin 0 -> 41484 bytes README.md | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 .github/mlb-plugins-logo.png diff --git a/.github/mlb-plugins-logo.png b/.github/mlb-plugins-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..9392d785213d6411c91fd9ef699fc47a29aca9bf GIT binary patch literal 41484 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

Qix+Ymg{;z4?de36VkQ~+ z-Qb9H+qx!lh~&T7&&YGm_C$fP{b&jb8ZyA;5$$MkIqqML^TTKOC_s~yfD`GtxTU6r zn2OztTdn*SEH80G2@)m$(PMxae1%B0i|;=GyKQOpsot9juk>1@;?;7bk1#Mb1aA`u zz}23u*k*+`lvzbm5?WkRo?F%Q!_I)YdH}94k_3N25ntB+3qA-7b!q(UaV-mqA?qiS zs+Fy%ixoUY8&#M7g`eLW zmT7b*cjv?~kMU2pr8Xo;9o2rU_&WF+-gggM=MZ*aI>yS%OO`H7g!sEdt>a&4W#&*l zBp}&rj|u)aZzTbEJ*iS>qF`M=02Y>lOOb>Z;!F%k=5_b#eb~HgBYj=Zuy#SK=C`X?*h^CjPeT5t$1S!P|=$KQlKq6M}QA ztWoA>e&(b78xRsKHCL=8)R&6Id7yOUY!|Wae1;avmw)5Asj>=-c^1YTzpkK6(`)|vRjM0eE~5q2*vDbm`nim|3)_SLQCk>c&oQ4~ z1EDRo&}b*WGOhLKOB){f{31rU((}yb{yxn_Wa1)2xU;PXP4ztR5e&2X|LO7wKq_DL1b-(?;SAId} zb%nhk&P^uTAh#S^_Y~EX{NQnA6UzFre01XYD6fF@h zh~#AN@UzO#|Bg54eR10g`ojzd(23P=Pxe4?-Zbk`(QIa-3ep#YU0Pg{zN2v~ZtpO{ z<~uBh*jcu6GONZRcyhj^K{C!n$FxWnKsMXy=JE5({G}c_izU{ZZygyn3yYe&N3h)1 z+;maCfP+&I7@65W(}~lz@bZG+6FVaOURmr}#?3GstBrKr-n7rSKgb0xIH6oqikx_> znTj~KagmzP@jE~&_7|JgQp=1CbRbZ{4Qo{;JwdX87>-YB61S9+C|@I>Fit&@kv4=M zv8u76R%g;1{(bpnop&i1=Q@hjK0uqs%5=#k~!ix*yP z|28XQeQ4tHCog)a=}YxzTA=@~`_X!crB5@1Bx1D!jad0sP`}n2MvyGXLFe}n*%TxY zi(!|KXKT~K?^uSUQ#PJhq;G+)2e;%?S$02Akdgd*HaOF;geA1-`q3gY94Y81Eco;6 z@Jvl zI=eK}^?;ix1$(HmP8EZy)_9J*oVD&q(WhoJU95;WCFK4`?k777u!q$-k1C}|S8XVS z>ceB>G1_vBuIyJ4UBd>oZLUE+!lU5}uKH8l8h}h7`CLASY=M`ZNe5)F1HvX3m&DjG z4NUG|0?;6knK>G9>g4iuUU-LIeRwkdyk}H?+P3L=|L1Rr0zPoxTKuKZ%fHxKZf#EZ zQ8ZYAVIsndI5pIRh&Bj(sd}B0$pTA4Tte+$NutAFdDfl&D)+h!{_vnG!;ygOOWIOP zkk_pL%rL8MT_UgHn1DT8-f-GJrsHn(pC9eXhJ<2Ua#UH( z@RV&{B(n~cFin*$I;kwky1W$OnVzNJtSQx%{NhFlr)l}J^j#oI$ga6%w%a9Z8lSs) zubV)o&nI9R8aOKKr@!s`>H!>5P}UAvIVvp84Igb#-KN(TzW+rRbaom3k3#a*;zhL~ zm|dGT!-26q!_iD$5tx`3?V7JJhxRolNCQ5wEsJ7A)7wBhZfkg+m<_qY0qtWLN(HU zXc*&97BlHE_1Db6#uxG{3qxZjQT&%MgSjF$P{ne!!&XT2P40hX zck1+$v5ZT}xpHc@mg#mT4+yQ~88eg@87hfkgVvX9JVIuRZeZv#e1~GaPpOd1(!iMU zqJV1U%J5)rAeYzrK;AEzR~T-v1$s`BrOSbyOJi&Fp0Hl7n9+~_;Y)1^;t|v1hMXA1 zS*s?(M=?4+bXg)n;m={vd#i9Kz+@l)OF( zaAznDgdrc`J^fkF)L$ZayGIhOZ`Qik%+Yp|uprufFQB2!1xBXc>@rm}>Hw04yqpq{8AX_VRqm>RBviCT4Nf={VFtqo ze@$~Nl*=pgF<{Cg$9tm}!<5UW0e5(IOi`D{J=lg2S`D#Xd#|}`Wl7mq1UKirw{H&2 z#cNj^T7v}d2k%F=kK?vhI^~y>#nf)ypVHzF?`!bp(2K!xbpG9g*TFgG!TjYeXXfA# zTmU}E1h>)u%cVdjf@H9ERZi94<}an*V#x02v4m@+!2uFh5a9=}ep{EDf$TD;#+2A= zN$2dsDRmc9L|lIMxA@vnire(49#^+*uFHdP2@J>XVR$#YNV8Rx;sy9|a&=ZzR25gS zr^z?L1}S>DyDa1#8D5Gm3drgyEg4%=?prfIM1L~&hKr7(KF>U_^juUK5%j3?x_gUS zO9T$v1#*>M-unev4XQo@BExtuggq?Z4i3Pjtj1Q9xseFgFOYX@!@;=#ZM^gEVWR)h zjgZI{;;WX-m6o9Lad&Tjb9m6`@8Uh`lk2UYdEg(DDO#2+pr&OoI51J$K-0d#XZ;=o zp~SfTb#bsb;>q@kN$-Tv;3+>28+cVa^B5Cvsb2NIJtu}|EbjYc2yH@{de5ZF`35J) zFpcEUkVc28m*(EpD|~1pJ#nbRro4?sAvP9Hwf8AIyy7NYGBWwezU|?{$q~2ak?&ab?OfKnFMR-jC)=efM?2Ig$pEZC zcKO!drextj$NgT679R0}Emxga`Kx#HQ-p%kXxc+oo5^Lannys0yX=yjQ!Cz4($c>T^8c4L zsGhQtRA`dnnAdq;OPX3UaXE=?`Jv1X5JC2b)Ak@cueSDBP)soMTaUp6KGu;wz~E)= z*J}$&x)LszDmUS44iLV^>@VKZQoqLu)?Uw?cDQ-JZjn%~JLY8e4iOux=Awpf{`QZO zZo`Z;IYj!5OYh}!+I+-oRs^HH0VBX7pIL|sM1^AI{R!!>*pScaiU)}UO1=)Zd?{}*^5ZvPgNVRhUMv}&W zVPo{KQz-;CE%X~i1g7xfdjm=pfRm<;s*ItHGmaV7YWm^-g(qBBx+yCPK}ywlkdN0* zwS1`;o3YtI7-^qpv@s^ApS#UxEKD&AmDO+U@`v@}+Y=AT#E8=!E|6uUz5hl_OJlUP zAY;6S;fHzMeWTWHZU2jxW0Nq~X_LllVTr7}P5M$xK_zy$hnXArpxu3Q3g({4s6Z6t zYKVt0+7WAEMD^u$A&8f#{5l`{zO6k!Ru9|ByqXC*2y{ciHOnWK2SiR_imS)GYhiLo z$-9KIw7XM%h$ywgdbJPqYkxqRQCtLH-a|mZ92uK&%SuknBu%B2=2-fN$vM_s#pT2V zwWpV`Kl}M(^lf?I#opp*dY_DOXH+^FXBv;a)0$|EQ96%HkZ(>*_TMHr3A95a{TR^U zGPnJl&?CbuM&#Dz?TBgoZ-pYQsQdx?=#|ROwFE7em1?rYqy;)Rz(2ONCslN`Cy(;H zL-hwiP^zGf-r?jonWwiPRV1Ob>fSJavV%E$z1m4);^XnH;KAuDK}}`N02o(XTml9y z9xo|`I1(dLoQ9SLp^fK*#GAkAHH38gobvMWy%T=7|88GkCB%&{yGIO&^}Q8A@W;YV zlvmf5RFNU_?(_*GX7vlII=U|0-5YJH-)cktF`HtQA8YoMJm;vLL{>bEnQE@dC-ecL zrLfGd*NAyEUEn+K>-+;M-{XF!yq@`~{)5cCMS_B>L*c{;fTr3xmX7{<{uQ zp!Eo_&c^~YtKlVUCnfL+(j&@6A24pIRu7W@PDk+qaabfs>Jwn1t&!0NV-)~@$n$>> z3(3tE`+YiXTVtx5fix^8)qind=$zl(ecU5mFELeV3Sp0^18+Lra2_`?7?~|PMm?yfbqWPwM=V^27L?h2QwubF zST}KUZkVv|K**1)W*Qbgyt^#CJDwU_g5)d**^MY%E^G3fJaQ|lDvVs)mtaZcDy&cJ z%9q&n2b*cH!P&x0FQ+=mX0%ys*9;?wnpQ=?d>Vv6hl-0+h?&6GE+K zl_}S~bwzb^;!-qNiwwH)BqsTuIDA{|=u(z>GeCk#shU<~d{VI{`Y(}gL!C>NYpuHnYC&o{I+Gu!Q?Z+^77?P zz`p*lm`&?WhilNlitljRykkJN*m#9Uuwe-#RNuUysjY|%3Js=si-ML({U8(t%+I(^ z?&CJ^;i_|XH1Fm+L{S74^$%k*Eph z;rB>sNT@Z(Sf8LKXCd#J(x$+16!ae$9?}r> zdT&Hg1`E_-0EhlvAANDBr@_ke0j^6P&*$fu`kOKVXu-9Ap?w+`x!v|Av*?eI{RNDO zs^pxSl7xnmcRY(Mxt>T^?=f!}NOKp50`|Jpc}!`}E8D)*|I9Ql5ro#%w3K7w?}F3x z>(zMoUhPI7*oWAIMbo?(`ChN{Pk$WOe2X}WW%hGV#DE@Jk6Ii3m2D`)EK@(LGcw~) z7DC6HJqu8w{@Nrqz%+R^?!=T^*lGOEVfTyz(ClsgGy(6;7{?oTo;_(CZ9>#mB5C3o z`wst#h=#I(7I1l)s%c~LvPl_H?b}?ZVO2~|EHWdx+UwASaHcNPl&)UMhOq+5WJ&iA zQ-J%j|H2K-RS`LQK3eU4Y*0*!HZ%&&m|~g-9aS;i=_2CInFrFPe3_;zKDJ7|Q$u>; z*6^UzDC}^ba4LBE;@TY8pgLQO{T2ltC`g!p+2+AQYDRLi-R5DF#x?aY!Krzw0?R40 zsCqG@qcZy(Pf9zxBIywAaQnDQX2nNzp%*28;=PQ|%tq+@hwq83GQ+zxu31xYu|Z zLxx$EiFQqJ`O`)9WxyB-Dw+}ixte`hhuE5V1Il9laq()|^-^jQyqfQG2cKClnu4H1 zxX{Q;aUU$tJwD|{_pdL^$vg>X_+kh`ksN)Lp1fb#)Jx};P7k(5n!Sq2>wsWP21p)T z58Y!hCZfN3z02EImjZ%$b|4=pQ?LEbPQX#?-eWp6)GuqmoV04w)cs7CW9B?jZ=}RI zQ9-Bi+j(lGK@awvF&_c55P$~={(bl`IZ=T+K;^PVj*t&0vP12hZix_0lJ{*VPG*w# z_b~~ny5?h9S9~axj9Ey&8<;A{s}C=Pt5tcPyZf&Fy%xwfoG+MP^G}&VQNmw^(z}gaA`7hO41f z@S{j@MB6OD3cx~*-WE_JrX~+%nOVs(nU@*kQ|d8f4PPP2vRT87Gm(rP#D%rODx~y%G3J|$=7JW8k*>>+N&phwtRJR zn`rH&WqMjpP!j+YtVlqb+vxPNoDf7PtVH9+NlPbv8?JcEiL=Ym*9evs6q-{jb1$f8 zt$v3cq!R1hDfLI@VK?xPuRue`_y;?1Gd6+UgJOjda10d}r)TFbQ;Rd7WddN?(g8Ig z7RVtin~P+>6{y^`OnF$13BYd0>^QD%_W}JBA`n7r6E6qtF$o1dzhxXICp)uEHAVDv zc`=e!Ah`~z-FUQeS6#YgxZPp62;OUDc-<+~&04jr^WZS*$(WqCm8qD>CVuQ3o6KYV zV&*{?n0jdkN{@v7_#vLjH1$8W8MRXe4+Y$}V28s8xcZ+^-m>tb6anc1uh=FluwuYF zuS2dK%*)*#2Kzq^R}Ym{@4|t2BwEqOWE`x{)-9yR*d_n0uP^_~kIZm_8aVP{l7zD% zXTlo~k6qY7L2GO5A;jd0Fx+2C4RG`#Vq)xo6aq-~*;njzwTdM~p^rF3qCieR!Y50} zpOnlaEnL)DxO4h5UFm2zN(O9czxlKMU)^8Xj(5m!jKWkt8DLJExcD>sc4Sm=7uvxE z3HcoTo_H28FXN{28hhpxZY;*t_%Rez&|xjVFZ>BP8^$C)yCDG2J8XszO6?A3;~ix~ z+o#twm1U+6Ir(RoF10)JRL>YK_rR%7Q1%$MT9c&NrdRI{rr5YG$@4Q`YI<-zYJ&BV ztSm-Hzj>_z7|UUyr(~-HXp`=;)!(~_iu$CX(h_#bCxt*%rJZY{PTU&gwNrFR@I?;g zhdh*9DxhoIxO?W7TjL!|e3!ksy#eLZ8`XF(ym0S4EN~&@aa-1jDJ=+PMJwMFadu=q zl6~&KlM+;Z9Sl?9dRbhq6*ZUwA>*99+!*0p)=VgV^E%l~T!Uv{?>K?Z{?FL9W`s6b z6@FgUm~)S@`~;rt!JU{f+0GdH3&*eZot`7^8F$_l`Ao)W29FtL;>w?7dpAUHZV+FJ zz}3}fZ1hIo|89_J%0kaviA;^JvKRZJ!CkQt_UW)Nws;JeQO{qH=`<8;L4YKl{S@SK z(&9I7qf2vmPNsnBW9u^Gp-*J0vC-sHDt^AxYD>It8||FoCY_{)2AvKXdZZY)hsELh z7p+P69vNfxh{Y;<%~n5PdR{_q5wGz!xIn}Gf=>osh_`1H%nP)LBLny`KiQrqwUq?4IO#Z z)-->d+7P_E`J;n0B4nBXL^`xvDl=F2^UxHx{j0U?z(ei4Jcvi|tb?!mj{c#_91%)6 z;}VY(VPK*6y%aJsvPR>zg|Lw^oerpBwQ>E{9UMir6M^w$q{JnSK9edz@Nia0Fl*DA2YFwN{)=F{W<19|H}?oa$r$% z;?mV!N5(KcHGoZkMd@JU|eojq@bAB)!+s1`%&mg0|H1U5myNU3ABUU^FMo^ z=?D`P0iViUDxlGvV-djH1}+N&^dbf*fepsk(!xc5_kQm;i=p`vmC}!}PS>2J< z>id)0s&o_V$MA%VMvBdbid)pIgB(N4Rm!H5SH6kHSI#wet z(F`+hDf`bfFvd=oq5Bawpf$n={20(oas#1NP7zlt_xk{~mSOlModeOAH+!&yA@k1p zobq$R`cqcbP}^U2M;8GRi-*leGQJPRKZgf0(_ggkE^>RE>{1?)a91TxQAMs_1|nX0 znPZUOdr>&J8b1ehow5osAW`w^kO#|sEHd(6+yu7ss;F$VBK}3&9f^73r}y3039LaG zn$se%`Ql2{!q|=sh76y(3GL8m?8C?DgU+_|!`qc_lW1fyT`8Njfy!XP-U~x82Zx%( z`Y7YnX3*c@Dn{>kqkR{O%2|(*5)OZTE#_^F`c6C_(yS6K1IaH+?!<%EfE0OH)v$V4 z)58=K&GV*#J3=&PF`_Le!J z^Ocol7st8t%W_ht`Xe_rQAKc=B_%SHGK^~&Btb$mIHcaqI^QGYQQJOU4bVZ4UO-A=iUq)W8&!m967c;*J zezRVrh8k`yK&v3BDlpC+o!JQ|8VK#Ln&H~_ddaD-=Y-i!PVOUd2x5JX7azYcNhd64 zFvzd+yor9$<+|5*KaB1sJ;A2MbN2vudRq0opesrS1l{VQL~RHQ zQxpV;vyldpaVNF4Y=baw(rB(-7~tmGAeY`HMAcN^rK-} zS=5gu90YveMGH4iB(xNCq{N)*pK{dprF8Dt9{r@(T*2^w>jG#e5o9axEMKA1QVY}g z2Wix85}0~W$|2!yd*=hG!9YFY%bu`)drZK@Dk>}f0<}v=@PMC+A@aZZ1W$n4c#{T! zRcH?pK1?L7D~jP*{l`T^0+75KA^L--Mh1wQ zmWWL|>ed>lNu$frYbk6+dHI2utx`Cy|HK-#+%ZG?1N03C zMh68@8d_#-mHzId%NoHvB5D$Wj;y=%v9j; zdnpMw6LyQ=ej9(1-@;uz>D2s`l~rqvO}r}llGv}F|5}K){qK9PO-Iq#@sMks`uqc} zZm)5)=elalA`Fe0jGu_N6Ly$J`Fd`Dif7&q{GGsAC*A9-G9WsDWZzfve z;zySHq%*7W&Q;+05X>@1f5fz6PMl-9JNNF>hudJ$8@RFTQT+imt3^}5N>g~IpuQEs zmy%dE=$PQ^O)*G#Gv{p1?HHp!9$FGCP7bFGB$H#k>jWoppz@nsmZH>K6W*O*J6twD z7=>ZFu>bS(doGuvWXHnxfp~Sc5S*?Ws|1K%tkE87z_8J+C#V`FSu&gQOFGbhC!6}; z|H5LWYyZlGWx6-y4vG$NqHJDE>EFx_)N2f#8Twf9e&rW6)fp}O_I=S}faIH|od^=x z*H7@AynYLeYq*!h0>CoBkqqX(LjQizfFn6X3kQrQE~A2hXHm-$vegTU!Jq(seC>I4 z=M8rFNaVIAtq4a_qxm2{2I5Pw$R^s8YpTf*DKfMQvEs&v?1f^Oc zq2dGL=XwB@K92*0={lIh{*}Rk)@ZfUbqd+h*?tQ`t?ZsU5GnlV?g@b-%CPvf60)As?_uQ@dRDX^boB+rv(SD|MR$a z$5!`k{ESu02@i5;h$H1f5l~I~gp~z(D-m?Vf#HMl=X#7Lt>0pBz#zo}*gLO5B}By3 zVekrwV8Mdp@51uW|9k=Hf`O2Z_DO98YB+P;adz*;C{3O+;)@2yt9x+SD`=bwnCe9{ zZ-JL+`B^p-hHpB4bDw3vc(~)J1?`5}hk1vUSkdg$lkY`{oT^}Z`=rF-Aj1xbICpa1 zlq@5&TD&k;4!K52L`QsCtX1`X4qSN0^M8Y8> zb8TsED2aHWDEMVTb1dSDmt~x{WJaOa!_E3;{{GDNH~42ySX)98VFVF#3kKsu?@yi= zoCP~Ppn-0^dY7_4u~Jup39n`I-U{$3NoEbQsL882V$FzWXHL44f5$s;&6n@lfNY5j zJAMYZ*h%K$>IJ6LOrwB7;L-TrV`N^_6;RU6J;}~Ssp&pu3jQ2&PGlyU-7ZoD0y{B|#r9!cVRQ&mz5BNb^wNzqnIG0`a_aS{R)Dx|Vb3VfXa_AI z1H11=IJ-PI)#}v{n+B2V>2;&#S)y@(;8R=k<0*<5dv{|YFci;J~_tWyW< zMYgF+%bwU4h;~cNP{{)GBBi0Oxd+gw!GRic2tZ(8qU|}*L-TMQtdew+3av9RgGI%Y z+{{?wXX>x+)f~1rCou3OU(o;!@LJ3kkS1~EZX~G9C~C9tRzw@PDDe7BG+7UoTBtWz z(1R?k;A76bzqt&XMT6Q22H1B>!M^pYv(l!^8YeRDwk+1xOs4>L5K7DX38a$ztbi zJU|+afkFPl3rHH1Eu$T}%`vP4?!e)FH%Wm9bG5R0A*Qr0?U&*^Ov6l1It2#$CrxC$ zC1=FIGH)W@F6Ua$b;vOoBH+F&Ha1l#r-i7cNzvcq42H#)HL*6nt2DSEdkz{G=S(2V z@&yEC#dYtTZpdw~|GS-%s}yxw9nbn#t3XnkEVL<&mHKv$Sm_5NVE6;Qmu5Gjy9 zY*Ub@bSSVizdLyWKnQdDl8#%xlW_~N6j(EC8sT@Z1FFZ#(|DcJz?7}MU#H&E-~n$3 z&B$}sP+;VqAMv*?~GcXbZFCNPqZNGMHcRZQZ_BwJ!Z8|9Bk7fu&S3k7yEU?Zd8XS^p)?Ut2?ZRL{kpVom5ikTU zS>Nvuy5Q@B#c~OG|45r@Sq^n*_h$o*GEhWRLr^eefMO=0a-Jzi2dKNM&FSl%QEIOz zOyQI3Oy8M;E6fLsfGQ2$Kohx8=GA}I7q#)JdFHK-xEdfLOPOv4g}`2NjP+x@h*(lQ z+N_~X%>m2x3H6^OsO~=0VEGZ0nKOaJ0(k15DBp?dej$jE&6cf5lN0yY>p-xc2O5@W3tO!1!VBxQfi#Q3{4^!tAwT$??(z5`q zki1O;G(Km+UL#O?OgPe|PTY3<^V7GLkV+3vT`KWpg*#voRMM-=#{zi!W!8qL)KJ5B z{V2E41iSTr-lO5Q^}oG4{1aFUL3NfpUWL7u#i6{i5M^#!c*xRpMdwQrx(<;wM4hi1 z`(C=xyJrjV&4CdO(`bK>cMtcoKX9d9{H z)_G2JCr*B4%(AA!4P!C8wb2WRQ4@a9mX~fKm1a@~)AV!aG&ja07g#qC_PMw4D9R22 znXAOb(c154ecP6mR8a;yFe{_GvJ=oGWs}>FE^xkSA0GwO2HU;g23{NhL;D+d!{fNV z3m+HZM#wwOXQABPoex!T$>16b>$1N5bGe*EaE(fSZNvj*23(3+*ZS5*104gsk<6ZH zimRZMTK~0F1a5qsLPD5wXg~Rn&=9lq?q}oNLuRa-xYw+2@x{eNclRyiG!7hGa?~5# ziTIa@dShpJs6^OUgnVq}G_QHAG9!I+$ZtFtWwbZnpSZR&lJ7tDKyanMk#nSnYUiE* z!S@s(SxUF2zbt2l^502z&ke8h2?`YS=-b0vLw7eGW6YsB2MW=-gto!Ubbw>4#_*M5QOu|fp7g$JkYptI;#98B5zv!Ecnhs~Ny(!B2?wG#h#ugz|vOqvB zd~c9xnjuUi1Ernxnqx$hPL9+ zwq=FcNWchIVuH+-Cx#5HnRSDfaCOFJ(CqNfLpbfnd)bODrcFWXox*K&nmxsf4uX#N4f}A+auUvD6VIZEd z#uawnZS}^xF1snMEFa>^D+KYt6eW)Y7AKByH;Xdg*`~mY!$>O8yyV)fV?~8F1ij_{r+zq@B5%apqU3~Xj zjNqo;<<9|aS3u}8D#}^=#E)?3+S5bltbURtdFG*f8za%b$7VFx8=`^vvJyyb$px>| zOwP@X1XH{M63%qRpoTTY(M zqIY2l(N_tgtn$@s5IxH3v0?RIqIZc1L6k%Z(Ia|@=tS9#vU)GS>wWKYpZnLGnVmUj zKBvq%v#LFhKA0KnX;>xsQkeaIFt*U!E-yEFbx}LZGy0>e(y!|_dybU93)W5JkxM@7 zK*R3&C15oUR#y2Z^8yKjTW=|F*XNfBVsmNzK-3yI^{)e!R%*v!uQQ_BOosBT|NN+b zi*=f`o{@M(MyCf@qBr$LuNw4>^fm3Yn5#D2fml9}dg`%p zAiLKxYvd+GxfsP;)}s(01>I_5TI&m)^CWPt^Q%eyipbG9cqQBS(M0O|D{|xZcWZT^ zT`-FwkLUw|>7iU<;uA{ z=v73f{L<=wa`jIi2fYp2o^531)N~n0cUgD~_gy>9{VQk`ynXF1COX`5+&T<**uGWy zUmbz{eyIcc+4JR^7)HwUIj)n(N6uxWVe?fIgZ~iicT<=i8cY8z>jVX=9#N8vSn)eO zpe8wZIU%Q`Os_8O@*;;rABNhGTM%ei*LWx6EP9m7&_W4(;gcoA{ z8A90io=*z3gwr(x1G-^qn0yk;X1aP*^Yl$@SB>Ff<&9ybl$1`n)M8xCLTU!`-AsMJ z*J=0h7LiQN@#-IgN)Xun9C?^f{QQsvy6lMSy_3Q~W(IC+#4}A1m5h{%4a=qs|AeGz zW!#BBB5YdHMb{Y7C;Sg&9^ciAd=nplW8-N4fJ!lAL+4MDl&A+ zxEy~7QLjHO=Rm2oS`H7b0Q zN{{KgPEH`y(XTJQv-j1KYI-QFnU6);VKIMl&X&0P`o4b3XS_(x#)MW8N?ESUwvXnlzZ;H~H}_1p}%$ z6&>HB)&UleJI^#>G^EznoBtAU=F{%8n5(>J5J;s_{ZY|13kmV)EVlau3wB`Aif?!; zBizu~OxUuq0(2yk_aa-qv8wUO8JYs|L1_Pym%`t)E& z@k%KP@5aW04_h+7K8VfG#T+VhCaG~_9VcAV!ZBy*)9Y=E6P4^5#O6pzdUoo>lJd_L z_hM8==jJO7zEm3M=*LbtyN$zdYb1XVU$tSRysc+&SU~{>{WSXok&+f;ZeMvZAzmI| zc=Suy`?G{u{St^P65AT$t&cPnT^8ON`bY(plkvua1EKL9?&DVS`;Qz1L4%Zh*lm|= zpIOOf3F7WP!&XmEXGhFmalbb%2bE8p>A06%P=hLXB&sNYy ztMr}iz{g24BOLSEcIdRmp4j-uO}_%ay{Jf%xg2UhDaQ#j!;+2$@pce`f1_~4uR>;a zrHb!(E)FMkQVgj6EVbdf=~6bVxT#5`TT^wq2? zL}?F=?=%ma`L&8SIg9MUdH}o@^WPBv_=r=c^TYj~Zmr0${=FPl5Pjw@*x?alR6%j6 z?g!7Gi#~WR1L}j=d8x5DCG;DO^x}6bWiPIS9SiQ{O^@&V&R66XA}~&`vF+xW_3WK9 z3OP5^qad@g{lt3cpj}YfQH--G!ExRvUAl}b$%4gBb0h2G4)_iML=bA+P$ggw)E>xc zHDiXvCO8=hqm#?3OI}xJ{Pg2ZX9r!+(56pUKJS1fF`}{!8UIkBFvdEcSDv zh$)sfD4NMONxYg%J1ZI>sqW7n;NIMC!9bge?Pomd>o3f zfCulq2yR$dY{K<{wi}P}97V^UD}lrv@xO`e>9WCBCk{@YUN0NfsW0IKGKnv4+r^|? zj?bCudJJ&=mY<)9)hCF6Sw96;>U&JEjVGidhszv>S~%p&c- zf&Km8d|Fv?G)QKcN?<)-frM5EzBrCq$W>E%!Uge7E+D=&;zQ{tP0dY+F5_^R$z~GS zi=y31;vuk@gcFb7juMkD;i2tSbf}#;-kv4HMAlcn0Os@66c0kQa7%C~bnYjF7^aAN z7@_X_7y7Q57UWw!u8?7tyeSrZ!CVp!Q+&Y%nV%t2i+`)5oCSU%)+?;A0p+RsYAV! zh98xQN+DirgR(ZLb<63cGLBBaiu-aLi5eSU`L&+JI{RgD+5FK=wlyk?4|EvkD7xM? zls2CP`lJK;jKB~jT_9m&2WXwb3P<;R#mD!@YWZx85y_mXsY4TRl{5C(WT6lQo?bIx z*4q{aXfYL%&!!t+qp2gSkH}N~{@WOfwIeR9P~)TqESU~@i^h46v2@PS^;T7j6}@;- zC@_fA`sJ#2DE8gttKuY~z{5H?MT)Rb&6>)cXRTgDT5ZzYq>}jY;(ILu<%)P3J}E!~ zbeetfh7VFMgdkaN-$`Q=zFSyObcDyzXV-iOjGS0*G>|_u2_S zf?UN%eLJA6mRG<(-cE^GCqZtXebo*4XD0Rw$sr_M#dZ!HLDT-5dhN1J?rvz=gN zWr7piRy z28;PQ`G-FmU^Ls}-3ZS^BVR50BZ^X8wi#I%=;Ui@P%Co(Eg6@wZ73a;pMk?=|kYQ zJ&i7_Ci<1%C?vAY@Z2xLFeZbBr{)V(4&n30MrVs<;bvU{zfQ>!V-|#|$>I7D;4}B_ zUqEs0QY*{PDNN}1WT_kAP31Q!^1W|Hwb-au7O*ityHM#%mu}vKv&`5vkUk3CQLB~A zXcH{tc68k-*xn@3jNNx3w0Ge|7_|h7lg6kY#24MIsGq7lp7?sSD@o$R;3_@!`NCi* zh#HX(gV`NFd41Q$9honm(nwk3$Z3#a$M+~bqdL6bb`q|lPNkbxDnI}HyoapCDn=_N zo6<*lUcGlfq<`kA8g8!>a5IK-1Hk~tgBe2^(kHUQCpIKrmu&iFKPU>?Yl&WXfBx+< zuuGu1Xwy&p)5cnr^iF!eOIx=5qg;oo3ZN2sS|@0kTiS%NkQ$|HCOx$ejudPl(4zqSG(01h4rqe&Q;?anV5h5@2=|T)aZGW+3?{s8JXnWB|F)wd>xtt zZ%ql-^`Jutv466NX#DG<=aqAQV9ho1>Az30>~AH`d2_#wz)3|Zfkms#^?#||XNn69 z<;1b-9ja}WqIHBve#cD%g(2^y-T-zH#2|w^)-0vvLc!&00Iy~(0?#cO8>;Rce<)Es zaGE!7oLK|NOBD$fiACvOi>Obz5Ji+d11s}WVC@~^kwx|Wk(QxIIioXEAW_HVNCuiT zuUkbHmX{@1eF~8){9YBgYwB7?2CPb4^f~KSX7%NeH_%4hTV>s4?3Rf{ZxMM48wC%3L;o`kzUh4MVHx3c{=8ZyAQAR>ZpTTG#^ll@}OC_A64lM$z zvPp_~F+N3rTVj9VwZ4${US0`2$_R4!f=#Eww~QCKT#BBF;rmn{IKT?HS_t^vKF!RA zrUI3d_l>+<0OwLDn_s%j4z;o6$g39x5)VW3!1QUOsa0iIB8$2Tx|T7$#S9+SB2>hP z#eAQ6i`{%cjjpM7W|jf_I%^+L`%_JqxsNS2o{%%jzYlbPz0kveE-!}Ig@lL}wP z^eCWngzgPEf}VV_-ygbXU~r)Xia8we=Fn$@#;8C?MD`g5(z0*=Vsi+?F*8woD zZg-rQ@4Zagkm6BM5viKreR(6iOl-{^s4f)kHkk2pHQ4pB5$TRPSmUc`^%e=i$MiF*-S5@P-*EDQC$rw4QoWifTL>42CXTnxI3T-b^0P(0TsgWtRwvdG&?`uTsxKIxh z;%ya1?ZhlT!{?=G9SijqY=op$RM_5|2#wjXuopEvt;h-Kp#W>#1NOt%_g~PWa1dqH z+}>g&t-&QJ(G?UrOD{UtZLOpFEx%sZj73Qmuf=-<~$~$SlXydIMF^8m4U=L$^T|^R=s^ z)yMCaz-pLpH0}1SUc%{gkad{jw{Cm?wxhUvX9S@)6ukgNz>PNvItOj?E;M-2(xCL; zS%YDQ*xa}pefA<0^?`;J)zJI09AU+!vT%kUznHcp2?FZ^HxwIFvZfyCZ$hCO2SYuX zlb8aKH@QNKfa%Zb8+66yM%6HNXn{rf7G}JY9pM^2QWDH|F>A!d%337D^=Hc-rWFw&TRs0XXq4+=z6=3 zh9mZtzACgHG!a%}5;LK13aF!}t;NFWJQqC!BIbjp0nMNb&wqCs+^&=B`5%8$A$}RE zBN^I-3YCDct>Lm$8EC0!*n~9O3t$Jge%-Ll`#l@kaD2Jv{ z%t3s6?bI~CMW3GVXMIQwc|oa8w+NI!0_p|IBBU;b>hr*Uj$a1c5V2McN-uMrISZropP9AB~p*y*u zTvk*yXoJ2_@<|^#KRC4xc$nY=V}*~}Zd!(3gM(P|#p8{bEI`16P=2OVrC|B`e=3A8 A7ytkO literal 0 HcmV?d00001 diff --git a/README.md b/README.md index e60df31e..0f760b4f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@


- Mapbox Plugins + Mapbox Plugins

Plugins are single-purpose libraries built on top of the Mapbox Maps SDK for Android that you can include in your apps like any other Android dependency

@@ -17,11 +17,11 @@ Plugins are single-purpose libraries built on top of the [Mapbox Maps SDK for Android](https://www.mapbox.com/android-docs/) that you can include in your apps like any other Android dependency. You'll find [documentation for each plugin on our Android documentation website](https://www.mapbox.com/android-docs/plugins/overview/). A full list of the current plugins is available below. ## Available Plugins - + * [**Annotation:** Simplify the way to set and adjust the visual properties of annotations on a map.](https://github.com/maplibre/maplibre-plugins-android/tree/master/plugin-annotation) * [**MarkerView:** Add map markers that are Android views.](https://github.com/maplibre/maplibre-plugins-android/tree/master/plugin-markerview) - + * [**Traffic:** Adds a real-time traffic layer to any Mapbox base map.](https://github.com/maplibre/maplibre-plugins-android/tree/master/plugin-traffic) * [**Location layer:** [Deprecated] Add a location marker on your map indicating the user's location.](https://github.com/maplibre/maplibre-plugins-android/tree/master/plugin-locationlayer) From 9858eed61906d74000c3e5f9dcfb9d52acd94a53 Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Tue, 7 Feb 2023 10:29:54 -0800 Subject: [PATCH 02/40] simple text changes README --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 0f760b4f..53c074dd 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@


- Mapbox Plugins + MapLibre Plugins

-

Plugins are single-purpose libraries built on top of the Mapbox Maps SDK for Android that you can include in your apps like any other Android dependency

+

Plugins are single-purpose libraries built on top of the MapLibre Maps SDK for Android that you can include in your apps like any other Android dependency

@@ -14,7 +14,7 @@ # MapLibre Plugins for Android -Plugins are single-purpose libraries built on top of the [Mapbox Maps SDK for Android](https://www.mapbox.com/android-docs/) that you can include in your apps like any other Android dependency. You'll find [documentation for each plugin on our Android documentation website](https://www.mapbox.com/android-docs/plugins/overview/). A full list of the current plugins is available below. +Plugins are single-purpose libraries built on top of the [MapLibre Maps SDK for Android](https://www.mapbox.com/android-docs/) that you can include in your apps like any other Android dependency. You'll find [documentation for each plugin on our Android documentation website](https://www.mapbox.com/android-docs/plugins/overview/). A full list of the current plugins is available below. ## Available Plugins @@ -22,7 +22,7 @@ Plugins are single-purpose libraries built on top of the [Mapbox Maps SDK for An * [**MarkerView:** Add map markers that are Android views.](https://github.com/maplibre/maplibre-plugins-android/tree/master/plugin-markerview) -* [**Traffic:** Adds a real-time traffic layer to any Mapbox base map.](https://github.com/maplibre/maplibre-plugins-android/tree/master/plugin-traffic) +* [**Traffic:** Adds a real-time traffic layer to any MapLibre base map.](https://github.com/maplibre/maplibre-plugins-android/tree/master/plugin-traffic) * [**Location layer:** [Deprecated] Add a location marker on your map indicating the user's location.](https://github.com/maplibre/maplibre-plugins-android/tree/master/plugin-locationlayer) @@ -38,7 +38,7 @@ Plugins are single-purpose libraries built on top of the [Mapbox Maps SDK for An ## Installing a plugin -By using a plugin, you also have to include the Mapbox Maps SDK for Android which means that you'll need to setup your project to use the Maps SDK if you haven't already. Head over to the [overview page for the Maps SDK](https://www.mapbox.com/android-docs/map-sdk/overview/) to learn more. +By using a plugin, you also have to include the MapLibre Maps SDK for Android which means that you'll need to setup your project to use the Maps SDK if you haven't already. Head over to the [overview page for the Maps SDK](https://www.mapbox.com/android-docs/map-sdk/overview/) to learn more. Note that depending on the plugin you add, there might be required permissions and additional setup steps. You'll find more information on whether or not more configuration steps are involved when looking at the specific plugin documentation. @@ -73,11 +73,11 @@ Plugin artifacts are versioned based on the major release of the Maps SDK for An ## Maps SDK compatibility -The Mapbox Plugins for Android are heavily dependent on the major semantic versioning number of the Maps SDK. They either won't compile or hide runtime bugs when paired with a different major version of the Maps SDK. Each plugin's dependency name has a `vX` suffix which states the major version of the Maps SDK that the plugin is compatible with. This suffix makes the transition between versions easier and more educated without the need to jump into changelogs and compare repositories. +The MapLibre Plugins for Android are heavily dependent on the major semantic versioning number of the Maps SDK. They either won't compile or hide runtime bugs when paired with a different major version of the Maps SDK. Each plugin's dependency name has a `vX` suffix which states the major version of the Maps SDK that the plugin is compatible with. This suffix makes the transition between versions easier and more educated without the need to jump into changelogs and compare repositories. ## Help and Usage -A plugin is simply a library module built on top of the Mapbox Maps SDK for Android. Plugins can be easy to use. Currently, we are not requiring plugins to register themselves or to implement any specific interfaces so that they're simple to consume. +A plugin is simply a library module built on top of the MapLibre Maps SDK for Android. Plugins can be easy to use. Currently, we are not requiring plugins to register themselves or to implement any specific interfaces so that they're simple to consume. ### Test app @@ -91,8 +91,8 @@ This might change in the future as we build more plugins and learn how you use t Splitting specific functionality into plugins makes our Maps SDK lighter and nimble for you to use, and it also lets us iterate faster. We can release plugins more often than the SDK, which requires a slower pace due to its larger codebase. -The Mapbox Android team creates plugins but this plugins repository is an open-source project similar to the various Mapbox SDKs for Android. -Plugins' lightweight nature makes them much easier for you and anyone else to contribute rather than trying to add the same feature to the more robust Maps SDK. The Mapbox team can also more easily accept contributed plugins and keep the plugin list growing. +The MapLibre Android team creates plugins but this plugins repository is an open-source project similar to the various MapLibre SDKs for Android. +Plugins' lightweight nature makes them much easier for you and anyone else to contribute rather than trying to add the same feature to the more robust Maps SDK. The MapLibre team can also more easily accept contributed plugins and keep the plugin list growing. ## Contributing From 9c1b1c4612e26d956ac86bfd767ddc15b07bcf2f Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Tue, 7 Feb 2023 10:33:13 -0800 Subject: [PATCH 03/40] simple text changes plugin READMEs --- plugin-annotation/README.md | 6 +++--- plugin-building/README.md | 6 +++--- plugin-localization/README.md | 8 ++++---- plugin-markerview/README.md | 8 ++++---- plugin-offline/README.md | 6 +++--- plugin-scalebar/README.md | 8 ++++---- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/plugin-annotation/README.md b/plugin-annotation/README.md index 24ddf537..30fe207c 100644 --- a/plugin-annotation/README.md +++ b/plugin-annotation/README.md @@ -1,4 +1,4 @@ -# Mapbox annotation plugin +# MapLibre annotation plugin ![annotations-plugin](https://user-images.githubusercontent.com/2151639/44861322-945d5e00-ac78-11e8-8ccb-883a4a743bcf.gif) @@ -66,8 +66,8 @@ We'd love to [hear your feedback](https://github.com/mapbox/mapbox-plugins-andro Splitting specific functionality into plugins makes our Map SDK lighter and nimble for you to use, and it also lets us iterate faster. We can release plugins more often than the SDK, which requires a slower pace due to its larger codebase. -The Mapbox Android team creates plugins but this plugins repository is an open-source project similar to the various Mapbox SDKs for Android. -Plugins' lightweight nature makes them much easier for you and anyone else to contribute rather than trying to add the same feature to the more robust Map SDK. The Mapbox team can also more easily accept contributed plugins and keep the plugin list growing. +The MapLibre Android team creates plugins but this plugins repository is an open-source project similar to the various MapLibre SDKs for Android. +Plugins' lightweight nature makes them much easier for you and anyone else to contribute rather than trying to add the same feature to the more robust Map SDK. The MapLibre team can also more easily accept contributed plugins and keep the plugin list growing. ## Contributing diff --git a/plugin-building/README.md b/plugin-building/README.md index d370bae1..c37b35c9 100644 --- a/plugin-building/README.md +++ b/plugin-building/README.md @@ -1,4 +1,4 @@ -# Mapbox Building Plugin +# MapLibre Building Plugin ![buildings-plugin](https://user-images.githubusercontent.com/4394910/28844435-71442d04-76b9-11e7-8866-ee6a94306353.gif) @@ -55,8 +55,8 @@ We'd love to [hear your feedback](https://github.com/mapbox/mapbox-plugins-andro Splitting specific functionality into plugins makes our Map SDK lighter and nimble for you to use, and it also lets us iterate faster. We can release plugins more often than the SDK, which requires a slower pace due to its larger codebase. -The Mapbox Android team creates plugins but this plugins repository is an open-source project similar to the various Mapbox SDKs for Android. -Plugins' lightweight nature makes them much easier for you and anyone else to contribute rather than trying to add the same feature to the more robust Map SDK. The Mapbox team can also more easily accept contributed plugins and keep the plugin list growing. +The MapLibre Android team creates plugins but this plugins repository is an open-source project similar to the various MapLibre SDKs for Android. +Plugins' lightweight nature makes them much easier for you and anyone else to contribute rather than trying to add the same feature to the more robust Map SDK. The MapLibre team can also more easily accept contributed plugins and keep the plugin list growing. ## Contributing diff --git a/plugin-localization/README.md b/plugin-localization/README.md index d83fcd44..7c5e1d78 100644 --- a/plugin-localization/README.md +++ b/plugin-localization/README.md @@ -1,4 +1,4 @@ -# Mapbox Localization Plugin +# MapLibre Localization Plugin ![localization plugin](https://user-images.githubusercontent.com/4394910/35408667-d7689174-01c4-11e8-8bdb-e580df77d90b.gif) @@ -46,7 +46,7 @@ dependencies { - [In this repo's test app](https://github.com/mapbox/mapbox-plugins-android/blob/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/localization/LocalizationActivity.kt) -- [In the Mapbox Android demo app](https://github.com/mapbox/mapbox-android-demo/blob/master/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/LocalizationPluginActivity.java) – (Don't have the app? [Download it on Google Play](https://play.google.com/store/apps/details?id=com.mapbox.mapboxandroiddemo).) +- [In the MapLibre Android demo app](https://github.com/mapbox/mapbox-android-demo/blob/master/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/LocalizationPluginActivity.java) – (Don't have the app? [Download it on Google Play](https://play.google.com/store/apps/details?id=com.mapbox.mapboxandroiddemo).) ## Help and Usage @@ -58,8 +58,8 @@ We'd love to [hear your feedback](https://github.com/mapbox/mapbox-plugins-andro Splitting specific functionality into plugins makes our Map SDK lighter and nimble for you to use, and it also lets us iterate faster. We can release plugins more often than the SDK, which requires a slower pace due to its larger codebase. -The Mapbox Android team creates plugins but this plugins repository is an open-source project similar to the various Mapbox SDKs for Android. -Plugins' lightweight nature makes them much easier for you and anyone else to contribute rather than trying to add the same feature to the more robust Map SDK. The Mapbox team can also more easily accept contributed plugins and keep the plugin list growing. +The MapLibre Android team creates plugins but this plugins repository is an open-source project similar to the various MapLibre SDKs for Android. +Plugins' lightweight nature makes them much easier for you and anyone else to contribute rather than trying to add the same feature to the more robust Map SDK. The MapLibre team can also more easily accept contributed plugins and keep the plugin list growing. ## Contributing diff --git a/plugin-markerview/README.md b/plugin-markerview/README.md index 0dfa5f32..6b5b7cc7 100644 --- a/plugin-markerview/README.md +++ b/plugin-markerview/README.md @@ -1,4 +1,4 @@ -# Mapbox MarkerView plugin +# MapLibre MarkerView plugin ![markerview-plugin](https://user-images.githubusercontent.com/2151639/45137542-69f42f00-b1a9-11e8-854b-3335a5504337.gif) @@ -6,7 +6,7 @@ [More documentation about the plugin can be found here](https://www.mapbox.com/android-docs/plugins/overview/markerview/). -Please be aware that Android views are the less performant and less customizable option for adding icons to a map. The Mapbox Maps SDK's SymbolLayer is the recommended way to add icons. View [the Mapbox Annotation Plugin for Android](https://www.mapbox.com/android-docs/plugins/overview/annotation) for more information about using a SymbolLayer. +Please be aware that Android views are the less performant and less customizable option for adding icons to a map. The MapLibre Maps SDK's SymbolLayer is the recommended way to add icons. View [the MapLibre Annotation Plugin for Android](https://www.mapbox.com/android-docs/plugins/overview/annotation) for more information about using a SymbolLayer. To use the MarkerView plugin, you include its dependency in your `build.gradle` file. @@ -55,8 +55,8 @@ We'd love to [hear your feedback](https://github.com/mapbox/mapbox-plugins-andro Splitting specific functionality into plugins makes our Map SDK lighter and nimble for you to use, and it also lets us iterate faster. We can release plugins more often than the SDK, which requires a slower pace due to its larger codebase. -The Mapbox Android team creates plugins but this plugins repository is an open-source project similar to the various Mapbox SDKs for Android. -Plugins' lightweight nature makes them much easier for you and anyone else to contribute rather than trying to add the same feature to the more robust Map SDK. The Mapbox team can also more easily accept contributed plugins and keep the plugin list growing. +The MapLibre Android team creates plugins but this plugins repository is an open-source project similar to the various MapLibre SDKs for Android. +Plugins' lightweight nature makes them much easier for you and anyone else to contribute rather than trying to add the same feature to the more robust Map SDK. The MapLibre team can also more easily accept contributed plugins and keep the plugin list growing. ## Contributing diff --git a/plugin-offline/README.md b/plugin-offline/README.md index cec5478c..a506f883 100644 --- a/plugin-offline/README.md +++ b/plugin-offline/README.md @@ -1,4 +1,4 @@ -# Mapbox offline plugin +# MapLibre offline plugin The offline plugin automatically does the downloading and managment of map tiles for offline Android device use. _Especially_ if you're building a project for outdoors use, a user's device won't always have a strong enough internet connection to download and view map tiles. Once given the desired coordinates, zoom levels, and map style, this plugin handles the rest of the work that's required for fetching and storing map tiles for any region of the world that you want. @@ -53,8 +53,8 @@ We'd love to [hear your feedback](https://github.com/mapbox/mapbox-plugins-andro Splitting specific functionality into plugins makes our Map SDK lighter and nimble for you to use, and it also lets us iterate faster. We can release plugins more often than the SDK, which requires a slower pace due to its larger codebase. -The Mapbox Android team creates plugins but this plugins repository is an open-source project similar to the various Mapbox Android SDKs. -Plugins' lightweight nature makes them much easier for you and anyone else to contribute rather than trying to add the same feature to the more robust Map SDK. The Mapbox team can also more easily accept contributed plugins and keep the plugin list growing. +The MapLibre Android team creates plugins but this plugins repository is an open-source project similar to the various MapLibre Android SDKs. +Plugins' lightweight nature makes them much easier for you and anyone else to contribute rather than trying to add the same feature to the more robust Map SDK. The MapLibre team can also more easily accept contributed plugins and keep the plugin list growing. ## Contributing diff --git a/plugin-scalebar/README.md b/plugin-scalebar/README.md index 2993b91f..1d277618 100644 --- a/plugin-scalebar/README.md +++ b/plugin-scalebar/README.md @@ -1,4 +1,4 @@ -# Mapbox Scale Bar Plugin +# MapLibre Scale Bar Plugin The scale bar plugin adds a responsive scale bar on top of the map. The scale bar gives a visual indication of how far various map features are from one another at a certain zoom level. The scale bar can be customized with options such as the text color/size, referesh interval, margins, and border width. @@ -47,7 +47,7 @@ dependencies { This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/mapbox/mapbox-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. -Plugins are easy to use. A plugin is simply a library module built on top of the Mapbox Maps SDK for Android. Currently, we are not requiring plugins to register themselves or to implement any specific interfaces so that they're simple to consume. +Plugins are easy to use. A plugin is simply a library module built on top of the MapLibre Maps SDK for Android. Currently, we are not requiring plugins to register themselves or to implement any specific interfaces so that they're simple to consume. We'd love to [hear your feedback](https://github.com/mapbox/mapbox-plugins-android/issues) as we build more plugins and learn how you use them. @@ -55,8 +55,8 @@ We'd love to [hear your feedback](https://github.com/mapbox/mapbox-plugins-andro Splitting specific functionality into plugins makes our Maps SDK lighter and nimble for you to use, and it also lets us iterate faster. We can release plugins more often than the SDK, which requires a slower pace due to its larger codebase. -The Mapbox Android team creates plugins but this plugins repository is an open-source project similar to the various Mapbox SDKs for Android. -Plugins' lightweight nature makes them much easier for you and anyone else to contribute rather than trying to add the same feature to the more robust Maps SDK. The Mapbox team can also more easily accept contributed plugins and keep the plugin list growing. +The MapLibre Android team creates plugins but this plugins repository is an open-source project similar to the various MapLibre SDKs for Android. +Plugins' lightweight nature makes them much easier for you and anyone else to contribute rather than trying to add the same feature to the more robust Maps SDK. The MapLibre team can also more easily accept contributed plugins and keep the plugin list growing. ## Contributing From e9df5dd4146f94ba2227bf1bd30cb90718f2643b Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Tue, 7 Feb 2023 10:33:31 -0800 Subject: [PATCH 04/40] remove old mapbox logo --- .github/mbx-plugins-logo.png | Bin 42407 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .github/mbx-plugins-logo.png diff --git a/.github/mbx-plugins-logo.png b/.github/mbx-plugins-logo.png deleted file mode 100644 index 115aee02a26d685a485e8cf42bff7b4b01f65090..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 42407 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 tIex89SgCduayu!IKx Date: Thu, 9 Feb 2023 09:31:51 -0800 Subject: [PATCH 05/40] link updates README --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 53c074dd..5c29666d 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,20 @@


- MapLibre Plugins + MapLibre Plugins

-

Plugins are single-purpose libraries built on top of the MapLibre Maps SDK for Android that you can include in your apps like any other Android dependency

+

Plugins are single-purpose libraries built on top of the MapLibre Maps SDK for Android that you can include in your apps like any other Android dependency

- - + +


# MapLibre Plugins for Android -Plugins are single-purpose libraries built on top of the [MapLibre Maps SDK for Android](https://www.mapbox.com/android-docs/) that you can include in your apps like any other Android dependency. You'll find [documentation for each plugin on our Android documentation website](https://www.mapbox.com/android-docs/plugins/overview/). A full list of the current plugins is available below. +Plugins are single-purpose libraries built on top of the [MapLibre Maps SDK for Android](https://maplibre.org/projects/maplibre-native/) that you can include in your apps like any other Android dependency. A full list of the current plugins is available below. ## Available Plugins @@ -38,7 +38,7 @@ Plugins are single-purpose libraries built on top of the [MapLibre Maps SDK for ## Installing a plugin -By using a plugin, you also have to include the MapLibre Maps SDK for Android which means that you'll need to setup your project to use the Maps SDK if you haven't already. Head over to the [overview page for the Maps SDK](https://www.mapbox.com/android-docs/map-sdk/overview/) to learn more. +By using a plugin, you also have to include the MapLibre Maps SDK for Android which means that you'll need to setup your project to use the Maps SDK if you haven't already. Head over to the [overview page for the Maps SDK](https://maplibre.org/projects/maplibre-native/) to learn more. Note that depending on the plugin you add, there might be required permissions and additional setup steps. You'll find more information on whether or not more configuration steps are involved when looking at the specific plugin documentation. @@ -82,10 +82,10 @@ A plugin is simply a library module built on top of the MapLibre Maps SDK for An ### Test app This repository includes an app with examples showing how you can use each plugin. -- To access ready-to-use snippets, [see its code here](https://github.com/mapbox/mapbox-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp). +- To access ready-to-use snippets, [see its code here](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp). - To run the application locally, open the [`PluginApplication`](https://github.com/mapbox/mapbox-plugins-android/blob/4ff768983323cc4a57791bcb577639109e4fd9ce/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/PluginApplication.kt) file and replace `mapbox_access_token` with your own Mapbox token from [https://account.mapbox.com](https://account.mapbox.com). -This might change in the future as we build more plugins and learn how you use them. We'd love to [hear your feedback](https://github.com/mapbox/mapbox-plugins-android/issues). +This might change in the future as we build more plugins and learn how you use them. We'd love to [hear your feedback](https://github.com/maplibre/maplibre-plugins-android/issues). ## Why Plugins? From 39d53694c34b8bcc7234aec845336f8f7293f7a1 Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Thu, 9 Feb 2023 09:33:13 -0800 Subject: [PATCH 06/40] removing authentication from example and access token language README --- README.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/README.md b/README.md index 5c29666d..3828b23e 100644 --- a/README.md +++ b/README.md @@ -50,14 +50,7 @@ Note that depending on the plugin you add, there might be required permissions a repositories { mavenCentral() maven { - url 'https://api.mapbox.com/downloads/v2/releases/maven' - authentication { - basic(BasicAuthentication) - } - credentials { - username "mapbox" - password = "SDK_REGISTRY_TOKEN" - } + url 'https://api.maplibre.com/downloads/v2/releases/maven' } } @@ -65,7 +58,6 @@ dependencies { implementation 'com.mapbox.mapboxsdk:{PLUGIN_NAME}-v{MAJOR_MAPS_SDK_VERSION_NUMBER}:PLUGIN_VERSION_NUMBER' } ``` -5. Replace SDK_REGISTRY_TOKEN with a Mapbox access token that has the downloads scope Plugin artifacts are versioned based on the major release of the Maps SDK for Android, which means, that each artifact's name has a major version of the Maps SDK it's compatible with appended. From ba16e8486910ee68be7b49f7836862147ab720b7 Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Thu, 9 Feb 2023 09:42:35 -0800 Subject: [PATCH 07/40] updating resources and links in plugins --- README.md | 2 +- plugin-annotation/README.md | 14 +++++++------- plugin-building/README.md | 16 +++++++--------- plugin-localization/README.md | 16 +++++++--------- plugin-markerview/README.md | 2 +- plugin-offline/README.md | 14 +++++++------- plugin-scalebar/README.md | 12 ++++++------ 7 files changed, 36 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index 3828b23e..ee1cba31 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ A plugin is simply a library module built on top of the MapLibre Maps SDK for An This repository includes an app with examples showing how you can use each plugin. - To access ready-to-use snippets, [see its code here](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp). -- To run the application locally, open the [`PluginApplication`](https://github.com/mapbox/mapbox-plugins-android/blob/4ff768983323cc4a57791bcb577639109e4fd9ce/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/PluginApplication.kt) file and replace `mapbox_access_token` with your own Mapbox token from [https://account.mapbox.com](https://account.mapbox.com). +- To run the application locally, open the [`PluginApplication`](https://github.com/mapbox/mapbox-plugins-android/blob/4ff768983323cc4a57791bcb577639109e4fd9ce/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/PluginApplication.kt) file This might change in the future as we build more plugins and learn how you use them. We'd love to [hear your feedback](https://github.com/maplibre/maplibre-plugins-android/issues). diff --git a/plugin-annotation/README.md b/plugin-annotation/README.md index 30fe207c..9b46151d 100644 --- a/plugin-annotation/README.md +++ b/plugin-annotation/README.md @@ -4,7 +4,7 @@ ## Getting Started -[More documentation about the plugin can be found here](https://www.mapbox.com/android-docs/plugins/overview/annotation/) + To use the annotation plugin you include it in your `build.gradle` file. @@ -31,7 +31,7 @@ android { } dependencies { - implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.9.0' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-annotation-v9:0.9.0' } ``` @@ -48,19 +48,19 @@ repositories { // In the app build.gradle file dependencies { - implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.10.0-SNAPSHOT' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-annotation-v9:0.10.0-SNAPSHOT' } ``` ## Annotation plugin examples -- [In this repo's test app](https://github.com/mapbox/mapbox-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation) +- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation) ## Help and Usage -This repository includes an app that shows how to use each plugin in this repository. [Check out its code](https://github.com/mapbox/mapbox-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. +This repository includes an app that shows how to use each plugin in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. -We'd love to [hear your feedback](https://github.com/mapbox/mapbox-plugins-android/issues) as we build more plugins and learn how you use them. +We'd love to [hear your feedback](https://github.com/maplibre/maplibre-plugins-android/issues) as we build more plugins and learn how you use them. ## Why Plugins @@ -73,4 +73,4 @@ Plugins' lightweight nature makes them much easier for you and anyone else to co We welcome contributions to this plugin repository! -If you're interested in building and sharing your own plugin, please read [the contribution guide](https://github.com/mapbox/mapbox-plugins-android/blob/master/CONTRIBUTING.md) to learn how to get started. +If you're interested in building and sharing your own plugin, please read [the contribution guide](https://github.com/maplibre/maplibre-plugins-android/blob/master/CONTRIBUTING.md) to learn how to get started. diff --git a/plugin-building/README.md b/plugin-building/README.md index c37b35c9..8d8dfddc 100644 --- a/plugin-building/README.md +++ b/plugin-building/README.md @@ -4,7 +4,7 @@ ## Getting Started -[More documentation about the plugin can be found here](https://www.mapbox.com/android-docs/plugins/overview/building/) + To use the building plugin you include it in your `build.gradle` file. @@ -18,7 +18,7 @@ repositories { // In the app build.gradle file dependencies { - implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-building-v9:0.7.0' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-building-v9:0.7.0' } ``` @@ -35,21 +35,19 @@ repositories { // In the app build.gradle file dependencies { - implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-building-v9:0.8.0-SNAPSHOT' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-building-v9:0.8.0-SNAPSHOT' } ``` ## Building plugin examples -- [In this repo's test app](https://github.com/mapbox/mapbox-plugins-android/blob/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/building/BuildingActivity.kt) - -- [In the Mapbox Android demo app](https://github.com/mapbox/mapbox-android-demo/blob/a411fa95cd71c1b90a30895060b319310444aebb/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/BuildingPluginActivity.java) – (Don't have the app? [Download it on Google Play](https://play.google.com/store/apps/details?id=com.mapbox.mapboxandroiddemo).) +- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/blob/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/building/BuildingActivity.kt) ## Help and Usage -This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/mapbox/mapbox-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. +This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. -We'd love to [hear your feedback](https://github.com/mapbox/mapbox-plugins-android/issues) as we build more plugins and learn how you use them. +We'd love to [hear your feedback](https://github.com/maplibre/maplibre-plugins-android/issues) as we build more plugins and learn how you use them. ## Why Plugins @@ -62,4 +60,4 @@ Plugins' lightweight nature makes them much easier for you and anyone else to co We welcome contributions to this plugin repository! -If you're interested in building and sharing your own plugin, please read [the contribution guide](https://github.com/mapbox/mapbox-plugins-android/blob/master/CONTRIBUTING.md) to learn how to get started. +If you're interested in building and sharing your own plugin, please read [the contribution guide](https://github.com/maplibre/maplibre-plugins-android/blob/master/CONTRIBUTING.md) to learn how to get started. diff --git a/plugin-localization/README.md b/plugin-localization/README.md index 7c5e1d78..c69528b6 100644 --- a/plugin-localization/README.md +++ b/plugin-localization/README.md @@ -5,7 +5,7 @@ ## Getting Started -[More documentation about the plugin can be found here](https://www.mapbox.com/android-docs/plugins/overview/localization/) + To use the localization plugin, you include it in your `build.gradle` file. @@ -20,7 +20,7 @@ repositories { // In the app build.gradle file dependencies { - implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.12.0' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-localization-v9:0.12.0' } ``` @@ -38,21 +38,19 @@ repositories { // In the app build.gradle file dependencies { - implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-localization-v9:0.13.0-SNAPSHOT' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-localization-v9:0.13.0-SNAPSHOT' } ``` ## Localization examples -- [In this repo's test app](https://github.com/mapbox/mapbox-plugins-android/blob/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/localization/LocalizationActivity.kt) - -- [In the MapLibre Android demo app](https://github.com/mapbox/mapbox-android-demo/blob/master/MapboxAndroidDemo/src/main/java/com/mapbox/mapboxandroiddemo/examples/plugins/LocalizationPluginActivity.java) – (Don't have the app? [Download it on Google Play](https://play.google.com/store/apps/details?id=com.mapbox.mapboxandroiddemo).) +- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/blob/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/localization/LocalizationActivity.kt) ## Help and Usage -This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/mapbox/mapbox-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. +This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. -We'd love to [hear your feedback](https://github.com/mapbox/mapbox-plugins-android/issues) as we build more plugins and learn how you use them. +We'd love to [hear your feedback](https://github.com/maplibre/maplibre-plugins-android/issues) as we build more plugins and learn how you use them. ## Why plugins @@ -65,4 +63,4 @@ Plugins' lightweight nature makes them much easier for you and anyone else to co We welcome contributions to this plugin repository! -If you're interested in building and sharing your own plugin, please read [the contribution guide](https://github.com/mapbox/mapbox-plugins-android/blob/master/CONTRIBUTING.md) to learn how to get started. +If you're interested in building and sharing your own plugin, please read [the contribution guide](https://github.com/maplibre/maplibre-plugins-android/blob/master/CONTRIBUTING.md) to learn how to get started. diff --git a/plugin-markerview/README.md b/plugin-markerview/README.md index 6b5b7cc7..a8f912d4 100644 --- a/plugin-markerview/README.md +++ b/plugin-markerview/README.md @@ -4,7 +4,7 @@ ## Getting Started -[More documentation about the plugin can be found here](https://www.mapbox.com/android-docs/plugins/overview/markerview/). + Please be aware that Android views are the less performant and less customizable option for adding icons to a map. The MapLibre Maps SDK's SymbolLayer is the recommended way to add icons. View [the MapLibre Annotation Plugin for Android](https://www.mapbox.com/android-docs/plugins/overview/annotation) for more information about using a SymbolLayer. diff --git a/plugin-offline/README.md b/plugin-offline/README.md index a506f883..be1a8008 100644 --- a/plugin-offline/README.md +++ b/plugin-offline/README.md @@ -4,7 +4,7 @@ The offline plugin automatically does the downloading and managment of map tiles ## Getting Started -[More documentation about the plugin can be found here](https://www.mapbox.com/android-docs/plugins/overview/offline) + To use the offline plugin you include it in your `build.gradle` file. @@ -18,7 +18,7 @@ repositories { // In the app build.gradle file dependencies { - implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-offline-v9:0.7.0' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-offline-v9:0.7.0' } ``` @@ -35,19 +35,19 @@ repositories { // In the app build.gradle file dependencies { - implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-offline-v9:0.8.0-SNAPSHOT' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-offline-v9:0.8.0-SNAPSHOT' } ``` ## Offline plugin examples -- [In this repo's test app](https://github.com/mapbox/mapbox-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline) +- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline) ## Help and Usage -This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/mapbox/mapbox-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. +This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. -We'd love to [hear your feedback](https://github.com/mapbox/mapbox-plugins-android/issues) as we build more plugins and learn how you use them. +We'd love to [hear your feedback](https://github.com/maplibre/maplibre-plugins-android/issues) as we build more plugins and learn how you use them. ## Why Plugins @@ -60,4 +60,4 @@ Plugins' lightweight nature makes them much easier for you and anyone else to co We welcome contributions to this plugin repository! -If you're interested in geojson and sharing your own plugin, please read [the contribution guide](https://github.com/mapbox/mapbox-plugins-android/blob/master/CONTRIBUTING.md) to learn how to get started. +If you're interested in geojson and sharing your own plugin, please read [the contribution guide](https://github.com/maplibre/maplibre-plugins-android/blob/master/CONTRIBUTING.md) to learn how to get started. diff --git a/plugin-scalebar/README.md b/plugin-scalebar/README.md index 1d277618..07b31d1e 100644 --- a/plugin-scalebar/README.md +++ b/plugin-scalebar/README.md @@ -18,7 +18,7 @@ repositories { // In the app build.gradle file dependencies { - implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-scalebar-v9:0.5.0' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-scalebar-v9:0.5.0' } ``` @@ -35,21 +35,21 @@ repositories { // In the app build.gradle file dependencies { - implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-scalebar-v9:0.6.0-SNAPSHOT' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-scalebar-v9:0.6.0-SNAPSHOT' } ``` ## Scale bar plugin examples -- [In this repo's test app](https://github.com/mapbox/mapbox-plugins-android/blob/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/scalebar/ScalebarActivity.kt) +- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/blob/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/scalebar/ScalebarActivity.kt) ## Help and Usage -This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/mapbox/mapbox-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. +This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. Plugins are easy to use. A plugin is simply a library module built on top of the MapLibre Maps SDK for Android. Currently, we are not requiring plugins to register themselves or to implement any specific interfaces so that they're simple to consume. -We'd love to [hear your feedback](https://github.com/mapbox/mapbox-plugins-android/issues) as we build more plugins and learn how you use them. +We'd love to [hear your feedback](https://github.com/maplibre/maplibre-plugins-android/issues) as we build more plugins and learn how you use them. ## Why Plugins @@ -62,4 +62,4 @@ Plugins' lightweight nature makes them much easier for you and anyone else to co We welcome contributions to this plugin repository! -If you're interested in building and sharing your own plugin, please read [the contribution guide](https://github.com/mapbox/mapbox-plugins-android/blob/master/CONTRIBUTING.md) to learn how to get started. +If you're interested in building and sharing your own plugin, please read [the contribution guide](https://github.com/maplibre/maplibre-plugins-android/blob/master/CONTRIBUTING.md) to learn how to get started. From e467dc0bbb4d4aad93e0f6812aaf979c596cfd7e Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Thu, 9 Feb 2023 09:43:19 -0800 Subject: [PATCH 08/40] couple cleanup links in README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ee1cba31..f2dae2f8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@


- MapLibre Plugins + MapLibre Plugins

Plugins are single-purpose libraries built on top of the MapLibre Maps SDK for Android that you can include in your apps like any other Android dependency

@@ -55,7 +55,7 @@ repositories { } dependencies { - implementation 'com.mapbox.mapboxsdk:{PLUGIN_NAME}-v{MAJOR_MAPS_SDK_VERSION_NUMBER}:PLUGIN_VERSION_NUMBER' + implementation 'com.maplibre.maplibresdk:{PLUGIN_NAME}-v{MAJOR_MAPS_SDK_VERSION_NUMBER}:PLUGIN_VERSION_NUMBER' } ``` From 0c97ad8e3f6abe1a74eee0eebc7f038cc20c7b0b Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Thu, 9 Feb 2023 09:45:08 -0800 Subject: [PATCH 09/40] changing references and removing links to other projects in Contributing --- CONTRIBUTING.md | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 969dacc1..2bca0a4d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,24 +6,18 @@ We welcome contributions to this plugin repository. If you're interested in buil - Create a new branch that will contain the code for your plugin. -- Create a new Android library module inside the `plugins` project with Android Studio. Each plugin is a separate library that depends on the Mapbox Android SDK, and potentially on other third-party libraries. Besides the code for the plugin, make sure you include: +- Create a new Android library module inside the `plugins` project with Android Studio. Each plugin is a separate library that depends on the MapLibre Android SDK, and potentially on other third-party libraries. Besides the code for the plugin, make sure you include: - Tests. - Javadoc that documents the plugin usage and purpose in detail. - Create a new activity inside the demo app that showcases how to use your plugin. As important as having a working plugin is to show how to use it so that anyone can include it in their projects easily. -- Finally, once you're ready to share your code, list your plugin in this file and then open a PR for the `@mapbox/android` team to review. +- Finally, once you're ready to share your code, list your plugin in this file and then open a PR for the `@maplibre/android` team to review. ## Adding or updating a localization -The Mapbox Plugins SDK for Android features several translations contributed through [Transifex](https://www.transifex.com/mapbox/mapbox-plugins-android/). If your language already has a translation, feel free to complete or proofread it. Otherwise, please [request your language](https://www.transifex.com/mapbox/mapbox-plugins-android/) so you can start translating. Note that we’re primarily interested in languages that Android supports as system languages. - -While you’re there, please consider also translating the following related projects: - -* [OSRM Text Instructions](https://www.transifex.com/project-osrm/osrm-text-instructions/), which the Mapbox Directions API uses to generate textual and verbal turn instructions ([instructions](https://github.com/Project-OSRM/osrm-text-instructions/blob/master/CONTRIBUTING.md#adding-or-updating-a-localization)). -* [Mapbox Navigation SDK for iOS](https://www.transifex.com/mapbox/mapbox-navigation-ios/), the analogous library for iOS applications ([instructions](https://github.com/mapbox/mapbox-navigation-ios/blob/main/CONTRIBUTING.md#adding-or-updating-a-localization)). -* [Mapbox Maps SDK for Android](https://www.transifex.com/mapbox/mapbox-gl-native/), which is responsible for the map view and minor UI elements such as the Mapbox Telemetry permissions dialog +The MapLibre Plugins SDK for Android features several translations contributed through [Transifex](https://www.transifex.com/maplibre/maplibre-plugins-android/). If your language already has a translation, feel free to complete or proofread it. Otherwise, please [request your language](https://www.transifex.com/maplibre/maplibre-plugins-android/) so you can start translating. Note that we’re primarily interested in languages that Android supports as system languages. Once you’ve finished translating the Android Plugins SDK into a new language in Transifex, open an issue in this repository asking to pull in your translations. You can also pull in the translations yourself: From 1f76cf51ffdbd69efbb25cd7cc3871260505761f Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Thu, 9 Feb 2023 09:49:12 -0800 Subject: [PATCH 10/40] remove references to demo app contributing --- CONTRIBUTING.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2bca0a4d..315330ae 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,8 +11,6 @@ We welcome contributions to this plugin repository. If you're interested in buil - Tests. - Javadoc that documents the plugin usage and purpose in detail. -- Create a new activity inside the demo app that showcases how to use your plugin. As important as having a working plugin is to show how to use it so that anyone can include it in their projects easily. - - Finally, once you're ready to share your code, list your plugin in this file and then open a PR for the `@maplibre/android` team to review. ## Adding or updating a localization From 15c3e11a9f19ee0c8990c56c5bb122b801348a2d Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Thu, 9 Feb 2023 09:51:37 -0800 Subject: [PATCH 11/40] notes about plugins being unmaintained --- CONTRIBUTING.md | 2 +- plugin-building/README.md | 2 ++ plugin-localization/README.md | 3 ++- plugin-markerview/README.md | 2 ++ plugin-offline/README.md | 2 ++ plugin-scalebar/README.md | 2 ++ 6 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 315330ae..51008a1c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ # Contributing -We welcome contributions to this plugin repository. If you're interested in building and sharing your own, please follow these steps: +We welcome contributions to this plugin repository. Please be aware that all plugins, except Annotations, is currently unmaintained. If you're interested in building and sharing your own, please follow these steps: - [Open a ticket](https://github.com/maplibre/maplibre-plugins-android/issues/new) to kick off a conversation. It's a good idea to explain your plans before you push any code to make sure noone else is working on something similar and to discuss the best approaches to tackle your particular idea. diff --git a/plugin-building/README.md b/plugin-building/README.md index 8d8dfddc..d12875e8 100644 --- a/plugin-building/README.md +++ b/plugin-building/README.md @@ -2,6 +2,8 @@ ![buildings-plugin](https://user-images.githubusercontent.com/4394910/28844435-71442d04-76b9-11e7-8866-ee6a94306353.gif) +This plugin is currently unmaintained. + ## Getting Started diff --git a/plugin-localization/README.md b/plugin-localization/README.md index c69528b6..f39f61c6 100644 --- a/plugin-localization/README.md +++ b/plugin-localization/README.md @@ -1,8 +1,9 @@ # MapLibre Localization Plugin - ![localization plugin](https://user-images.githubusercontent.com/4394910/35408667-d7689174-01c4-11e8-8bdb-e580df77d90b.gif) +This plugin is currently unmaintained. + ## Getting Started diff --git a/plugin-markerview/README.md b/plugin-markerview/README.md index a8f912d4..f835bd0d 100644 --- a/plugin-markerview/README.md +++ b/plugin-markerview/README.md @@ -2,6 +2,8 @@ ![markerview-plugin](https://user-images.githubusercontent.com/2151639/45137542-69f42f00-b1a9-11e8-854b-3335a5504337.gif) +This plugin is currently unmaintained. + ## Getting Started diff --git a/plugin-offline/README.md b/plugin-offline/README.md index be1a8008..a1128a33 100644 --- a/plugin-offline/README.md +++ b/plugin-offline/README.md @@ -2,6 +2,8 @@ The offline plugin automatically does the downloading and managment of map tiles for offline Android device use. _Especially_ if you're building a project for outdoors use, a user's device won't always have a strong enough internet connection to download and view map tiles. Once given the desired coordinates, zoom levels, and map style, this plugin handles the rest of the work that's required for fetching and storing map tiles for any region of the world that you want. +This plugin is currently unmaintained. + ## Getting Started diff --git a/plugin-scalebar/README.md b/plugin-scalebar/README.md index 07b31d1e..1d4a704d 100644 --- a/plugin-scalebar/README.md +++ b/plugin-scalebar/README.md @@ -2,6 +2,8 @@ The scale bar plugin adds a responsive scale bar on top of the map. The scale bar gives a visual indication of how far various map features are from one another at a certain zoom level. The scale bar can be customized with options such as the text color/size, referesh interval, margins, and border width. +This plugin is currently unmaintained. + ![ezgif com-resize (2)](https://user-images.githubusercontent.com/8577318/57837052-89416280-77f4-11e9-9d97-f164737acd46.gif) ## Getting Started From 5797d52753d56753ebd696186e6766536fedfd23 Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Fri, 10 Feb 2023 08:48:33 -0800 Subject: [PATCH 12/40] changing link to API doc --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f2dae2f8..60f8a1c1 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ MapLibre Plugins -

Plugins are single-purpose libraries built on top of the MapLibre Maps SDK for Android that you can include in your apps like any other Android dependency

+

Plugins are single-purpose libraries built on top of the MapLibre Maps SDK for Android that you can include in your apps like any other Android dependency

@@ -14,7 +14,7 @@ # MapLibre Plugins for Android -Plugins are single-purpose libraries built on top of the [MapLibre Maps SDK for Android](https://maplibre.org/projects/maplibre-native/) that you can include in your apps like any other Android dependency. A full list of the current plugins is available below. +Plugins are single-purpose libraries built on top of the [MapLibre Maps SDK for Android](https://maplibre.org/maplibre-gl-native/android/api/) that you can include in your apps like any other Android dependency. A full list of the current plugins is available below. ## Available Plugins From 7a316a7aba997c561c16d798999fa41a5dcb9923 Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Fri, 10 Feb 2023 08:50:18 -0800 Subject: [PATCH 13/40] commenting out branded gifs --- plugin-annotation/README.md | 2 +- plugin-building/README.md | 2 +- plugin-localization/README.md | 2 +- plugin-markerview/README.md | 2 +- plugin-scalebar/README.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugin-annotation/README.md b/plugin-annotation/README.md index 9b46151d..9cf867a9 100644 --- a/plugin-annotation/README.md +++ b/plugin-annotation/README.md @@ -1,6 +1,6 @@ # MapLibre annotation plugin -![annotations-plugin](https://user-images.githubusercontent.com/2151639/44861322-945d5e00-ac78-11e8-8ccb-883a4a743bcf.gif) + ## Getting Started diff --git a/plugin-building/README.md b/plugin-building/README.md index d12875e8..eebd6f77 100644 --- a/plugin-building/README.md +++ b/plugin-building/README.md @@ -1,6 +1,6 @@ # MapLibre Building Plugin -![buildings-plugin](https://user-images.githubusercontent.com/4394910/28844435-71442d04-76b9-11e7-8866-ee6a94306353.gif) + This plugin is currently unmaintained. diff --git a/plugin-localization/README.md b/plugin-localization/README.md index f39f61c6..a767abc7 100644 --- a/plugin-localization/README.md +++ b/plugin-localization/README.md @@ -1,6 +1,6 @@ # MapLibre Localization Plugin -![localization plugin](https://user-images.githubusercontent.com/4394910/35408667-d7689174-01c4-11e8-8bdb-e580df77d90b.gif) + This plugin is currently unmaintained. diff --git a/plugin-markerview/README.md b/plugin-markerview/README.md index f835bd0d..f7e19b85 100644 --- a/plugin-markerview/README.md +++ b/plugin-markerview/README.md @@ -1,6 +1,6 @@ # MapLibre MarkerView plugin -![markerview-plugin](https://user-images.githubusercontent.com/2151639/45137542-69f42f00-b1a9-11e8-854b-3335a5504337.gif) + This plugin is currently unmaintained. diff --git a/plugin-scalebar/README.md b/plugin-scalebar/README.md index 1d4a704d..f36cbf15 100644 --- a/plugin-scalebar/README.md +++ b/plugin-scalebar/README.md @@ -4,7 +4,7 @@ The scale bar plugin adds a responsive scale bar on top of the map. The scale ba This plugin is currently unmaintained. -![ezgif com-resize (2)](https://user-images.githubusercontent.com/8577318/57837052-89416280-77f4-11e9-9d97-f164737acd46.gif) + ## Getting Started From 99b6f80441bb89d3ab80cbaabcf5b40eb97ba73b Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Fri, 10 Feb 2023 08:53:09 -0800 Subject: [PATCH 14/40] cleaning up a few missed references --- README.md | 2 +- plugin-markerview/README.md | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 60f8a1c1..61bd0925 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ A plugin is simply a library module built on top of the MapLibre Maps SDK for An This repository includes an app with examples showing how you can use each plugin. - To access ready-to-use snippets, [see its code here](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp). -- To run the application locally, open the [`PluginApplication`](https://github.com/mapbox/mapbox-plugins-android/blob/4ff768983323cc4a57791bcb577639109e4fd9ce/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/PluginApplication.kt) file +- To run the application locally, open the [`PluginApplication`](https://github.com/maplibre/maplibre-plugins-android/blob/4ff768983323cc4a57791bcb577639109e4fd9ce/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/PluginApplication.kt) file This might change in the future as we build more plugins and learn how you use them. We'd love to [hear your feedback](https://github.com/maplibre/maplibre-plugins-android/issues). diff --git a/plugin-markerview/README.md b/plugin-markerview/README.md index f7e19b85..1527f69b 100644 --- a/plugin-markerview/README.md +++ b/plugin-markerview/README.md @@ -8,7 +8,7 @@ This plugin is currently unmaintained. -Please be aware that Android views are the less performant and less customizable option for adding icons to a map. The MapLibre Maps SDK's SymbolLayer is the recommended way to add icons. View [the MapLibre Annotation Plugin for Android](https://www.mapbox.com/android-docs/plugins/overview/annotation) for more information about using a SymbolLayer. +Please be aware that Android views are the less performant and less customizable option for adding icons to a map. The MapLibre Maps SDK's SymbolLayer is the recommended way to add icons. To use the MarkerView plugin, you include its dependency in your `build.gradle` file. @@ -22,7 +22,7 @@ repositories { // In the app build.gradle file dependencies { - implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-markerview-v9:0.4.0' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-markerview-v9:0.4.0' } ``` @@ -39,19 +39,19 @@ repositories { // In the app build.gradle file dependencies { - implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-markerview-v9:0.5.0-SNAPSHOT' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-markerview-v9:0.5.0-SNAPSHOT' } ``` ## MarkerView plugin examples -- [In this repo's test app](https://github.com/mapbox/mapbox-plugins-android/blob/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/markerview/MarkerViewActivity.kt) +- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/blob/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/markerview/MarkerViewActivity.kt) ## Help and Usage -This repository includes an app that shows how to use each plugin in this repository. [Check out its code](https://github.com/mapbox/mapbox-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. +This repository includes an app that shows how to use each plugin in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. -We'd love to [hear your feedback](https://github.com/mapbox/mapbox-plugins-android/issues) as we build more plugins and learn how you use them. +We'd love to [hear your feedback](https://github.com/maplibre/maplibre-plugins-android/issues) as we build more plugins and learn how you use them. ## Why Plugins @@ -64,4 +64,4 @@ Plugins' lightweight nature makes them much easier for you and anyone else to co We welcome contributions to this plugin repository! -If you're interested in building and sharing your own plugin, please read [the contribution guide](https://github.com/mapbox/mapbox-plugins-android/blob/master/CONTRIBUTING.md) to learn how to get started. +If you're interested in building and sharing your own plugin, please read [the contribution guide](https://github.com/maplibre/maplibre-plugins-android/blob/master/CONTRIBUTING.md) to learn how to get started. From 5c2084f98e46044fecff5d0cf5effbf2b96d45d8 Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Fri, 10 Feb 2023 08:54:28 -0800 Subject: [PATCH 15/40] updating license --- LICENSE | 143 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 121 insertions(+), 22 deletions(-) diff --git a/LICENSE b/LICENSE index c6211c60..0e259d42 100644 --- a/LICENSE +++ b/LICENSE @@ -1,22 +1,121 @@ -Copyright (c) 2019, Mapbox - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. From 628bd8f0a75deace3a8a24627352d32b9690c33d Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Fri, 10 Feb 2023 08:57:10 -0800 Subject: [PATCH 16/40] adding call to maintainers --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 61bd0925..6871211c 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,8 @@ Plugins are single-purpose libraries built on top of the [MapLibre Maps SDK for Android](https://maplibre.org/maplibre-gl-native/android/api/) that you can include in your apps like any other Android dependency. A full list of the current plugins is available below. +We are looking for maintainers for these plugins! Please reach out to the Maplibre team and take a look at [the contribution guide](https://github.com/maplibre/maplibre-plugins-android/blob/master/CONTRIBUTING.md). + ## Available Plugins * [**Annotation:** Simplify the way to set and adjust the visual properties of annotations on a map.](https://github.com/maplibre/maplibre-plugins-android/tree/master/plugin-annotation) From c95c2a929c306cc2a193ea4983cc0ba05aaae05f Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Wed, 15 Feb 2023 08:25:31 -0800 Subject: [PATCH 17/40] reverting license --- LICENSE | 143 +++++++++----------------------------------------------- 1 file changed, 22 insertions(+), 121 deletions(-) diff --git a/LICENSE b/LICENSE index 0e259d42..c6211c60 100644 --- a/LICENSE +++ b/LICENSE @@ -1,121 +1,22 @@ -Creative Commons Legal Code - -CC0 1.0 Universal - - CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE - LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN - ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS - INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES - REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS - PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM - THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED - HEREUNDER. - -Statement of Purpose - -The laws of most jurisdictions throughout the world automatically confer -exclusive Copyright and Related Rights (defined below) upon the creator -and subsequent owner(s) (each and all, an "owner") of an original work of -authorship and/or a database (each, a "Work"). - -Certain owners wish to permanently relinquish those rights to a Work for -the purpose of contributing to a commons of creative, cultural and -scientific works ("Commons") that the public can reliably and without fear -of later claims of infringement build upon, modify, incorporate in other -works, reuse and redistribute as freely as possible in any form whatsoever -and for any purposes, including without limitation commercial purposes. -These owners may contribute to the Commons to promote the ideal of a free -culture and the further production of creative, cultural and scientific -works, or to gain reputation or greater distribution for their Work in -part through the use and efforts of others. - -For these and/or other purposes and motivations, and without any -expectation of additional consideration or compensation, the person -associating CC0 with a Work (the "Affirmer"), to the extent that he or she -is an owner of Copyright and Related Rights in the Work, voluntarily -elects to apply CC0 to the Work and publicly distribute the Work under its -terms, with knowledge of his or her Copyright and Related Rights in the -Work and the meaning and intended legal effect of CC0 on those rights. - -1. Copyright and Related Rights. A Work made available under CC0 may be -protected by copyright and related or neighboring rights ("Copyright and -Related Rights"). Copyright and Related Rights include, but are not -limited to, the following: - - i. the right to reproduce, adapt, distribute, perform, display, - communicate, and translate a Work; - ii. moral rights retained by the original author(s) and/or performer(s); -iii. publicity and privacy rights pertaining to a person's image or - likeness depicted in a Work; - iv. rights protecting against unfair competition in regards to a Work, - subject to the limitations in paragraph 4(a), below; - v. rights protecting the extraction, dissemination, use and reuse of data - in a Work; - vi. database rights (such as those arising under Directive 96/9/EC of the - European Parliament and of the Council of 11 March 1996 on the legal - protection of databases, and under any national implementation - thereof, including any amended or successor version of such - directive); and -vii. other similar, equivalent or corresponding rights throughout the - world based on applicable law or treaty, and any national - implementations thereof. - -2. Waiver. To the greatest extent permitted by, but not in contravention -of, applicable law, Affirmer hereby overtly, fully, permanently, -irrevocably and unconditionally waives, abandons, and surrenders all of -Affirmer's Copyright and Related Rights and associated claims and causes -of action, whether now known or unknown (including existing as well as -future claims and causes of action), in the Work (i) in all territories -worldwide, (ii) for the maximum duration provided by applicable law or -treaty (including future time extensions), (iii) in any current or future -medium and for any number of copies, and (iv) for any purpose whatsoever, -including without limitation commercial, advertising or promotional -purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each -member of the public at large and to the detriment of Affirmer's heirs and -successors, fully intending that such Waiver shall not be subject to -revocation, rescission, cancellation, termination, or any other legal or -equitable action to disrupt the quiet enjoyment of the Work by the public -as contemplated by Affirmer's express Statement of Purpose. - -3. Public License Fallback. Should any part of the Waiver for any reason -be judged legally invalid or ineffective under applicable law, then the -Waiver shall be preserved to the maximum extent permitted taking into -account Affirmer's express Statement of Purpose. In addition, to the -extent the Waiver is so judged Affirmer hereby grants to each affected -person a royalty-free, non transferable, non sublicensable, non exclusive, -irrevocable and unconditional license to exercise Affirmer's Copyright and -Related Rights in the Work (i) in all territories worldwide, (ii) for the -maximum duration provided by applicable law or treaty (including future -time extensions), (iii) in any current or future medium and for any number -of copies, and (iv) for any purpose whatsoever, including without -limitation commercial, advertising or promotional purposes (the -"License"). The License shall be deemed effective as of the date CC0 was -applied by Affirmer to the Work. Should any part of the License for any -reason be judged legally invalid or ineffective under applicable law, such -partial invalidity or ineffectiveness shall not invalidate the remainder -of the License, and in such case Affirmer hereby affirms that he or she -will not (i) exercise any of his or her remaining Copyright and Related -Rights in the Work or (ii) assert any associated claims and causes of -action with respect to the Work, in either case contrary to Affirmer's -express Statement of Purpose. - -4. Limitations and Disclaimers. - - a. No trademark or patent rights held by Affirmer are waived, abandoned, - surrendered, licensed or otherwise affected by this document. - b. Affirmer offers the Work as-is and makes no representations or - warranties of any kind concerning the Work, express, implied, - statutory or otherwise, including without limitation warranties of - title, merchantability, fitness for a particular purpose, non - infringement, or the absence of latent or other defects, accuracy, or - the present or absence of errors, whether or not discoverable, all to - the greatest extent permissible under applicable law. - c. Affirmer disclaims responsibility for clearing rights of other persons - that may apply to the Work or any use thereof, including without - limitation any person's Copyright and Related Rights in the Work. - Further, Affirmer disclaims responsibility for obtaining any necessary - consents, permissions or other rights required for any use of the - Work. - d. Affirmer understands and acknowledges that Creative Commons is not a - party to this document and has no duty or obligation with respect to - this CC0 or use of the Work. +Copyright (c) 2019, Mapbox + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From ba4a3969e73bb04adf3ffd38d57f6f870e63daf6 Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Wed, 15 Feb 2023 08:25:49 -0800 Subject: [PATCH 18/40] adding maplibre copyright line --- LICENSE | 1 + 1 file changed, 1 insertion(+) diff --git a/LICENSE b/LICENSE index c6211c60..c269014e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,5 @@ Copyright (c) 2019, Mapbox +Copyright (c) 2023, MapLibre contributors Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: From 984e1931b7063f1ad455b79bd23c5261176bb6f1 Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Wed, 15 Feb 2023 08:28:37 -0800 Subject: [PATCH 19/40] contributing verbiage --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 51008a1c..d12eedd9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,7 +11,7 @@ We welcome contributions to this plugin repository. Please be aware that all plu - Tests. - Javadoc that documents the plugin usage and purpose in detail. -- Finally, once you're ready to share your code, list your plugin in this file and then open a PR for the `@maplibre/android` team to review. +- Finally, once you're ready to share your code, list your plugin in this file and then open a PR for other contributors to review. ## Adding or updating a localization From f136a38ee73bb7a5d8987ef208d49d52627122f4 Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Wed, 15 Feb 2023 08:30:32 -0800 Subject: [PATCH 20/40] contribution maintainer verbiage --- CONTRIBUTING.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d12eedd9..3f5b3e71 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,8 @@ # Contributing -We welcome contributions to this plugin repository. Please be aware that all plugins, except Annotations, is currently unmaintained. If you're interested in building and sharing your own, please follow these steps: +We welcome contributions to this plugin repository. Please be aware that all plugins, except Annotations, are not actively maintained. If you are interested in becoming a maintainer for a plugin feel free to submit a pull request with a short introduction and your name and GitHub handle in the respective README. + +If you're interested in building and sharing your own plugin, please follow these steps: - [Open a ticket](https://github.com/maplibre/maplibre-plugins-android/issues/new) to kick off a conversation. It's a good idea to explain your plans before you push any code to make sure noone else is working on something similar and to discuss the best approaches to tackle your particular idea. From e26eec15635f158f04d3d3fcf8d741c6f287a8fe Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Sun, 19 Feb 2023 01:27:37 -0800 Subject: [PATCH 21/40] readme resource name --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6871211c..b591e85e 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ # MapLibre Plugins for Android -Plugins are single-purpose libraries built on top of the [MapLibre Maps SDK for Android](https://maplibre.org/maplibre-gl-native/android/api/) that you can include in your apps like any other Android dependency. A full list of the current plugins is available below. +Plugins are single-purpose libraries built on top of the [MapLibre GL Native for Android](https://maplibre.org/maplibre-gl-native/android/api/) that you can include in your apps like any other Android dependency. A full list of the current plugins is available below. We are looking for maintainers for these plugins! Please reach out to the Maplibre team and take a look at [the contribution guide](https://github.com/maplibre/maplibre-plugins-android/blob/master/CONTRIBUTING.md). @@ -57,7 +57,7 @@ repositories { } dependencies { - implementation 'com.maplibre.maplibresdk:{PLUGIN_NAME}-v{MAJOR_MAPS_SDK_VERSION_NUMBER}:PLUGIN_VERSION_NUMBER' + implementation 'org.maplibre.android:{PLUGIN_NAME}-v{MAJOR_MAPS_SDK_VERSION_NUMBER}:PLUGIN_VERSION_NUMBER' } ``` From c737dc784c037249ea6bec8fb95ad2a7cb8a974a Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Sun, 19 Feb 2023 09:51:56 -0800 Subject: [PATCH 22/40] ktx-mapbox-maps renamed --- app/build.gradle | 2 +- {ktx-mapbox-maps => ktx-maplibre-maps}/.gitignore | 0 {ktx-mapbox-maps => ktx-maplibre-maps}/build.gradle | 0 {ktx-mapbox-maps => ktx-maplibre-maps}/gradle.properties | 0 {ktx-mapbox-maps => ktx-maplibre-maps}/proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../main/java/com/mapbox/mapboxsdk/plugins/maps/Geometry.kt | 0 .../src/main/java/com/mapbox/mapboxsdk/plugins/maps/Maps.kt | 0 .../java/com/mapbox/mapboxsdk/plugins/maps/GeometryTest.kt | 0 .../mockito-extensions/org.mockito.plugins.MockMaker | 0 settings.gradle | 4 ++-- 11 files changed, 3 insertions(+), 3 deletions(-) rename {ktx-mapbox-maps => ktx-maplibre-maps}/.gitignore (100%) rename {ktx-mapbox-maps => ktx-maplibre-maps}/build.gradle (100%) rename {ktx-mapbox-maps => ktx-maplibre-maps}/gradle.properties (100%) rename {ktx-mapbox-maps => ktx-maplibre-maps}/proguard-rules.pro (100%) rename {ktx-mapbox-maps => ktx-maplibre-maps}/src/main/AndroidManifest.xml (100%) rename {ktx-mapbox-maps => ktx-maplibre-maps}/src/main/java/com/mapbox/mapboxsdk/plugins/maps/Geometry.kt (100%) rename {ktx-mapbox-maps => ktx-maplibre-maps}/src/main/java/com/mapbox/mapboxsdk/plugins/maps/Maps.kt (100%) rename {ktx-mapbox-maps => ktx-maplibre-maps}/src/test/java/com/mapbox/mapboxsdk/plugins/maps/GeometryTest.kt (100%) rename {ktx-mapbox-maps => ktx-maplibre-maps}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker (100%) diff --git a/app/build.gradle b/app/build.gradle index 90cdb87a..9fb10222 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -111,7 +111,7 @@ dependencies { implementation project(':plugin-localization') implementation project(':plugin-annotation') implementation project(':plugin-markerview') - implementation project(':ktx-mapbox-maps') + implementation project(':ktx-maplibre-maps') implementation project(':plugin-scalebar') } diff --git a/ktx-mapbox-maps/.gitignore b/ktx-maplibre-maps/.gitignore similarity index 100% rename from ktx-mapbox-maps/.gitignore rename to ktx-maplibre-maps/.gitignore diff --git a/ktx-mapbox-maps/build.gradle b/ktx-maplibre-maps/build.gradle similarity index 100% rename from ktx-mapbox-maps/build.gradle rename to ktx-maplibre-maps/build.gradle diff --git a/ktx-mapbox-maps/gradle.properties b/ktx-maplibre-maps/gradle.properties similarity index 100% rename from ktx-mapbox-maps/gradle.properties rename to ktx-maplibre-maps/gradle.properties diff --git a/ktx-mapbox-maps/proguard-rules.pro b/ktx-maplibre-maps/proguard-rules.pro similarity index 100% rename from ktx-mapbox-maps/proguard-rules.pro rename to ktx-maplibre-maps/proguard-rules.pro diff --git a/ktx-mapbox-maps/src/main/AndroidManifest.xml b/ktx-maplibre-maps/src/main/AndroidManifest.xml similarity index 100% rename from ktx-mapbox-maps/src/main/AndroidManifest.xml rename to ktx-maplibre-maps/src/main/AndroidManifest.xml diff --git a/ktx-mapbox-maps/src/main/java/com/mapbox/mapboxsdk/plugins/maps/Geometry.kt b/ktx-maplibre-maps/src/main/java/com/mapbox/mapboxsdk/plugins/maps/Geometry.kt similarity index 100% rename from ktx-mapbox-maps/src/main/java/com/mapbox/mapboxsdk/plugins/maps/Geometry.kt rename to ktx-maplibre-maps/src/main/java/com/mapbox/mapboxsdk/plugins/maps/Geometry.kt diff --git a/ktx-mapbox-maps/src/main/java/com/mapbox/mapboxsdk/plugins/maps/Maps.kt b/ktx-maplibre-maps/src/main/java/com/mapbox/mapboxsdk/plugins/maps/Maps.kt similarity index 100% rename from ktx-mapbox-maps/src/main/java/com/mapbox/mapboxsdk/plugins/maps/Maps.kt rename to ktx-maplibre-maps/src/main/java/com/mapbox/mapboxsdk/plugins/maps/Maps.kt diff --git a/ktx-mapbox-maps/src/test/java/com/mapbox/mapboxsdk/plugins/maps/GeometryTest.kt b/ktx-maplibre-maps/src/test/java/com/mapbox/mapboxsdk/plugins/maps/GeometryTest.kt similarity index 100% rename from ktx-mapbox-maps/src/test/java/com/mapbox/mapboxsdk/plugins/maps/GeometryTest.kt rename to ktx-maplibre-maps/src/test/java/com/mapbox/mapboxsdk/plugins/maps/GeometryTest.kt diff --git a/ktx-mapbox-maps/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/ktx-maplibre-maps/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker similarity index 100% rename from ktx-mapbox-maps/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker rename to ktx-maplibre-maps/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/settings.gradle b/settings.gradle index b5b13d71..5fa41572 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,5 +4,5 @@ include ':plugin-offline' include ':plugin-localization' include ':plugin-annotation' include ':plugin-markerview' -include ':ktx-mapbox-maps' -include ':plugin-scalebar' \ No newline at end of file +include ':ktx-maplibre-maps' +include ':plugin-scalebar' From 75fe6552aa5464c3753bfa2338cd609b2590ba3f Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Sun, 19 Feb 2023 10:05:03 -0800 Subject: [PATCH 23/40] ktx-maplibre-maps folders and refs --- ktx-maplibre-maps/src/main/AndroidManifest.xml | 2 +- .../maplibre/android}/plugins/maps/Geometry.kt | 6 +++--- .../maplibre/android}/plugins/maps/Maps.kt | 12 ++++++------ .../maplibre/android}/plugins/maps/GeometryTest.kt | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) rename ktx-maplibre-maps/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/maps/Geometry.kt (82%) rename ktx-maplibre-maps/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/maps/Maps.kt (89%) rename ktx-maplibre-maps/src/test/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/maps/GeometryTest.kt (87%) diff --git a/ktx-maplibre-maps/src/main/AndroidManifest.xml b/ktx-maplibre-maps/src/main/AndroidManifest.xml index f003536f..997d4dc6 100644 --- a/ktx-maplibre-maps/src/main/AndroidManifest.xml +++ b/ktx-maplibre-maps/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ + package="org.maplibre.android.plugins.maps"/> diff --git a/ktx-maplibre-maps/src/main/java/com/mapbox/mapboxsdk/plugins/maps/Geometry.kt b/ktx-maplibre-maps/src/main/java/org/maplibre/android/plugins/maps/Geometry.kt similarity index 82% rename from ktx-maplibre-maps/src/main/java/com/mapbox/mapboxsdk/plugins/maps/Geometry.kt rename to ktx-maplibre-maps/src/main/java/org/maplibre/android/plugins/maps/Geometry.kt index b207551a..bd485c45 100644 --- a/ktx-maplibre-maps/src/main/java/com/mapbox/mapboxsdk/plugins/maps/Geometry.kt +++ b/ktx-maplibre-maps/src/main/java/org/maplibre/android/plugins/maps/Geometry.kt @@ -1,7 +1,7 @@ -package com.mapbox.mapboxsdk.plugins.maps +package org.maplibre.android.plugins.maps import com.mapbox.geojson.Point -import com.mapbox.mapboxsdk.geometry.LatLng +import org.maplibre.android.geometry.LatLng /** * Returns a LatLng representation @@ -19,4 +19,4 @@ inline fun LatLng.toPoint(): Point { */ inline fun Point.toLatLng(): LatLng { return LatLng(this.latitude(), this.longitude()) -} \ No newline at end of file +} diff --git a/ktx-maplibre-maps/src/main/java/com/mapbox/mapboxsdk/plugins/maps/Maps.kt b/ktx-maplibre-maps/src/main/java/org/maplibre/android/plugins/maps/Maps.kt similarity index 89% rename from ktx-maplibre-maps/src/main/java/com/mapbox/mapboxsdk/plugins/maps/Maps.kt rename to ktx-maplibre-maps/src/main/java/org/maplibre/android/plugins/maps/Maps.kt index 4469e785..5789a463 100644 --- a/ktx-maplibre-maps/src/main/java/com/mapbox/mapboxsdk/plugins/maps/Maps.kt +++ b/ktx-maplibre-maps/src/main/java/org/maplibre/android/plugins/maps/Maps.kt @@ -1,11 +1,11 @@ -package com.mapbox.mapboxsdk.plugins.maps +package org.maplibre.android.plugins.maps import android.graphics.RectF import com.mapbox.geojson.Feature -import com.mapbox.mapboxsdk.geometry.LatLng -import com.mapbox.mapboxsdk.geometry.LatLngBounds -import com.mapbox.mapboxsdk.maps.MapboxMap -import com.mapbox.mapboxsdk.style.expressions.Expression +import org.maplibre.android.geometry.LatLng +import org.maplibre.android.geometry.LatLngBounds +import org.maplibre.android.maps.MapboxMap +import org.maplibre.android.style.expressions.Expression /** * Queries the map for rendered features @@ -59,4 +59,4 @@ inline fun MapboxMap.queryRenderedFeatures(latLngBounds: LatLngBounds, val bottomLeft = this.projection.toScreenLocation(latLngBounds.southWest) val rectF = RectF(bottomLeft.x, topRight.y, topRight.x, bottomLeft.y) return this.queryRenderedFeatures(rectF, filter, *layerIds) -} \ No newline at end of file +} diff --git a/ktx-maplibre-maps/src/test/java/com/mapbox/mapboxsdk/plugins/maps/GeometryTest.kt b/ktx-maplibre-maps/src/test/java/org/maplibre/android/plugins/maps/GeometryTest.kt similarity index 87% rename from ktx-maplibre-maps/src/test/java/com/mapbox/mapboxsdk/plugins/maps/GeometryTest.kt rename to ktx-maplibre-maps/src/test/java/org/maplibre/android/plugins/maps/GeometryTest.kt index 17c5b54b..4fba86fb 100644 --- a/ktx-maplibre-maps/src/test/java/com/mapbox/mapboxsdk/plugins/maps/GeometryTest.kt +++ b/ktx-maplibre-maps/src/test/java/org/maplibre/android/plugins/maps/GeometryTest.kt @@ -1,7 +1,7 @@ -package com.mapbox.mapboxsdk.plugins.maps +package org.maplibre.android.plugins.maps import com.mapbox.geojson.Point -import com.mapbox.mapboxsdk.geometry.LatLng +import org.maplibre.android.geometry.LatLng import junit.framework.Assert import org.junit.Test import org.junit.runner.RunWith @@ -23,4 +23,4 @@ class GeometryTest { val point = Point.fromLngLat(10.0, 25.0) Assert.assertEquals("LatLng should match", expectedLatLng, point.toLatLng()) } -} \ No newline at end of file +} From 1f30662c3dc33d2fd256f2f317ea81759a35614b Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Sun, 19 Feb 2023 10:11:00 -0800 Subject: [PATCH 24/40] ktx-maplibre-maps reverting refs to only package names --- .../org/maplibre/android/plugins/maps/Geometry.kt | 2 +- .../java/org/maplibre/android/plugins/maps/Maps.kt | 8 ++++---- .../maplibre/android/plugins/maps/GeometryTest.kt | 2 +- .../scripts/annotation_element_provider.java.ejs | 2 +- .../annotation_instrumentation_test.junit.ejs | 14 +++++++------- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ktx-maplibre-maps/src/main/java/org/maplibre/android/plugins/maps/Geometry.kt b/ktx-maplibre-maps/src/main/java/org/maplibre/android/plugins/maps/Geometry.kt index bd485c45..22d7d841 100644 --- a/ktx-maplibre-maps/src/main/java/org/maplibre/android/plugins/maps/Geometry.kt +++ b/ktx-maplibre-maps/src/main/java/org/maplibre/android/plugins/maps/Geometry.kt @@ -1,7 +1,7 @@ package org.maplibre.android.plugins.maps import com.mapbox.geojson.Point -import org.maplibre.android.geometry.LatLng +import com.mapbox.mapboxsdk.geometry.LatLng /** * Returns a LatLng representation diff --git a/ktx-maplibre-maps/src/main/java/org/maplibre/android/plugins/maps/Maps.kt b/ktx-maplibre-maps/src/main/java/org/maplibre/android/plugins/maps/Maps.kt index 5789a463..b3c14058 100644 --- a/ktx-maplibre-maps/src/main/java/org/maplibre/android/plugins/maps/Maps.kt +++ b/ktx-maplibre-maps/src/main/java/org/maplibre/android/plugins/maps/Maps.kt @@ -2,10 +2,10 @@ package org.maplibre.android.plugins.maps import android.graphics.RectF import com.mapbox.geojson.Feature -import org.maplibre.android.geometry.LatLng -import org.maplibre.android.geometry.LatLngBounds -import org.maplibre.android.maps.MapboxMap -import org.maplibre.android.style.expressions.Expression +import com.mapbox.mapboxsdk.geometry.LatLng +import com.mapbox.mapboxsdk.geometry.LatLngBounds +import com.mapbox.mapboxsdk.maps.MapboxMap +import com.mapbox.mapboxsdk.style.expressions.Expression /** * Queries the map for rendered features diff --git a/ktx-maplibre-maps/src/test/java/org/maplibre/android/plugins/maps/GeometryTest.kt b/ktx-maplibre-maps/src/test/java/org/maplibre/android/plugins/maps/GeometryTest.kt index 4fba86fb..06ae04e8 100644 --- a/ktx-maplibre-maps/src/test/java/org/maplibre/android/plugins/maps/GeometryTest.kt +++ b/ktx-maplibre-maps/src/test/java/org/maplibre/android/plugins/maps/GeometryTest.kt @@ -1,7 +1,7 @@ package org.maplibre.android.plugins.maps import com.mapbox.geojson.Point -import org.maplibre.android.geometry.LatLng +import com.mapbox.mapboxsdk.geometry.LatLng import junit.framework.Assert import org.junit.Test import org.junit.runner.RunWith diff --git a/plugin-annotation/scripts/annotation_element_provider.java.ejs b/plugin-annotation/scripts/annotation_element_provider.java.ejs index 1c4d38b1..c81af085 100644 --- a/plugin-annotation/scripts/annotation_element_provider.java.ejs +++ b/plugin-annotation/scripts/annotation_element_provider.java.ejs @@ -51,4 +51,4 @@ class <%- camelize(type) %>ElementProvider implements CoreElementProvider<<%- ca public GeoJsonSource getSource(@Nullable GeoJsonOptions geoJsonOptions) { return new GeoJsonSource(sourceId, geoJsonOptions); } -} \ No newline at end of file +} diff --git a/plugin-annotation/scripts/annotation_instrumentation_test.junit.ejs b/plugin-annotation/scripts/annotation_instrumentation_test.junit.ejs index d2e5e645..54216f91 100644 --- a/plugin-annotation/scripts/annotation_instrumentation_test.junit.ejs +++ b/plugin-annotation/scripts/annotation_instrumentation_test.junit.ejs @@ -4,15 +4,15 @@ -%> // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import android.graphics.PointF; import androidx.test.ext.junit.runners.AndroidJUnit4; -import com.mapbox.mapboxsdk.geometry.LatLng; -import com.mapbox.mapboxsdk.plugins.BaseActivityTest; -import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; -import com.mapbox.mapboxsdk.utils.ColorUtils; +import org.maplibre.android.geometry.LatLng; +import org.maplibre.android.plugins.BaseActivityTest; +import org.maplibre.android.plugins.testapp.activity.TestActivity; +import org.maplibre.android.utils.ColorUtils; import timber.log.Timber; import org.junit.Test; @@ -20,9 +20,9 @@ import org.junit.runner.RunWith; import java.util.Objects; -import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke; +import static org.maplibre.android.plugins.annotation.MapboxMapAction.invoke; import static org.junit.Assert.*; -import static com.mapbox.mapboxsdk.style.layers.Property.*; +import static org.maplibre.android.style.layers.Property.*; import java.util.ArrayList; import java.util.List; From c4e35af4f045d30e2f92bc08cd365d1206c8f3c6 Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Sun, 19 Feb 2023 10:15:14 -0800 Subject: [PATCH 25/40] plugin annotation renames --- plugin-annotation/README.md | 2 +- plugin-annotation/src/main/AndroidManifest.xml | 2 +- .../maplibre/android}/plugins/annotation/Annotation.java | 4 ++-- .../android}/plugins/annotation/AnnotationManager.java | 2 +- .../maplibre/android}/plugins/annotation/Circle.java | 2 +- .../plugins/annotation/CircleElementProvider.java | 4 ++-- .../android}/plugins/annotation/CircleManager.java | 2 +- .../android}/plugins/annotation/CircleOptions.java | 8 ++++---- .../android}/plugins/annotation/ClusterOptions.java | 2 +- .../android}/plugins/annotation/ConvertUtils.java | 2 +- .../android}/plugins/annotation/CoreElementProvider.java | 2 +- .../plugins/annotation/DraggableAnnotationController.java | 4 ++-- .../maplibre/android}/plugins/annotation/Fill.java | 2 +- .../android}/plugins/annotation/FillElementProvider.java | 4 ++-- .../maplibre/android}/plugins/annotation/FillManager.java | 2 +- .../maplibre/android}/plugins/annotation/FillOptions.java | 8 ++++---- .../maplibre/android}/plugins/annotation/Line.java | 2 +- .../android}/plugins/annotation/LineElementProvider.java | 4 ++-- .../maplibre/android}/plugins/annotation/LineManager.java | 2 +- .../maplibre/android}/plugins/annotation/LineOptions.java | 8 ++++---- .../plugins/annotation/OnAnnotationClickListener.java | 2 +- .../plugins/annotation/OnAnnotationDragListener.java | 4 ++-- .../plugins/annotation/OnAnnotationLongClickListener.java | 2 +- .../plugins/annotation/OnCircleClickListener.java | 2 +- .../android}/plugins/annotation/OnCircleDragListener.java | 2 +- .../plugins/annotation/OnCircleLongClickListener.java | 2 +- .../android}/plugins/annotation/OnFillClickListener.java | 2 +- .../android}/plugins/annotation/OnFillDragListener.java | 2 +- .../plugins/annotation/OnFillLongClickListener.java | 2 +- .../android}/plugins/annotation/OnLineClickListener.java | 2 +- .../android}/plugins/annotation/OnLineDragListener.java | 2 +- .../plugins/annotation/OnLineLongClickListener.java | 2 +- .../plugins/annotation/OnSymbolClickListener.java | 2 +- .../android}/plugins/annotation/OnSymbolDragListener.java | 2 +- .../plugins/annotation/OnSymbolLongClickListener.java | 2 +- .../maplibre/android}/plugins/annotation/Options.java | 2 +- .../maplibre/android}/plugins/annotation/Symbol.java | 2 +- .../plugins/annotation/SymbolElementProvider.java | 2 +- .../android}/plugins/annotation/SymbolManager.java | 2 +- .../android}/plugins/annotation/SymbolOptions.java | 8 ++++---- .../android}/plugins/annotation/CircleManagerTest.java | 4 ++-- .../annotation/DraggableAnnotationControllerTest.java | 2 +- .../android}/plugins/annotation/FillManagerTest.java | 4 ++-- .../android}/plugins/annotation/LineManagerTest.java | 4 ++-- .../android}/plugins/annotation/PropertyValueMatcher.java | 2 +- .../android}/plugins/annotation/SymbolManagerTest.java | 4 ++-- 46 files changed, 68 insertions(+), 68 deletions(-) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/Annotation.java (98%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/AnnotationManager.java (99%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/Circle.java (99%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/CircleElementProvider.java (96%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/CircleManager.java (99%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/CircleOptions.java (97%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/ClusterOptions.java (99%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/ConvertUtils.java (96%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/CoreElementProvider.java (88%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/DraggableAnnotationController.java (99%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/Fill.java (99%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/FillElementProvider.java (96%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/FillManager.java (99%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/FillOptions.java (97%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/Line.java (99%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/LineElementProvider.java (96%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/LineManager.java (99%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/LineOptions.java (97%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/OnAnnotationClickListener.java (91%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/OnAnnotationDragListener.java (93%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/OnAnnotationLongClickListener.java (91%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/OnCircleClickListener.java (80%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/OnCircleDragListener.java (80%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/OnCircleLongClickListener.java (81%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/OnFillClickListener.java (80%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/OnFillDragListener.java (79%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/OnFillLongClickListener.java (81%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/OnLineClickListener.java (80%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/OnLineDragListener.java (79%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/OnLineLongClickListener.java (81%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/OnSymbolClickListener.java (80%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/OnSymbolDragListener.java (80%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/OnSymbolLongClickListener.java (81%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/Options.java (74%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/Symbol.java (99%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/SymbolElementProvider.java (96%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/SymbolManager.java (99%) rename plugin-annotation/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/SymbolOptions.java (99%) rename plugin-annotation/src/test/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/CircleManagerTest.java (99%) rename plugin-annotation/src/test/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/DraggableAnnotationControllerTest.java (99%) rename plugin-annotation/src/test/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/FillManagerTest.java (99%) rename plugin-annotation/src/test/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/LineManagerTest.java (99%) rename plugin-annotation/src/test/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/PropertyValueMatcher.java (95%) rename plugin-annotation/src/test/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/SymbolManagerTest.java (99%) diff --git a/plugin-annotation/README.md b/plugin-annotation/README.md index 9cf867a9..dd35350c 100644 --- a/plugin-annotation/README.md +++ b/plugin-annotation/README.md @@ -31,7 +31,7 @@ android { } dependencies { - implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-annotation-v9:0.9.0' + implementation 'org.maplibre.android:maplibre-android-plugin-annotation-v9:0.9.0' } ``` diff --git a/plugin-annotation/src/main/AndroidManifest.xml b/plugin-annotation/src/main/AndroidManifest.xml index f7cf8b79..b8c8da0a 100644 --- a/plugin-annotation/src/main/AndroidManifest.xml +++ b/plugin-annotation/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Annotation.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Annotation.java similarity index 98% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Annotation.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Annotation.java index 27b097b1..4bdf734f 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Annotation.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Annotation.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -140,4 +140,4 @@ public String toString() { + ", isDraggable=" + isDraggable + '}'; } -} \ No newline at end of file +} diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/AnnotationManager.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/AnnotationManager.java similarity index 99% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/AnnotationManager.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/AnnotationManager.java index d7d5def5..00889077 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/AnnotationManager.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/AnnotationManager.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import android.graphics.PointF; diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Circle.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Circle.java similarity index 99% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Circle.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Circle.java index 5ef645eb..df23450d 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Circle.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Circle.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.annotation.ColorInt; import androidx.annotation.NonNull; diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleElementProvider.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CircleElementProvider.java similarity index 96% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleElementProvider.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CircleElementProvider.java index a8321e18..296be57a 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleElementProvider.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CircleElementProvider.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.annotation.Nullable; import com.mapbox.mapboxsdk.style.layers.CircleLayer; @@ -46,4 +46,4 @@ public CircleLayer getLayer() { public GeoJsonSource getSource(@Nullable GeoJsonOptions geoJsonOptions) { return new GeoJsonSource(sourceId, geoJsonOptions); } -} \ No newline at end of file +} diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManager.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CircleManager.java similarity index 99% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManager.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CircleManager.java index d64fa7f9..60ac7fe7 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManager.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CircleManager.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleOptions.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CircleOptions.java similarity index 97% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleOptions.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CircleOptions.java index d839cb72..bb79ac4d 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleOptions.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CircleOptions.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -16,9 +16,9 @@ import java.util.ArrayList; import java.util.List; -import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.convertArray; -import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.toFloatArray; -import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.toStringArray; +import static org.maplibre.android.plugins.annotation.ConvertUtils.convertArray; +import static org.maplibre.android.plugins.annotation.ConvertUtils.toFloatArray; +import static org.maplibre.android.plugins.annotation.ConvertUtils.toStringArray; /** * Builder class from which a circle is created. diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/ClusterOptions.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/ClusterOptions.java similarity index 99% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/ClusterOptions.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/ClusterOptions.java index c9f372f5..3bb09b9a 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/ClusterOptions.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/ClusterOptions.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import android.graphics.Color; diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/ConvertUtils.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/ConvertUtils.java similarity index 96% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/ConvertUtils.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/ConvertUtils.java index 5460063b..30fd551a 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/ConvertUtils.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/ConvertUtils.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import com.google.gson.JsonArray; diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CoreElementProvider.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CoreElementProvider.java similarity index 88% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CoreElementProvider.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CoreElementProvider.java index 37a64f23..d656ec27 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CoreElementProvider.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CoreElementProvider.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import com.mapbox.mapboxsdk.style.layers.Layer; import com.mapbox.mapboxsdk.style.sources.GeoJsonOptions; diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/DraggableAnnotationController.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/DraggableAnnotationController.java similarity index 99% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/DraggableAnnotationController.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/DraggableAnnotationController.java index b9be243d..96aff7b7 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/DraggableAnnotationController.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/DraggableAnnotationController.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import android.annotation.SuppressLint; import android.graphics.PointF; @@ -197,4 +197,4 @@ public void onMoveEnd(MoveGestureDetector detector, float velocityX, float veloc DraggableAnnotationController.this.onMoveEnd(); } } -} \ No newline at end of file +} diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Fill.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Fill.java similarity index 99% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Fill.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Fill.java index b009df4f..e6e81185 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Fill.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Fill.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.annotation.ColorInt; import androidx.annotation.NonNull; diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/FillElementProvider.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/FillElementProvider.java similarity index 96% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/FillElementProvider.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/FillElementProvider.java index 4b9648af..6a5f83d4 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/FillElementProvider.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/FillElementProvider.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.annotation.Nullable; import com.mapbox.mapboxsdk.style.layers.FillLayer; @@ -46,4 +46,4 @@ public FillLayer getLayer() { public GeoJsonSource getSource(@Nullable GeoJsonOptions geoJsonOptions) { return new GeoJsonSource(sourceId, geoJsonOptions); } -} \ No newline at end of file +} diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/FillManager.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/FillManager.java similarity index 99% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/FillManager.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/FillManager.java index cc903f34..dfb1d10c 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/FillManager.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/FillManager.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/FillOptions.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/FillOptions.java similarity index 97% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/FillOptions.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/FillOptions.java index 752cd288..2b174a31 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/FillOptions.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/FillOptions.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -16,9 +16,9 @@ import java.util.ArrayList; import java.util.List; -import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.convertArray; -import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.toFloatArray; -import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.toStringArray; +import static org.maplibre.android.plugins.annotation.ConvertUtils.convertArray; +import static org.maplibre.android.plugins.annotation.ConvertUtils.toFloatArray; +import static org.maplibre.android.plugins.annotation.ConvertUtils.toStringArray; /** * Builder class from which a fill is created. diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Line.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Line.java similarity index 99% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Line.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Line.java index c4cac02d..dbc9cb8c 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Line.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Line.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.annotation.ColorInt; import androidx.annotation.NonNull; diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/LineElementProvider.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/LineElementProvider.java similarity index 96% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/LineElementProvider.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/LineElementProvider.java index 4d7079e7..82726c97 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/LineElementProvider.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/LineElementProvider.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.annotation.Nullable; import com.mapbox.mapboxsdk.style.layers.LineLayer; @@ -46,4 +46,4 @@ public LineLayer getLayer() { public GeoJsonSource getSource(@Nullable GeoJsonOptions geoJsonOptions) { return new GeoJsonSource(sourceId, geoJsonOptions); } -} \ No newline at end of file +} diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/LineManager.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/LineManager.java similarity index 99% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/LineManager.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/LineManager.java index d9e8aa54..500a53c5 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/LineManager.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/LineManager.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/LineOptions.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/LineOptions.java similarity index 97% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/LineOptions.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/LineOptions.java index b530dd7d..2acbf364 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/LineOptions.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/LineOptions.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -16,9 +16,9 @@ import java.util.ArrayList; import java.util.List; -import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.convertArray; -import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.toFloatArray; -import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.toStringArray; +import static org.maplibre.android.plugins.annotation.ConvertUtils.convertArray; +import static org.maplibre.android.plugins.annotation.ConvertUtils.toFloatArray; +import static org.maplibre.android.plugins.annotation.ConvertUtils.toStringArray; /** * Builder class from which a line is created. diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnAnnotationClickListener.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnAnnotationClickListener.java similarity index 91% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnAnnotationClickListener.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnAnnotationClickListener.java index e89828d3..cfa15236 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnAnnotationClickListener.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnAnnotationClickListener.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; /** * Generic interface definition of a callback to be invoked when an annotation has been clicked. diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnAnnotationDragListener.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnAnnotationDragListener.java similarity index 93% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnAnnotationDragListener.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnAnnotationDragListener.java index adeed4d8..a10b1962 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnAnnotationDragListener.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnAnnotationDragListener.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; /** * Generic interface definition of a callback to be invoked when an annotation is being dragged. @@ -27,4 +27,4 @@ public interface OnAnnotationDragListener { * @param annotation the annotation */ void onAnnotationDragFinished(T annotation); -} \ No newline at end of file +} diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnAnnotationLongClickListener.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnAnnotationLongClickListener.java similarity index 91% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnAnnotationLongClickListener.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnAnnotationLongClickListener.java index da075472..7af1ffc4 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnAnnotationLongClickListener.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnAnnotationLongClickListener.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; /** * Generic interface definition of a callback to be invoked when an annotation has been long clicked. diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnCircleClickListener.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnCircleClickListener.java similarity index 80% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnCircleClickListener.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnCircleClickListener.java index 22b4957a..e6709d3e 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnCircleClickListener.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnCircleClickListener.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; /** * Interface definition for a callback to be invoked when a circle has been clicked. diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnCircleDragListener.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnCircleDragListener.java similarity index 80% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnCircleDragListener.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnCircleDragListener.java index b345e964..d07adfaa 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnCircleDragListener.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnCircleDragListener.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; /** * Interface definition for a callback to be invoked when a circle is dragged. diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnCircleLongClickListener.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnCircleLongClickListener.java similarity index 81% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnCircleLongClickListener.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnCircleLongClickListener.java index a3d9bf85..01ef6bf9 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnCircleLongClickListener.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnCircleLongClickListener.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; /** * Interface definition for a callback to be invoked when a circle has been long clicked. diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnFillClickListener.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnFillClickListener.java similarity index 80% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnFillClickListener.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnFillClickListener.java index eadaf81b..20366b64 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnFillClickListener.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnFillClickListener.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; /** * Interface definition for a callback to be invoked when a fill has been clicked. diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnFillDragListener.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnFillDragListener.java similarity index 79% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnFillDragListener.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnFillDragListener.java index da1728bb..86071217 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnFillDragListener.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnFillDragListener.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; /** * Interface definition for a callback to be invoked when a fill is dragged. diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnFillLongClickListener.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnFillLongClickListener.java similarity index 81% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnFillLongClickListener.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnFillLongClickListener.java index 5e695109..21dcd471 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnFillLongClickListener.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnFillLongClickListener.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; /** * Interface definition for a callback to be invoked when a fill has been long clicked. diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnLineClickListener.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnLineClickListener.java similarity index 80% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnLineClickListener.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnLineClickListener.java index e7b8e57b..92c9e30d 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnLineClickListener.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnLineClickListener.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; /** * Interface definition for a callback to be invoked when a line has been clicked. diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnLineDragListener.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnLineDragListener.java similarity index 79% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnLineDragListener.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnLineDragListener.java index ed7d9fd3..45bd86ab 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnLineDragListener.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnLineDragListener.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; /** * Interface definition for a callback to be invoked when a line is dragged. diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnLineLongClickListener.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnLineLongClickListener.java similarity index 81% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnLineLongClickListener.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnLineLongClickListener.java index 791d0a77..423b26e4 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnLineLongClickListener.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnLineLongClickListener.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; /** * Interface definition for a callback to be invoked when a line has been long clicked. diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnSymbolClickListener.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnSymbolClickListener.java similarity index 80% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnSymbolClickListener.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnSymbolClickListener.java index 1c804d35..d0f66c38 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnSymbolClickListener.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnSymbolClickListener.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; /** * Interface definition for a callback to be invoked when a symbol has been clicked. diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnSymbolDragListener.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnSymbolDragListener.java similarity index 80% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnSymbolDragListener.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnSymbolDragListener.java index 405b31c4..e4273b68 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnSymbolDragListener.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnSymbolDragListener.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; /** * Interface definition for a callback to be invoked when a symbol is dragged. diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnSymbolLongClickListener.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnSymbolLongClickListener.java similarity index 81% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnSymbolLongClickListener.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnSymbolLongClickListener.java index 35a1f63f..6ae91b98 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnSymbolLongClickListener.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnSymbolLongClickListener.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; /** * Interface definition for a callback to be invoked when a symbol has been long clicked. diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Options.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Options.java similarity index 74% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Options.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Options.java index eb95be46..241a6ca3 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Options.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Options.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; public abstract class Options { diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Symbol.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Symbol.java similarity index 99% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Symbol.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Symbol.java index 28a89d64..9260440b 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Symbol.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Symbol.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.annotation.ColorInt; import androidx.annotation.NonNull; diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolElementProvider.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/SymbolElementProvider.java similarity index 96% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolElementProvider.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/SymbolElementProvider.java index c27b8678..71ff0c15 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolElementProvider.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/SymbolElementProvider.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.annotation.Nullable; import com.mapbox.mapboxsdk.style.layers.SymbolLayer; diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManager.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/SymbolManager.java similarity index 99% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManager.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/SymbolManager.java index e5f62e88..7785ae2e 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManager.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/SymbolManager.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolOptions.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/SymbolOptions.java similarity index 99% rename from plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolOptions.java rename to plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/SymbolOptions.java index 88561c87..d249b2c7 100644 --- a/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolOptions.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/SymbolOptions.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -16,9 +16,9 @@ import java.util.ArrayList; import java.util.List; -import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.convertArray; -import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.toFloatArray; -import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.toStringArray; +import static org.maplibre.android.plugins.annotation.ConvertUtils.convertArray; +import static org.maplibre.android.plugins.annotation.ConvertUtils.toFloatArray; +import static org.maplibre.android.plugins.annotation.ConvertUtils.toStringArray; /** * Builder class from which a symbol is created. diff --git a/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManagerTest.java b/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/CircleManagerTest.java similarity index 99% rename from plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManagerTest.java rename to plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/CircleManagerTest.java index 3ff0f271..caff247d 100644 --- a/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManagerTest.java +++ b/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/CircleManagerTest.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import com.google.gson.JsonPrimitive; import com.mapbox.geojson.*; @@ -22,7 +22,7 @@ import java.util.Arrays; import android.graphics.PointF; -import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.convertArray; +import static org.maplibre.android.plugins.annotation.ConvertUtils.convertArray; import static com.mapbox.mapboxsdk.style.expressions.Expression.get; import static com.mapbox.mapboxsdk.style.layers.Property.*; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; diff --git a/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/DraggableAnnotationControllerTest.java b/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/DraggableAnnotationControllerTest.java similarity index 99% rename from plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/DraggableAnnotationControllerTest.java rename to plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/DraggableAnnotationControllerTest.java index 8902cd65..c140bf5a 100644 --- a/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/DraggableAnnotationControllerTest.java +++ b/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/DraggableAnnotationControllerTest.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import android.graphics.PointF; diff --git a/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/FillManagerTest.java b/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/FillManagerTest.java similarity index 99% rename from plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/FillManagerTest.java rename to plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/FillManagerTest.java index 84b5469c..02aa7bf4 100644 --- a/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/FillManagerTest.java +++ b/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/FillManagerTest.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import com.google.gson.JsonPrimitive; import com.mapbox.geojson.*; @@ -22,7 +22,7 @@ import java.util.Arrays; import android.graphics.PointF; -import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.convertArray; +import static org.maplibre.android.plugins.annotation.ConvertUtils.convertArray; import static com.mapbox.mapboxsdk.style.expressions.Expression.get; import static com.mapbox.mapboxsdk.style.layers.Property.*; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; diff --git a/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/LineManagerTest.java b/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/LineManagerTest.java similarity index 99% rename from plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/LineManagerTest.java rename to plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/LineManagerTest.java index b062de62..02da2bfc 100644 --- a/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/LineManagerTest.java +++ b/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/LineManagerTest.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import com.google.gson.JsonPrimitive; import com.mapbox.geojson.*; @@ -22,7 +22,7 @@ import java.util.Arrays; import android.graphics.PointF; -import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.convertArray; +import static org.maplibre.android.plugins.annotation.ConvertUtils.convertArray; import static com.mapbox.mapboxsdk.style.expressions.Expression.get; import static com.mapbox.mapboxsdk.style.layers.Property.*; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; diff --git a/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/PropertyValueMatcher.java b/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/PropertyValueMatcher.java similarity index 95% rename from plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/PropertyValueMatcher.java rename to plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/PropertyValueMatcher.java index 5c8a0ee7..7f12e054 100644 --- a/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/PropertyValueMatcher.java +++ b/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/PropertyValueMatcher.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import com.mapbox.mapboxsdk.style.layers.PropertyValue; diff --git a/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManagerTest.java b/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/SymbolManagerTest.java similarity index 99% rename from plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManagerTest.java rename to plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/SymbolManagerTest.java index 0ee0a554..beb2af08 100644 --- a/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManagerTest.java +++ b/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/SymbolManagerTest.java @@ -1,6 +1,6 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import com.google.gson.JsonPrimitive; import com.mapbox.geojson.*; @@ -22,7 +22,7 @@ import java.util.Arrays; import android.graphics.PointF; -import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.convertArray; +import static org.maplibre.android.plugins.annotation.ConvertUtils.convertArray; import static com.mapbox.mapboxsdk.style.expressions.Expression.get; import static com.mapbox.mapboxsdk.style.layers.Property.*; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; From b01ecf998dddb960d21f6bbde31e48bb09f057ba Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Sun, 19 Feb 2023 10:18:35 -0800 Subject: [PATCH 26/40] building refs updated --- plugin-annotation/README.md | 2 +- plugin-building/README.md | 4 ++-- plugin-building/src/main/AndroidManifest.xml | 2 +- .../com/mapbox/mapboxsdk/plugins/building/package-info.java | 6 ------ .../maplibre/android}/plugins/building/BuildingPlugin.java | 6 ++---- .../org/maplibre/android/plugins/building/package-info.java | 6 ++++++ 6 files changed, 12 insertions(+), 14 deletions(-) delete mode 100644 plugin-building/src/main/java/com/mapbox/mapboxsdk/plugins/building/package-info.java rename plugin-building/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/building/BuildingPlugin.java (98%) create mode 100644 plugin-building/src/main/java/org/maplibre/android/plugins/building/package-info.java diff --git a/plugin-annotation/README.md b/plugin-annotation/README.md index dd35350c..ac7596a0 100644 --- a/plugin-annotation/README.md +++ b/plugin-annotation/README.md @@ -48,7 +48,7 @@ repositories { // In the app build.gradle file dependencies { - implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-annotation-v9:0.10.0-SNAPSHOT' + implementation 'org.maplibre.android:maplibre-android-plugin-annotation-v9:0.10.0-SNAPSHOT' } ``` diff --git a/plugin-building/README.md b/plugin-building/README.md index eebd6f77..bd0743df 100644 --- a/plugin-building/README.md +++ b/plugin-building/README.md @@ -20,7 +20,7 @@ repositories { // In the app build.gradle file dependencies { - implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-building-v9:0.7.0' + implementation 'org.maplibre.android:maplibre-android-plugin-building-v9:0.7.0' } ``` @@ -37,7 +37,7 @@ repositories { // In the app build.gradle file dependencies { - implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-building-v9:0.8.0-SNAPSHOT' + implementation 'org.maplibre.android:maplibre-android-plugin-building-v9:0.8.0-SNAPSHOT' } ``` diff --git a/plugin-building/src/main/AndroidManifest.xml b/plugin-building/src/main/AndroidManifest.xml index 64632bbd..9e739606 100644 --- a/plugin-building/src/main/AndroidManifest.xml +++ b/plugin-building/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/plugin-building/src/main/java/com/mapbox/mapboxsdk/plugins/building/package-info.java b/plugin-building/src/main/java/com/mapbox/mapboxsdk/plugins/building/package-info.java deleted file mode 100644 index 99d39d42..00000000 --- a/plugin-building/src/main/java/com/mapbox/mapboxsdk/plugins/building/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Contains logic used for the Mapbox Buildings Plugin. - * - * @since 0.1.0 - */ -package com.mapbox.mapboxsdk.plugins.building; \ No newline at end of file diff --git a/plugin-building/src/main/java/com/mapbox/mapboxsdk/plugins/building/BuildingPlugin.java b/plugin-building/src/main/java/org/maplibre/android/plugins/building/BuildingPlugin.java similarity index 98% rename from plugin-building/src/main/java/com/mapbox/mapboxsdk/plugins/building/BuildingPlugin.java rename to plugin-building/src/main/java/org/maplibre/android/plugins/building/BuildingPlugin.java index 44ca01e2..91246f75 100644 --- a/plugin-building/src/main/java/com/mapbox/mapboxsdk/plugins/building/BuildingPlugin.java +++ b/plugin-building/src/main/java/org/maplibre/android/plugins/building/BuildingPlugin.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.building; +package org.maplibre.android.plugins.building; import android.graphics.Color; @@ -29,7 +29,7 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility; /** - * The building plugin allows you to add 3d buildings FillExtrusionLayer to the Mapbox Maps SDK for + * The building plugin allows you to add 3d buildings FillExtrusionLayer to the Maplibre Maps SDK for * Android v5.1.0. *

* Initialise this plugin in the {@link com.mapbox.mapboxsdk.maps.OnMapReadyCallback#onMapReady(MapboxMap)} @@ -218,5 +218,3 @@ public Light getLight() { return light; } } - - diff --git a/plugin-building/src/main/java/org/maplibre/android/plugins/building/package-info.java b/plugin-building/src/main/java/org/maplibre/android/plugins/building/package-info.java new file mode 100644 index 00000000..2c97f5de --- /dev/null +++ b/plugin-building/src/main/java/org/maplibre/android/plugins/building/package-info.java @@ -0,0 +1,6 @@ +/** + * Contains logic used for the Maplibre Buildings Plugin. + * + * @since 0.1.0 + */ +package org.maplibre.android.plugins.building; From ac7c273e6ec7eac212984413b8ad4705564a4c76 Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Sun, 19 Feb 2023 10:21:20 -0800 Subject: [PATCH 27/40] localization refs updated --- plugin-localization/README.md | 4 ++-- plugin-localization/src/main/AndroidManifest.xml | 2 +- .../mapbox/mapboxsdk/plugins/localization/package-info.java | 6 ------ .../android}/plugins/localization/LocalizationPlugin.java | 4 ++-- .../maplibre/android}/plugins/localization/MapLocale.java | 6 +++--- .../maplibre/android/plugins/localization/package-info.java | 6 ++++++ .../plugins/localization/LocalizationPluginTest.java | 4 ++-- .../android}/plugins/localization/MapLocaleTest.java | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/package-info.java rename plugin-localization/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/localization/LocalizationPlugin.java (99%) rename plugin-localization/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/localization/MapLocale.java (98%) create mode 100644 plugin-localization/src/main/java/org/maplibre/android/plugins/localization/package-info.java rename plugin-localization/src/test/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/localization/LocalizationPluginTest.java (96%) rename plugin-localization/src/test/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/localization/MapLocaleTest.java (96%) diff --git a/plugin-localization/README.md b/plugin-localization/README.md index a767abc7..f9c8be2a 100644 --- a/plugin-localization/README.md +++ b/plugin-localization/README.md @@ -21,7 +21,7 @@ repositories { // In the app build.gradle file dependencies { - implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-localization-v9:0.12.0' + implementation 'org.maplibre.android:maplibre-android-plugin-localization-v9:0.12.0' } ``` @@ -39,7 +39,7 @@ repositories { // In the app build.gradle file dependencies { - implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-localization-v9:0.13.0-SNAPSHOT' + implementation 'org.maplibre.android:maplibre-android-plugin-localization-v9:0.13.0-SNAPSHOT' } ``` diff --git a/plugin-localization/src/main/AndroidManifest.xml b/plugin-localization/src/main/AndroidManifest.xml index 060257cf..257168d1 100644 --- a/plugin-localization/src/main/AndroidManifest.xml +++ b/plugin-localization/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/package-info.java b/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/package-info.java deleted file mode 100644 index 6b045cd4..00000000 --- a/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Contains the classes relevant to the Mapbox Localization Plugin. - * - * @since 0.1.0 - */ -package com.mapbox.mapboxsdk.plugins.localization; \ No newline at end of file diff --git a/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/LocalizationPlugin.java b/plugin-localization/src/main/java/org/maplibre/android/plugins/localization/LocalizationPlugin.java similarity index 99% rename from plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/LocalizationPlugin.java rename to plugin-localization/src/main/java/org/maplibre/android/plugins/localization/LocalizationPlugin.java index 89580da9..f2e3c4ec 100644 --- a/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/LocalizationPlugin.java +++ b/plugin-localization/src/main/java/org/maplibre/android/plugins/localization/LocalizationPlugin.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.localization; +package org.maplibre.android.plugins.localization; import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; @@ -6,7 +6,7 @@ import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.Style; -import com.mapbox.mapboxsdk.plugins.localization.MapLocale.Languages; +import org.maplibre.android.plugins.localization.MapLocale.Languages; import com.mapbox.mapboxsdk.style.expressions.Expression; import com.mapbox.mapboxsdk.style.layers.Layer; import com.mapbox.mapboxsdk.style.layers.PropertyValue; diff --git a/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/MapLocale.java b/plugin-localization/src/main/java/org/maplibre/android/plugins/localization/MapLocale.java similarity index 98% rename from plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/MapLocale.java rename to plugin-localization/src/main/java/org/maplibre/android/plugins/localization/MapLocale.java index 3afb51c1..223d2c6d 100644 --- a/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/MapLocale.java +++ b/plugin-localization/src/main/java/org/maplibre/android/plugins/localization/MapLocale.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.localization; +package org.maplibre.android.plugins.localization; import com.mapbox.mapboxsdk.geometry.LatLng; @@ -17,7 +17,7 @@ /** * A {@link MapLocale} object builds off of the {@link Locale} object and provides additional - * geographical information particular to the Mapbox Maps SDK. Like Locale, MapLocale can be used to + * geographical information particular to the Maplibre Maps SDK. Like Locale, MapLocale can be used to * make the map locale sensitive. *

* The {@link MapLocale} object can be used to acquire the matching Locale's map language; useful for @@ -38,7 +38,7 @@ public final class MapLocale { /* - * Supported Mapbox map languages. + * Supported Maplibre map languages. */ /** diff --git a/plugin-localization/src/main/java/org/maplibre/android/plugins/localization/package-info.java b/plugin-localization/src/main/java/org/maplibre/android/plugins/localization/package-info.java new file mode 100644 index 00000000..45efe634 --- /dev/null +++ b/plugin-localization/src/main/java/org/maplibre/android/plugins/localization/package-info.java @@ -0,0 +1,6 @@ +/** + * Contains the classes relevant to the Maplibre Localization Plugin. + * + * @since 0.1.0 + */ +package org.maplibre.android.plugins.localization; diff --git a/plugin-localization/src/test/java/com/mapbox/mapboxsdk/plugins/localization/LocalizationPluginTest.java b/plugin-localization/src/test/java/org/maplibre/android/plugins/localization/LocalizationPluginTest.java similarity index 96% rename from plugin-localization/src/test/java/com/mapbox/mapboxsdk/plugins/localization/LocalizationPluginTest.java rename to plugin-localization/src/test/java/org/maplibre/android/plugins/localization/LocalizationPluginTest.java index c5dcd527..a5f1d0b5 100644 --- a/plugin-localization/src/test/java/com/mapbox/mapboxsdk/plugins/localization/LocalizationPluginTest.java +++ b/plugin-localization/src/test/java/org/maplibre/android/plugins/localization/LocalizationPluginTest.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.localization; +package org.maplibre.android.plugins.localization; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; @@ -48,4 +48,4 @@ public void setMapLanguage_localePassedInNotValid() throws Exception { = new LocalizationPlugin(mock(MapView.class), mock(MapboxMap.class), style); localizationPlugin.setMapLanguage(new Locale("foo", "bar"), false); } -} \ No newline at end of file +} diff --git a/plugin-localization/src/test/java/com/mapbox/mapboxsdk/plugins/localization/MapLocaleTest.java b/plugin-localization/src/test/java/org/maplibre/android/plugins/localization/MapLocaleTest.java similarity index 96% rename from plugin-localization/src/test/java/com/mapbox/mapboxsdk/plugins/localization/MapLocaleTest.java rename to plugin-localization/src/test/java/org/maplibre/android/plugins/localization/MapLocaleTest.java index f66f8a0a..c4e15dbe 100644 --- a/plugin-localization/src/test/java/com/mapbox/mapboxsdk/plugins/localization/MapLocaleTest.java +++ b/plugin-localization/src/test/java/org/maplibre/android/plugins/localization/MapLocaleTest.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.localization; +package org.maplibre.android.plugins.localization; import org.junit.Assert; import org.junit.Test; From 90a98c004805d69781fd175faa94a106f9fbfc00 Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Sun, 19 Feb 2023 10:22:33 -0800 Subject: [PATCH 28/40] markerview refs updated --- plugin-markerview/README.md | 4 ++-- plugin-markerview/src/main/AndroidManifest.xml | 2 +- .../maplibre/android}/plugins/markerview/MarkerView.java | 4 ++-- .../android}/plugins/markerview/MarkerViewManager.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename plugin-markerview/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/markerview/MarkerView.java (97%) rename plugin-markerview/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/markerview/MarkerViewManager.java (98%) diff --git a/plugin-markerview/README.md b/plugin-markerview/README.md index 1527f69b..05f650e0 100644 --- a/plugin-markerview/README.md +++ b/plugin-markerview/README.md @@ -22,7 +22,7 @@ repositories { // In the app build.gradle file dependencies { - implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-markerview-v9:0.4.0' + implementation 'org.maplibre.android:maplibre-android-plugin-markerview-v9:0.4.0' } ``` @@ -39,7 +39,7 @@ repositories { // In the app build.gradle file dependencies { - implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-markerview-v9:0.5.0-SNAPSHOT' + implementation 'org.maplibre.android:maplibre-android-plugin-markerview-v9:0.5.0-SNAPSHOT' } ``` diff --git a/plugin-markerview/src/main/AndroidManifest.xml b/plugin-markerview/src/main/AndroidManifest.xml index c53efedd..81ee0945 100644 --- a/plugin-markerview/src/main/AndroidManifest.xml +++ b/plugin-markerview/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ + package="org.maplibre.android.plugins.markerview"/> diff --git a/plugin-markerview/src/main/java/com/mapbox/mapboxsdk/plugins/markerview/MarkerView.java b/plugin-markerview/src/main/java/org/maplibre/android/plugins/markerview/MarkerView.java similarity index 97% rename from plugin-markerview/src/main/java/com/mapbox/mapboxsdk/plugins/markerview/MarkerView.java rename to plugin-markerview/src/main/java/org/maplibre/android/plugins/markerview/MarkerView.java index 9ded3b12..76bbd495 100644 --- a/plugin-markerview/src/main/java/com/mapbox/mapboxsdk/plugins/markerview/MarkerView.java +++ b/plugin-markerview/src/main/java/org/maplibre/android/plugins/markerview/MarkerView.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.markerview; +package org.maplibre.android.plugins.markerview; import android.graphics.PointF; import android.view.View; @@ -81,4 +81,4 @@ void update() { view.setY(point.y); } -} \ No newline at end of file +} diff --git a/plugin-markerview/src/main/java/com/mapbox/mapboxsdk/plugins/markerview/MarkerViewManager.java b/plugin-markerview/src/main/java/org/maplibre/android/plugins/markerview/MarkerViewManager.java similarity index 98% rename from plugin-markerview/src/main/java/com/mapbox/mapboxsdk/plugins/markerview/MarkerViewManager.java rename to plugin-markerview/src/main/java/org/maplibre/android/plugins/markerview/MarkerViewManager.java index e58ea1ff..b7c71e98 100644 --- a/plugin-markerview/src/main/java/com/mapbox/mapboxsdk/plugins/markerview/MarkerViewManager.java +++ b/plugin-markerview/src/main/java/org/maplibre/android/plugins/markerview/MarkerViewManager.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.markerview; +package org.maplibre.android.plugins.markerview; import com.mapbox.mapboxsdk.maps.MapView; From 35e23a930e4e1d4d06f7b90e5a8432c85bb4b371 Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Sun, 19 Feb 2023 10:25:08 -0800 Subject: [PATCH 29/40] offline refs updated --- plugin-offline/README.md | 4 +-- plugin-offline/src/main/AndroidManifest.xml | 8 +++--- .../offline/OfflinePluginConstants.java | 10 ------- .../offline/offline/OfflineConstants.java | 28 ------------------- .../offline/OfflinePluginConstants.java | 10 +++++++ .../offline/OfflineRegionSelector.java | 20 ++++++------- .../offline/model/NotificationOptions.java | 4 +-- .../offline/model/OfflineDownloadOptions.java | 6 ++-- .../offline/model/RegionSelectionOptions.java | 4 +-- .../offline/offline/OfflineConstants.java | 28 +++++++++++++++++++ .../OfflineDownloadChangeDispatcher.java | 4 +-- .../OfflineDownloadChangeListener.java | 4 +-- .../offline/OfflineDownloadService.java | 10 +++---- .../offline/OfflineDownloadStateReceiver.java | 6 ++-- .../offline/offline/OfflinePlugin.java | 6 ++-- .../plugins/offline/ui/OfflineActivity.java | 14 +++++----- .../offline/ui/RegionSelectedCallback.java | 2 +- .../offline/ui/RegionSelectionFragment.java | 8 +++--- .../plugins/offline/utils/ColorUtils.java | 2 +- .../offline/utils/NotificationUtils.java | 10 +++---- .../plugins/offline/utils/OfflineUtils.java | 2 +- 21 files changed, 95 insertions(+), 95 deletions(-) delete mode 100644 plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/OfflinePluginConstants.java delete mode 100644 plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineConstants.java create mode 100644 plugin-offline/src/main/java/org/maplibre/android/plugins/offline/OfflinePluginConstants.java rename plugin-offline/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/offline/OfflineRegionSelector.java (92%) rename plugin-offline/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/offline/model/NotificationOptions.java (94%) rename plugin-offline/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/offline/model/OfflineDownloadOptions.java (97%) rename plugin-offline/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/offline/model/RegionSelectionOptions.java (96%) create mode 100644 plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineConstants.java rename plugin-offline/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/offline/offline/OfflineDownloadChangeDispatcher.java (94%) rename plugin-offline/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/offline/offline/OfflineDownloadChangeListener.java (77%) rename plugin-offline/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/offline/offline/OfflineDownloadService.java (97%) rename plugin-offline/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/offline/offline/OfflineDownloadStateReceiver.java (96%) rename plugin-offline/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/offline/offline/OfflinePlugin.java (97%) rename plugin-offline/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/offline/ui/OfflineActivity.java (84%) rename plugin-offline/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/offline/ui/RegionSelectedCallback.java (80%) rename plugin-offline/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/offline/ui/RegionSelectionFragment.java (97%) rename plugin-offline/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/offline/utils/ColorUtils.java (92%) rename plugin-offline/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/offline/utils/NotificationUtils.java (88%) rename plugin-offline/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/offline/utils/OfflineUtils.java (96%) diff --git a/plugin-offline/README.md b/plugin-offline/README.md index a1128a33..0f9f96da 100644 --- a/plugin-offline/README.md +++ b/plugin-offline/README.md @@ -20,7 +20,7 @@ repositories { // In the app build.gradle file dependencies { - implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-offline-v9:0.7.0' + implementation 'org.maplibre.android:maplibre-android-plugin-offline-v9:0.7.0' } ``` @@ -37,7 +37,7 @@ repositories { // In the app build.gradle file dependencies { - implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-offline-v9:0.8.0-SNAPSHOT' + implementation 'org.maplibre.android:maplibre-android-plugin-offline-v9:0.8.0-SNAPSHOT' } ``` diff --git a/plugin-offline/src/main/AndroidManifest.xml b/plugin-offline/src/main/AndroidManifest.xml index e4c58ebf..48b844c5 100644 --- a/plugin-offline/src/main/AndroidManifest.xml +++ b/plugin-offline/src/main/AndroidManifest.xml @@ -1,16 +1,16 @@ + package="org.maplibre.android.plugins.offline"> - \ No newline at end of file + diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/OfflinePluginConstants.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/OfflinePluginConstants.java deleted file mode 100644 index 2fa47529..00000000 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/OfflinePluginConstants.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.mapbox.mapboxsdk.plugins.offline; - -public class OfflinePluginConstants { - - private OfflinePluginConstants() { - // No Instances - } - - public static final String REGION_SELECTION_OPTIONS = "com.mapbox.mapboxsdk.plugins.offline:region_selection_options"; -} diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineConstants.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineConstants.java deleted file mode 100644 index e60bbf9e..00000000 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineConstants.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.mapbox.mapboxsdk.plugins.offline.offline; - -public class OfflineConstants { - - private OfflineConstants() { - // No Instances - } - - static final String ACTION_START_DOWNLOAD = "com.mapbox.mapboxsdk.plugins.offline.download.start"; - static final String ACTION_CANCEL_DOWNLOAD = "com.mapbox.mapboxsdk.plugins.offline.download.cancel"; - static final String ACTION_OFFLINE = "com.mapbox.mapboxsdk.plugins.offline"; - static final String KEY_STATE = "com.mapbox.mapboxsdk.plugins.offline.state"; - static final String STATE_STARTED = "com.mapbox.mapboxsdk.plugins.offline.state.started"; - static final String STATE_FINISHED = "com.mapbox.mapboxsdk.plugins.offline.state.complete"; - static final String STATE_ERROR = "com.mapbox.mapboxsdk.plugins.offline.state.error"; - static final String STATE_CANCEL = "com.mapbox.mapboxsdk.plugins.offline.state.cancel"; - static final String STATE_PROGRESS = "com.mapbox.mapboxsdk.plugins.offline.state.progress"; - static final String KEY_BUNDLE_OFFLINE_REGION = "com.mapbox.mapboxsdk.plugins.offline.region"; - static final String KEY_BUNDLE_ERROR = "com.mapbox.mapboxsdk.plugins.offline.error"; - static final String KEY_BUNDLE_MESSAGE = "com.mapbox.mapboxsdk.plugins.offline.error"; - static final String KEY_PROGRESS = "com.mapbox.mapboxsdk.plugins.offline.progress"; - public static final String NOTIFICATION_CHANNEL = "offline"; - - public static final String RETURNING_DEFINITION = "com.mapbox.mapboxsdk.plugins.offline.returning.definition"; - public static final String RETURNING_REGION_NAME = "com.mapbox.mapboxsdk.plugins.offline.returing.region.name"; - - public static final String KEY_BUNDLE = "com.mapbox.mapboxsdk.plugins.offline.download.object"; -} diff --git a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/OfflinePluginConstants.java b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/OfflinePluginConstants.java new file mode 100644 index 00000000..929bab4f --- /dev/null +++ b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/OfflinePluginConstants.java @@ -0,0 +1,10 @@ +package org.maplibre.android.plugins.offline; + +public class OfflinePluginConstants { + + private OfflinePluginConstants() { + // No Instances + } + + public static final String REGION_SELECTION_OPTIONS = "org.maplibre.android.plugins.offline:region_selection_options"; +} diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/OfflineRegionSelector.java b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/OfflineRegionSelector.java similarity index 92% rename from plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/OfflineRegionSelector.java rename to plugin-offline/src/main/java/org/maplibre/android/plugins/offline/OfflineRegionSelector.java index 54b22917..4e44d944 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/OfflineRegionSelector.java +++ b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/OfflineRegionSelector.java @@ -1,19 +1,19 @@ -package com.mapbox.mapboxsdk.plugins.offline; +package org.maplibre.android.plugins.offline; import android.app.Activity; import android.content.Context; import android.content.Intent; import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition; -import com.mapbox.mapboxsdk.plugins.offline.model.NotificationOptions; -import com.mapbox.mapboxsdk.plugins.offline.model.OfflineDownloadOptions; -import com.mapbox.mapboxsdk.plugins.offline.model.RegionSelectionOptions; -import com.mapbox.mapboxsdk.plugins.offline.ui.OfflineActivity; +import org.maplibre.android.plugins.offline.model.NotificationOptions; +import org.maplibre.android.plugins.offline.model.OfflineDownloadOptions; +import org.maplibre.android.plugins.offline.model.RegionSelectionOptions; +import org.maplibre.android.plugins.offline.ui.OfflineActivity; import androidx.annotation.NonNull; -import static com.mapbox.mapboxsdk.plugins.offline.offline.OfflineConstants.RETURNING_DEFINITION; -import static com.mapbox.mapboxsdk.plugins.offline.offline.OfflineConstants.RETURNING_REGION_NAME; +import static org.maplibre.android.plugins.offline.offline.OfflineConstants.RETURNING_DEFINITION; +import static org.maplibre.android.plugins.offline.offline.OfflineConstants.RETURNING_REGION_NAME; /** * While the offline plugin includes a service for optimally launching an offline download session, @@ -56,7 +56,7 @@ private OfflineRegionSelector() { * it * @return a new {@link OfflineDownloadOptions} instance which can be used to launch the download * service using - * {@link com.mapbox.mapboxsdk.plugins.offline.offline.OfflinePlugin#startDownload(OfflineDownloadOptions)} + * {@link org.maplibre.android.plugins.offline.offline.OfflinePlugin#startDownload(OfflineDownloadOptions)} * @since 0.1.0 */ public static OfflineDownloadOptions getOfflineDownloadOptions(final Intent data, byte[] metadata) { @@ -78,7 +78,7 @@ public static OfflineDownloadOptions getOfflineDownloadOptions(final Intent data * when launching the offline region download service. * @return a new {@link OfflineDownloadOptions} instance which can be used to launch the download * service using - * {@link com.mapbox.mapboxsdk.plugins.offline.offline.OfflinePlugin#startDownload(OfflineDownloadOptions)} + * {@link org.maplibre.android.plugins.offline.offline.OfflinePlugin#startDownload(OfflineDownloadOptions)} * @since 0.1.0 */ public static OfflineDownloadOptions getOfflineDownloadOptions(final Intent data, @@ -104,7 +104,7 @@ public static OfflineDownloadOptions getOfflineDownloadOptions(final Intent data * still wish to use it * @return a new {@link OfflineDownloadOptions} instance which can be used to launch the download * service using - * {@link com.mapbox.mapboxsdk.plugins.offline.offline.OfflinePlugin#startDownload(OfflineDownloadOptions)} + * {@link org.maplibre.android.plugins.offline.offline.OfflinePlugin#startDownload(OfflineDownloadOptions)} * @since 0.1.0 */ public static OfflineDownloadOptions getOfflineDownloadOptions(final Intent data, diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/NotificationOptions.java b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/model/NotificationOptions.java similarity index 94% rename from plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/NotificationOptions.java rename to plugin-offline/src/main/java/org/maplibre/android/plugins/offline/model/NotificationOptions.java index 28915927..47fd2ece 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/NotificationOptions.java +++ b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/model/NotificationOptions.java @@ -1,10 +1,10 @@ -package com.mapbox.mapboxsdk.plugins.offline.model; +package org.maplibre.android.plugins.offline.model; import android.content.Context; import android.os.Parcelable; import com.google.auto.value.AutoValue; -import com.mapbox.mapboxsdk.plugins.offline.R; +import org.maplibre.android.plugins.offline.R; import androidx.annotation.DrawableRes; diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/OfflineDownloadOptions.java b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/model/OfflineDownloadOptions.java similarity index 97% rename from plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/OfflineDownloadOptions.java rename to plugin-offline/src/main/java/org/maplibre/android/plugins/offline/model/OfflineDownloadOptions.java index 65d9f4ce..907bfe74 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/OfflineDownloadOptions.java +++ b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/model/OfflineDownloadOptions.java @@ -1,12 +1,12 @@ -package com.mapbox.mapboxsdk.plugins.offline.model; +package org.maplibre.android.plugins.offline.model; import android.os.Parcelable; import com.google.auto.value.AutoValue; import com.mapbox.mapboxsdk.offline.OfflineRegion; import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition; -import com.mapbox.mapboxsdk.plugins.offline.offline.OfflineDownloadService; -import com.mapbox.mapboxsdk.plugins.offline.offline.OfflinePlugin; +import org.maplibre.android.plugins.offline.offline.OfflineDownloadService; +import org.maplibre.android.plugins.offline.offline.OfflinePlugin; import java.util.UUID; diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/RegionSelectionOptions.java b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/model/RegionSelectionOptions.java similarity index 96% rename from plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/RegionSelectionOptions.java rename to plugin-offline/src/main/java/org/maplibre/android/plugins/offline/model/RegionSelectionOptions.java index 971e45cc..7851bcfa 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/RegionSelectionOptions.java +++ b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/model/RegionSelectionOptions.java @@ -1,11 +1,11 @@ -package com.mapbox.mapboxsdk.plugins.offline.model; +package org.maplibre.android.plugins.offline.model; import android.os.Parcelable; import com.google.auto.value.AutoValue; import com.mapbox.mapboxsdk.camera.CameraPosition; import com.mapbox.mapboxsdk.geometry.LatLngBounds; -import com.mapbox.mapboxsdk.plugins.offline.ui.OfflineActivity; +import org.maplibre.android.plugins.offline.ui.OfflineActivity; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineConstants.java b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineConstants.java new file mode 100644 index 00000000..7bd220b3 --- /dev/null +++ b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineConstants.java @@ -0,0 +1,28 @@ +package org.maplibre.android.plugins.offline.offline; + +public class OfflineConstants { + + private OfflineConstants() { + // No Instances + } + + static final String ACTION_START_DOWNLOAD = "org.maplibre.android.plugins.offline.download.start"; + static final String ACTION_CANCEL_DOWNLOAD = "org.maplibre.android.plugins.offline.download.cancel"; + static final String ACTION_OFFLINE = "org.maplibre.android.plugins.offline"; + static final String KEY_STATE = "org.maplibre.android.plugins.offline.state"; + static final String STATE_STARTED = "org.maplibre.android.plugins.offline.state.started"; + static final String STATE_FINISHED = "org.maplibre.android.plugins.offline.state.complete"; + static final String STATE_ERROR = "org.maplibre.android.plugins.offline.state.error"; + static final String STATE_CANCEL = "org.maplibre.android.plugins.offline.state.cancel"; + static final String STATE_PROGRESS = "org.maplibre.android.plugins.offline.state.progress"; + static final String KEY_BUNDLE_OFFLINE_REGION = "org.maplibre.android.plugins.offline.region"; + static final String KEY_BUNDLE_ERROR = "org.maplibre.android.plugins.offline.error"; + static final String KEY_BUNDLE_MESSAGE = "org.maplibre.android.plugins.offline.error"; + static final String KEY_PROGRESS = "org.maplibre.android.plugins.offline.progress"; + public static final String NOTIFICATION_CHANNEL = "offline"; + + public static final String RETURNING_DEFINITION = "org.maplibre.android.plugins.offline.returning.definition"; + public static final String RETURNING_REGION_NAME = "org.maplibre.android.plugins.offline.returing.region.name"; + + public static final String KEY_BUNDLE = "org.maplibre.android.plugins.offline.download.object"; +} diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadChangeDispatcher.java b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadChangeDispatcher.java similarity index 94% rename from plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadChangeDispatcher.java rename to plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadChangeDispatcher.java index 99244f3e..3fa943ad 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadChangeDispatcher.java +++ b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadChangeDispatcher.java @@ -1,6 +1,6 @@ -package com.mapbox.mapboxsdk.plugins.offline.offline; +package org.maplibre.android.plugins.offline.offline; -import com.mapbox.mapboxsdk.plugins.offline.model.OfflineDownloadOptions; +import org.maplibre.android.plugins.offline.model.OfflineDownloadOptions; import java.util.ArrayList; import java.util.List; diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadChangeListener.java b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadChangeListener.java similarity index 77% rename from plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadChangeListener.java rename to plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadChangeListener.java index cc33af54..02139ac8 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadChangeListener.java +++ b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadChangeListener.java @@ -1,6 +1,6 @@ -package com.mapbox.mapboxsdk.plugins.offline.offline; +package org.maplibre.android.plugins.offline.offline; -import com.mapbox.mapboxsdk.plugins.offline.model.OfflineDownloadOptions; +import org.maplibre.android.plugins.offline.model.OfflineDownloadOptions; public interface OfflineDownloadChangeListener { diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadService.java b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadService.java similarity index 97% rename from plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadService.java rename to plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadService.java index 39dc34b8..794e5da8 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadService.java +++ b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadService.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.offline.offline; +package org.maplibre.android.plugins.offline.offline; import android.app.Service; import android.content.Intent; @@ -17,15 +17,15 @@ import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition; import com.mapbox.mapboxsdk.offline.OfflineRegionError; import com.mapbox.mapboxsdk.offline.OfflineRegionStatus; -import com.mapbox.mapboxsdk.plugins.offline.model.OfflineDownloadOptions; -import com.mapbox.mapboxsdk.plugins.offline.utils.NotificationUtils; +import org.maplibre.android.plugins.offline.model.OfflineDownloadOptions; +import org.maplibre.android.plugins.offline.utils.NotificationUtils; import com.mapbox.mapboxsdk.snapshotter.MapSnapshot; import com.mapbox.mapboxsdk.snapshotter.MapSnapshotter; import timber.log.Timber; -import static com.mapbox.mapboxsdk.plugins.offline.offline.OfflineConstants.KEY_BUNDLE; -import static com.mapbox.mapboxsdk.plugins.offline.utils.NotificationUtils.setupNotificationChannel; +import static org.maplibre.android.plugins.offline.offline.OfflineConstants.KEY_BUNDLE; +import static org.maplibre.android.plugins.offline.utils.NotificationUtils.setupNotificationChannel; /** * Internal usage only, use this service indirectly by using methods found in diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadStateReceiver.java b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadStateReceiver.java similarity index 96% rename from plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadStateReceiver.java rename to plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadStateReceiver.java index b641bd11..2a716d84 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadStateReceiver.java +++ b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadStateReceiver.java @@ -1,13 +1,13 @@ -package com.mapbox.mapboxsdk.plugins.offline.offline; +package org.maplibre.android.plugins.offline.offline; import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import com.mapbox.mapboxsdk.plugins.offline.model.OfflineDownloadOptions; +import org.maplibre.android.plugins.offline.model.OfflineDownloadOptions; -import static com.mapbox.mapboxsdk.plugins.offline.offline.OfflineConstants.KEY_BUNDLE; +import static org.maplibre.android.plugins.offline.offline.OfflineConstants.KEY_BUNDLE; public class OfflineDownloadStateReceiver extends BroadcastReceiver { diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflinePlugin.java b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflinePlugin.java similarity index 97% rename from plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflinePlugin.java rename to plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflinePlugin.java index cd0df737..eb8b4cd9 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflinePlugin.java +++ b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflinePlugin.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.offline.offline; +package org.maplibre.android.plugins.offline.offline; import android.annotation.SuppressLint; import android.app.Activity; @@ -6,7 +6,7 @@ import android.content.Intent; import com.mapbox.mapboxsdk.offline.OfflineRegion; -import com.mapbox.mapboxsdk.plugins.offline.model.OfflineDownloadOptions; +import org.maplibre.android.plugins.offline.model.OfflineDownloadOptions; import java.util.ArrayList; import java.util.List; @@ -14,7 +14,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import static com.mapbox.mapboxsdk.plugins.offline.offline.OfflineConstants.KEY_BUNDLE; +import static org.maplibre.android.plugins.offline.offline.OfflineConstants.KEY_BUNDLE; /** * OfflinePlugin is the main entry point for integrating the offline plugin into your app. diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/OfflineActivity.java b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/ui/OfflineActivity.java similarity index 84% rename from plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/OfflineActivity.java rename to plugin-offline/src/main/java/org/maplibre/android/plugins/offline/ui/OfflineActivity.java index d7e390a3..e70b5ef9 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/OfflineActivity.java +++ b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/ui/OfflineActivity.java @@ -1,21 +1,21 @@ -package com.mapbox.mapboxsdk.plugins.offline.ui; +package org.maplibre.android.plugins.offline.ui; import android.content.Intent; import android.os.Bundle; import android.view.Window; import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition; -import com.mapbox.mapboxsdk.plugins.offline.OfflinePluginConstants; -import com.mapbox.mapboxsdk.plugins.offline.R; -import com.mapbox.mapboxsdk.plugins.offline.model.RegionSelectionOptions; -import com.mapbox.mapboxsdk.plugins.offline.utils.ColorUtils; +import org.maplibre.android.plugins.offline.OfflinePluginConstants; +import org.maplibre.android.plugins.offline.R; +import org.maplibre.android.plugins.offline.model.RegionSelectionOptions; +import org.maplibre.android.plugins.offline.utils.ColorUtils; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import androidx.constraintlayout.widget.ConstraintLayout; -import static com.mapbox.mapboxsdk.plugins.offline.offline.OfflineConstants.RETURNING_DEFINITION; -import static com.mapbox.mapboxsdk.plugins.offline.offline.OfflineConstants.RETURNING_REGION_NAME; +import static org.maplibre.android.plugins.offline.offline.OfflineConstants.RETURNING_DEFINITION; +import static org.maplibre.android.plugins.offline.offline.OfflineConstants.RETURNING_REGION_NAME; public class OfflineActivity extends AppCompatActivity implements RegionSelectedCallback { diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/RegionSelectedCallback.java b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/ui/RegionSelectedCallback.java similarity index 80% rename from plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/RegionSelectedCallback.java rename to plugin-offline/src/main/java/org/maplibre/android/plugins/offline/ui/RegionSelectedCallback.java index dcc5473c..e48e7125 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/RegionSelectedCallback.java +++ b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/ui/RegionSelectedCallback.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.offline.ui; +package org.maplibre.android.plugins.offline.ui; import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition; diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/RegionSelectionFragment.java b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/ui/RegionSelectionFragment.java similarity index 97% rename from plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/RegionSelectionFragment.java rename to plugin-offline/src/main/java/org/maplibre/android/plugins/offline/ui/RegionSelectionFragment.java index 1194034c..6cf60a4d 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/RegionSelectionFragment.java +++ b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/ui/RegionSelectionFragment.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.offline.ui; +package org.maplibre.android.plugins.offline.ui; import android.graphics.PointF; import android.graphics.RectF; @@ -19,9 +19,9 @@ import com.mapbox.mapboxsdk.maps.Style; import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition; import com.mapbox.mapboxsdk.offline.OfflineTilePyramidRegionDefinition; -import com.mapbox.mapboxsdk.plugins.offline.OfflinePluginConstants; -import com.mapbox.mapboxsdk.plugins.offline.R; -import com.mapbox.mapboxsdk.plugins.offline.model.RegionSelectionOptions; +import org.maplibre.android.plugins.offline.OfflinePluginConstants; +import org.maplibre.android.plugins.offline.R; +import org.maplibre.android.plugins.offline.model.RegionSelectionOptions; import com.mapbox.mapboxsdk.style.sources.VectorSource; import java.util.List; diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/ColorUtils.java b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/utils/ColorUtils.java similarity index 92% rename from plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/ColorUtils.java rename to plugin-offline/src/main/java/org/maplibre/android/plugins/offline/utils/ColorUtils.java index aa389bce..ea8365f8 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/ColorUtils.java +++ b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/utils/ColorUtils.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.offline.utils; +package org.maplibre.android.plugins.offline.utils; import android.content.Context; import android.content.res.Resources; diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/NotificationUtils.java b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/utils/NotificationUtils.java similarity index 88% rename from plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/NotificationUtils.java rename to plugin-offline/src/main/java/org/maplibre/android/plugins/offline/utils/NotificationUtils.java index df3519d5..bace5c51 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/NotificationUtils.java +++ b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/utils/NotificationUtils.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.offline.utils; +package org.maplibre.android.plugins.offline.utils; import android.app.Notification; import android.app.NotificationChannel; @@ -12,10 +12,10 @@ import androidx.annotation.RequiresApi; import androidx.core.app.NotificationCompat; -import com.mapbox.mapboxsdk.plugins.offline.R; -import com.mapbox.mapboxsdk.plugins.offline.model.NotificationOptions; -import com.mapbox.mapboxsdk.plugins.offline.model.OfflineDownloadOptions; -import com.mapbox.mapboxsdk.plugins.offline.offline.OfflineConstants; +import org.maplibre.android.plugins.offline.R; +import org.maplibre.android.plugins.offline.model.NotificationOptions; +import org.maplibre.android.plugins.offline.model.OfflineDownloadOptions; +import org.maplibre.android.plugins.offline.offline.OfflineConstants; import static com.mapbox.mapboxsdk.Mapbox.getApplicationContext; diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/OfflineUtils.java b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/utils/OfflineUtils.java similarity index 96% rename from plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/OfflineUtils.java rename to plugin-offline/src/main/java/org/maplibre/android/plugins/offline/utils/OfflineUtils.java index 8a4061f2..db629481 100644 --- a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/OfflineUtils.java +++ b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/utils/OfflineUtils.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.offline.utils; +package org.maplibre.android.plugins.offline.utils; import android.util.Log; From fbcc7cea91b3ffdd940b80d4a558c110c24a7570 Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Sun, 19 Feb 2023 10:48:35 -0800 Subject: [PATCH 30/40] testapp ref updates --- app/build.gradle | 2 +- .../android}/plugins/BaseActivityTest.java | 9 +++---- .../android}/plugins/activity.junit.ejs | 6 ++--- .../plugins/annotation/CircleManagerTest.java | 8 +++--- .../plugins/annotation/CircleTest.java | 8 +++--- .../plugins/annotation/FillManagerTest.java | 8 +++--- .../android}/plugins/annotation/FillTest.java | 8 +++--- .../plugins/annotation/LineManagerTest.java | 8 +++--- .../android}/plugins/annotation/LineTest.java | 8 +++--- .../plugins/annotation/MapboxMapAction.java | 2 +- .../plugins/annotation/SymbolManagerTest.java | 8 +++--- .../plugins/annotation/SymbolTest.java | 8 +++--- .../plugins/annotation/WaitAction.java | 2 +- .../plugins/offline/OfflinePluginTest.java | 10 +++---- .../plugins/scalebar/ScaleBarTest.java | 16 ++++++------ .../utils/OnMapReadyIdlingResource.java | 6 ++--- app/src/debug/AndroidManifest.xml | 4 +-- .../activity/SingleFragmentActivity.java | 6 ++--- .../plugins/testapp/activity/TestActivity.kt | 4 +-- app/src/main/AndroidManifest.xml | 10 +++---- .../core/permissions/PermissionsListener.java | 2 +- .../core/permissions/PermissionsManager.java | 2 +- .../plugins/testapp/PluginApplication.kt | 2 +- .../android}/plugins/testapp/Utils.kt | 4 +-- .../activity/FeatureOverviewActivity.java | 4 +-- .../annotation/BulkSymbolActivity.java | 12 ++++----- .../activity/annotation/CircleActivity.java | 16 ++++++------ .../annotation/ClusterSymbolActivity.java | 12 ++++----- .../DynamicSymbolChangeActivity.java | 10 +++---- .../activity/annotation/FillActivity.java | 14 +++++----- .../annotation/FillChangeActivity.java | 26 +++++++++---------- .../activity/annotation/LineActivity.java | 14 +++++----- .../annotation/LineChangeActivity.java | 14 +++++----- .../annotation/PressForSymbolActivity.java | 11 ++++---- .../activity/annotation/SymbolActivity.java | 16 ++++++------ .../activity/ktx/maps/MapboxKtxActivity.kt | 6 ++--- .../localization/LocalizationActivity.kt | 10 +++---- .../activity/markerview/MarkerViewActivity.kt | 10 +++---- .../offline/OfflineDownloadActivity.kt | 12 ++++----- .../offline/OfflineRegionDetailActivity.kt | 16 ++++++------ .../offline/OfflineRegionListActivity.kt | 6 ++--- .../offline/OfflineUiComponentsActivity.kt | 12 ++++----- .../activity/scalebar/ScalebarActivity.kt | 8 +++--- plugin-scalebar/README.md | 4 +-- plugin-scalebar/src/main/AndroidManifest.xml | 2 +- .../pluginscalebar/ScaleBarConstants.java | 2 +- .../pluginscalebar/ScaleBarOptions.java | 2 +- .../pluginscalebar/ScaleBarPlugin.java | 2 +- .../pluginscalebar/ScaleBarWidget.java | 10 +++---- .../pluginscalebar/ScaleBarPluginTest.kt | 4 +-- 50 files changed, 202 insertions(+), 204 deletions(-) rename app/src/androidTest/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/BaseActivityTest.java (93%) rename app/src/androidTest/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/activity.junit.ejs (75%) rename app/src/androidTest/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/CircleManagerTest.java (91%) rename app/src/androidTest/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/CircleTest.java (94%) rename app/src/androidTest/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/FillManagerTest.java (89%) rename app/src/androidTest/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/FillTest.java (93%) rename app/src/androidTest/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/LineManagerTest.java (93%) rename app/src/androidTest/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/LineTest.java (94%) rename app/src/androidTest/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/MapboxMapAction.java (96%) rename app/src/androidTest/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/SymbolManagerTest.java (97%) rename app/src/androidTest/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/SymbolTest.java (98%) rename app/src/androidTest/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/annotation/WaitAction.java (94%) rename app/src/androidTest/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/offline/OfflinePluginTest.java (83%) rename app/src/androidTest/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/scalebar/ScaleBarTest.java (96%) rename app/src/androidTest/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/utils/OnMapReadyIdlingResource.java (94%) rename app/src/debug/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/testapp/activity/SingleFragmentActivity.java (90%) rename app/src/debug/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/testapp/activity/TestActivity.kt (91%) rename app/src/main/java/{com/mapbox => org/maplibre}/android/core/permissions/PermissionsListener.java (82%) rename app/src/main/java/{com/mapbox => org/maplibre}/android/core/permissions/PermissionsManager.java (99%) rename app/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/testapp/PluginApplication.kt (92%) rename app/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/testapp/Utils.kt (97%) rename app/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/testapp/activity/FeatureOverviewActivity.java (99%) rename app/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/testapp/activity/annotation/BulkSymbolActivity.java (95%) rename app/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/testapp/activity/annotation/CircleActivity.java (92%) rename app/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/testapp/activity/annotation/ClusterSymbolActivity.java (94%) rename app/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/testapp/activity/annotation/DynamicSymbolChangeActivity.java (94%) rename app/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/testapp/activity/annotation/FillActivity.java (94%) rename app/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/testapp/activity/annotation/FillChangeActivity.java (89%) rename app/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/testapp/activity/annotation/LineActivity.java (93%) rename app/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/testapp/activity/annotation/LineChangeActivity.java (95%) rename app/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/testapp/activity/annotation/PressForSymbolActivity.java (93%) rename app/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/testapp/activity/annotation/SymbolActivity.java (96%) rename app/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/testapp/activity/ktx/maps/MapboxKtxActivity.kt (92%) rename app/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/testapp/activity/localization/LocalizationActivity.kt (94%) rename app/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/testapp/activity/markerview/MarkerViewActivity.kt (94%) rename app/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/testapp/activity/offline/OfflineDownloadActivity.kt (94%) rename app/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/testapp/activity/offline/OfflineRegionDetailActivity.kt (94%) rename app/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/testapp/activity/offline/OfflineRegionListActivity.kt (95%) rename app/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt (87%) rename app/src/main/java/{com/mapbox/mapboxsdk => org/maplibre/android}/plugins/testapp/activity/scalebar/ScalebarActivity.kt (93%) rename plugin-scalebar/src/main/java/{com/mapbox => org/maplibre}/pluginscalebar/ScaleBarConstants.java (98%) rename plugin-scalebar/src/main/java/{com/mapbox => org/maplibre}/pluginscalebar/ScaleBarOptions.java (99%) rename plugin-scalebar/src/main/java/{com/mapbox => org/maplibre}/pluginscalebar/ScaleBarPlugin.java (99%) rename plugin-scalebar/src/main/java/{com/mapbox => org/maplibre}/pluginscalebar/ScaleBarWidget.java (97%) rename plugin-scalebar/src/test/java/{com/mapbox => org/maplibre}/pluginscalebar/ScaleBarPluginTest.kt (99%) diff --git a/app/build.gradle b/app/build.gradle index 9fb10222..7ee9f5ed 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ android { defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion - applicationId "com.mapbox.mapboxsdk.plugins.testapp" + applicationId "org.maplibre.android.plugins.testapp" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true } diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/BaseActivityTest.java b/app/src/androidTest/java/org/maplibre/android/plugins/BaseActivityTest.java similarity index 93% rename from app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/BaseActivityTest.java rename to app/src/androidTest/java/org/maplibre/android/plugins/BaseActivityTest.java index 39f95d29..65c9e0cb 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/BaseActivityTest.java +++ b/app/src/androidTest/java/org/maplibre/android/plugins/BaseActivityTest.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins; +package org.maplibre.android.plugins; import android.app.Activity; import android.content.Context; @@ -6,9 +6,9 @@ import android.net.NetworkInfo; import com.mapbox.mapboxsdk.maps.MapboxMap; -import com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction; -import com.mapbox.mapboxsdk.plugins.annotation.WaitAction; -import com.mapbox.mapboxsdk.plugins.utils.OnMapReadyIdlingResource; +import org.maplibre.android.plugins.annotation.MapboxMapAction; +import org.maplibre.android.plugins.annotation.WaitAction; +import org.maplibre.android.plugins.utils.OnMapReadyIdlingResource; import junit.framework.Assert; @@ -101,4 +101,3 @@ public void afterTest() { IdlingRegistry.getInstance().unregister(idlingResource); } } - diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/activity.junit.ejs b/app/src/androidTest/java/org/maplibre/android/plugins/activity.junit.ejs similarity index 75% rename from app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/activity.junit.ejs rename to app/src/androidTest/java/org/maplibre/android/plugins/activity.junit.ejs index 25f47339..7f73c7ad 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/activity.junit.ejs +++ b/app/src/androidTest/java/org/maplibre/android/plugins/activity.junit.ejs @@ -3,12 +3,12 @@ const subPackage = locals[1]; -%> // This file is generated -package com.mapbox.mapboxsdk.plugins.gen.<%- subPackage %>; +package org.maplibre.android.plugins.gen.<%- subPackage %>; import androidx.test.ext.junit.runners.AndroidJUnit4; -import com.mapbox.mapboxsdk.plugins.BaseActivityTest; -import com.mapbox.mapboxsdk.plugins.testapp.activity.<%- subPackage %>.<%- activity %>; +import org.maplibre.android.plugins.BaseActivityTest; +import org.maplibre.android.plugins.testapp.activity.<%- subPackage %>.<%- activity %>; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManagerTest.java b/app/src/androidTest/java/org/maplibre/android/plugins/annotation/CircleManagerTest.java similarity index 91% rename from app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManagerTest.java rename to app/src/androidTest/java/org/maplibre/android/plugins/annotation/CircleManagerTest.java index e93883a9..46a804f1 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManagerTest.java +++ b/app/src/androidTest/java/org/maplibre/android/plugins/annotation/CircleManagerTest.java @@ -1,12 +1,12 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; -import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; -import com.mapbox.mapboxsdk.plugins.BaseActivityTest; +import org.maplibre.android.plugins.testapp.activity.TestActivity; +import org.maplibre.android.plugins.BaseActivityTest; import timber.log.Timber; import org.junit.Test; @@ -14,7 +14,7 @@ import java.util.Objects; -import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke; +import static org.maplibre.android.plugins.annotation.MapboxMapAction.invoke; import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleTest.java b/app/src/androidTest/java/org/maplibre/android/plugins/annotation/CircleTest.java similarity index 94% rename from app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleTest.java rename to app/src/androidTest/java/org/maplibre/android/plugins/annotation/CircleTest.java index 170325c9..2e44d9d9 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleTest.java +++ b/app/src/androidTest/java/org/maplibre/android/plugins/annotation/CircleTest.java @@ -1,13 +1,13 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import android.graphics.PointF; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; -import com.mapbox.mapboxsdk.plugins.BaseActivityTest; -import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; +import org.maplibre.android.plugins.BaseActivityTest; +import org.maplibre.android.plugins.testapp.activity.TestActivity; import com.mapbox.mapboxsdk.utils.ColorUtils; import timber.log.Timber; @@ -16,7 +16,7 @@ import java.util.Objects; -import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke; +import static org.maplibre.android.plugins.annotation.MapboxMapAction.invoke; import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillManagerTest.java b/app/src/androidTest/java/org/maplibre/android/plugins/annotation/FillManagerTest.java similarity index 89% rename from app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillManagerTest.java rename to app/src/androidTest/java/org/maplibre/android/plugins/annotation/FillManagerTest.java index 904157f6..a18ebfa3 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillManagerTest.java +++ b/app/src/androidTest/java/org/maplibre/android/plugins/annotation/FillManagerTest.java @@ -1,12 +1,12 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; -import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; -import com.mapbox.mapboxsdk.plugins.BaseActivityTest; +import org.maplibre.android.plugins.testapp.activity.TestActivity; +import org.maplibre.android.plugins.BaseActivityTest; import timber.log.Timber; import org.junit.Test; @@ -14,7 +14,7 @@ import java.util.Objects; -import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke; +import static org.maplibre.android.plugins.annotation.MapboxMapAction.invoke; import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillTest.java b/app/src/androidTest/java/org/maplibre/android/plugins/annotation/FillTest.java similarity index 93% rename from app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillTest.java rename to app/src/androidTest/java/org/maplibre/android/plugins/annotation/FillTest.java index 728c2aa8..5b007aa7 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillTest.java +++ b/app/src/androidTest/java/org/maplibre/android/plugins/annotation/FillTest.java @@ -1,13 +1,13 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import android.graphics.PointF; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; -import com.mapbox.mapboxsdk.plugins.BaseActivityTest; -import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; +import org.maplibre.android.plugins.BaseActivityTest; +import org.maplibre.android.plugins.testapp.activity.TestActivity; import com.mapbox.mapboxsdk.utils.ColorUtils; import timber.log.Timber; @@ -16,7 +16,7 @@ import java.util.Objects; -import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke; +import static org.maplibre.android.plugins.annotation.MapboxMapAction.invoke; import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineManagerTest.java b/app/src/androidTest/java/org/maplibre/android/plugins/annotation/LineManagerTest.java similarity index 93% rename from app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineManagerTest.java rename to app/src/androidTest/java/org/maplibre/android/plugins/annotation/LineManagerTest.java index 000943f0..b871bc91 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineManagerTest.java +++ b/app/src/androidTest/java/org/maplibre/android/plugins/annotation/LineManagerTest.java @@ -1,12 +1,12 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; -import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; -import com.mapbox.mapboxsdk.plugins.BaseActivityTest; +import org.maplibre.android.plugins.testapp.activity.TestActivity; +import org.maplibre.android.plugins.BaseActivityTest; import timber.log.Timber; import org.junit.Test; @@ -14,7 +14,7 @@ import java.util.Objects; -import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke; +import static org.maplibre.android.plugins.annotation.MapboxMapAction.invoke; import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineTest.java b/app/src/androidTest/java/org/maplibre/android/plugins/annotation/LineTest.java similarity index 94% rename from app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineTest.java rename to app/src/androidTest/java/org/maplibre/android/plugins/annotation/LineTest.java index a926d7f4..2608f82a 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineTest.java +++ b/app/src/androidTest/java/org/maplibre/android/plugins/annotation/LineTest.java @@ -1,13 +1,13 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import android.graphics.PointF; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; -import com.mapbox.mapboxsdk.plugins.BaseActivityTest; -import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; +import org.maplibre.android.plugins.BaseActivityTest; +import org.maplibre.android.plugins.testapp.activity.TestActivity; import com.mapbox.mapboxsdk.utils.ColorUtils; import timber.log.Timber; @@ -16,7 +16,7 @@ import java.util.Objects; -import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke; +import static org.maplibre.android.plugins.annotation.MapboxMapAction.invoke; import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/MapboxMapAction.java b/app/src/androidTest/java/org/maplibre/android/plugins/annotation/MapboxMapAction.java similarity index 96% rename from app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/MapboxMapAction.java rename to app/src/androidTest/java/org/maplibre/android/plugins/annotation/MapboxMapAction.java index 156b805c..e3626527 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/MapboxMapAction.java +++ b/app/src/androidTest/java/org/maplibre/android/plugins/annotation/MapboxMapAction.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import android.view.View; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManagerTest.java b/app/src/androidTest/java/org/maplibre/android/plugins/annotation/SymbolManagerTest.java similarity index 97% rename from app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManagerTest.java rename to app/src/androidTest/java/org/maplibre/android/plugins/annotation/SymbolManagerTest.java index 0b5fabf2..8ffabe07 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManagerTest.java +++ b/app/src/androidTest/java/org/maplibre/android/plugins/annotation/SymbolManagerTest.java @@ -1,12 +1,12 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; -import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; -import com.mapbox.mapboxsdk.plugins.BaseActivityTest; +import org.maplibre.android.plugins.testapp.activity.TestActivity; +import org.maplibre.android.plugins.BaseActivityTest; import timber.log.Timber; import org.junit.Test; @@ -14,7 +14,7 @@ import java.util.Objects; -import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke; +import static org.maplibre.android.plugins.annotation.MapboxMapAction.invoke; import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolTest.java b/app/src/androidTest/java/org/maplibre/android/plugins/annotation/SymbolTest.java similarity index 98% rename from app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolTest.java rename to app/src/androidTest/java/org/maplibre/android/plugins/annotation/SymbolTest.java index 87eb7684..34cb7e07 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolTest.java +++ b/app/src/androidTest/java/org/maplibre/android/plugins/annotation/SymbolTest.java @@ -1,13 +1,13 @@ // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import android.graphics.PointF; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; -import com.mapbox.mapboxsdk.plugins.BaseActivityTest; -import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; +import org.maplibre.android.plugins.BaseActivityTest; +import org.maplibre.android.plugins.testapp.activity.TestActivity; import com.mapbox.mapboxsdk.utils.ColorUtils; import timber.log.Timber; @@ -16,7 +16,7 @@ import java.util.Objects; -import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke; +import static org.maplibre.android.plugins.annotation.MapboxMapAction.invoke; import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/WaitAction.java b/app/src/androidTest/java/org/maplibre/android/plugins/annotation/WaitAction.java similarity index 94% rename from app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/WaitAction.java rename to app/src/androidTest/java/org/maplibre/android/plugins/annotation/WaitAction.java index f8a479c3..d7109f31 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/WaitAction.java +++ b/app/src/androidTest/java/org/maplibre/android/plugins/annotation/WaitAction.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import android.view.View; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/offline/OfflinePluginTest.java b/app/src/androidTest/java/org/maplibre/android/plugins/offline/OfflinePluginTest.java similarity index 83% rename from app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/offline/OfflinePluginTest.java rename to app/src/androidTest/java/org/maplibre/android/plugins/offline/OfflinePluginTest.java index 9527436f..b5c43c48 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/offline/OfflinePluginTest.java +++ b/app/src/androidTest/java/org/maplibre/android/plugins/offline/OfflinePluginTest.java @@ -1,9 +1,9 @@ -package com.mapbox.mapboxsdk.plugins.offline; +package org.maplibre.android.plugins.offline; -import com.mapbox.mapboxsdk.plugins.offline.model.OfflineDownloadOptions; -import com.mapbox.mapboxsdk.plugins.offline.offline.OfflinePlugin; -import com.mapbox.mapboxsdk.plugins.testapp.R; -import com.mapbox.mapboxsdk.plugins.testapp.activity.offline.OfflineDownloadActivity; +import org.maplibre.android.plugins.offline.model.OfflineDownloadOptions; +import org.maplibre.android.plugins.offline.offline.OfflinePlugin; +import org.maplibre.android.plugins.testapp.R; +import org.maplibre.android.plugins.testapp.activity.offline.OfflineDownloadActivity; import org.junit.Before; import org.junit.Ignore; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/scalebar/ScaleBarTest.java b/app/src/androidTest/java/org/maplibre/android/plugins/scalebar/ScaleBarTest.java similarity index 96% rename from app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/scalebar/ScaleBarTest.java rename to app/src/androidTest/java/org/maplibre/android/plugins/scalebar/ScaleBarTest.java index 31b823a4..461d78b8 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/scalebar/ScaleBarTest.java +++ b/app/src/androidTest/java/org/maplibre/android/plugins/scalebar/ScaleBarTest.java @@ -1,16 +1,16 @@ -package com.mapbox.mapboxsdk.plugins.scalebar; +package org.maplibre.android.plugins.scalebar; import android.app.Activity; import android.view.View; import com.mapbox.mapboxsdk.maps.MapView; -import com.mapbox.mapboxsdk.plugins.BaseActivityTest; -import com.mapbox.mapboxsdk.plugins.testapp.R; -import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; -import com.mapbox.pluginscalebar.ScaleBarOptions; -import com.mapbox.pluginscalebar.ScaleBarPlugin; -import com.mapbox.pluginscalebar.ScaleBarWidget; +import org.maplibre.android.plugins.BaseActivityTest; +import org.maplibre.android.plugins.testapp.R; +import org.maplibre.android.plugins.testapp.activity.TestActivity; +import org.maplibre.pluginscalebar.ScaleBarOptions; +import org.maplibre.pluginscalebar.ScaleBarPlugin; +import org.maplibre.pluginscalebar.ScaleBarWidget; import org.junit.Test; import org.junit.runner.RunWith; @@ -19,7 +19,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import timber.log.Timber; -import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke; +import static org.maplibre.android.plugins.annotation.MapboxMapAction.invoke; import static junit.framework.TestCase.assertFalse; import static junit.framework.TestCase.assertTrue; import static org.junit.Assert.assertEquals; diff --git a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/utils/OnMapReadyIdlingResource.java b/app/src/androidTest/java/org/maplibre/android/plugins/utils/OnMapReadyIdlingResource.java similarity index 94% rename from app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/utils/OnMapReadyIdlingResource.java rename to app/src/androidTest/java/org/maplibre/android/plugins/utils/OnMapReadyIdlingResource.java index 95ade81c..3f606008 100644 --- a/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/utils/OnMapReadyIdlingResource.java +++ b/app/src/androidTest/java/org/maplibre/android/plugins/utils/OnMapReadyIdlingResource.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.utils; +package org.maplibre.android.plugins.utils; import android.app.Activity; import android.os.Handler; @@ -8,7 +8,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.maps.Style; -import com.mapbox.mapboxsdk.plugins.testapp.R; +import org.maplibre.android.plugins.testapp.R; import androidx.annotation.NonNull; import androidx.test.espresso.IdlingResource; @@ -60,4 +60,4 @@ public void onMapReady(@NonNull MapboxMap mapboxMap) { } }); } -} \ No newline at end of file +} diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml index bb3922f6..416c5ff1 100644 --- a/app/src/debug/AndroidManifest.xml +++ b/app/src/debug/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="org.maplibre.android.plugins.testapp"> @@ -16,4 +16,4 @@ android:label="@string/title_activity_test" android:theme="@style/AppTheme.NoActionBar"/> - \ No newline at end of file + diff --git a/app/src/debug/java/com/mapbox/mapboxsdk/plugins/testapp/activity/SingleFragmentActivity.java b/app/src/debug/java/org/maplibre/android/plugins/testapp/activity/SingleFragmentActivity.java similarity index 90% rename from app/src/debug/java/com/mapbox/mapboxsdk/plugins/testapp/activity/SingleFragmentActivity.java rename to app/src/debug/java/org/maplibre/android/plugins/testapp/activity/SingleFragmentActivity.java index d2e47679..6c30f605 100644 --- a/app/src/debug/java/com/mapbox/mapboxsdk/plugins/testapp/activity/SingleFragmentActivity.java +++ b/app/src/debug/java/org/maplibre/android/plugins/testapp/activity/SingleFragmentActivity.java @@ -1,10 +1,10 @@ -package com.mapbox.mapboxsdk.plugins.testapp.activity; +package org.maplibre.android.plugins.testapp.activity; import android.os.Bundle; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.mapbox.mapboxsdk.plugins.testapp.R; +import org.maplibre.android.plugins.testapp.R; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; @@ -34,4 +34,4 @@ public void replaceFragment(Fragment fragment) { getSupportFragmentManager().beginTransaction() .replace(R.id.container, fragment).commit(); } -} \ No newline at end of file +} diff --git a/app/src/debug/java/com/mapbox/mapboxsdk/plugins/testapp/activity/TestActivity.kt b/app/src/debug/java/org/maplibre/android/plugins/testapp/activity/TestActivity.kt similarity index 91% rename from app/src/debug/java/com/mapbox/mapboxsdk/plugins/testapp/activity/TestActivity.kt rename to app/src/debug/java/org/maplibre/android/plugins/testapp/activity/TestActivity.kt index 0cba4bfe..72790a28 100644 --- a/app/src/debug/java/com/mapbox/mapboxsdk/plugins/testapp/activity/TestActivity.kt +++ b/app/src/debug/java/org/maplibre/android/plugins/testapp/activity/TestActivity.kt @@ -1,9 +1,9 @@ -package com.mapbox.mapboxsdk.plugins.testapp.activity +package org.maplibre.android.plugins.testapp.activity import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.maps.MapView -import com.mapbox.mapboxsdk.plugins.testapp.R +import org.maplibre.android.plugins.testapp.R class TestActivity : AppCompatActivity() { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 464e12e6..4b8df386 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools" package="org.maplibre.android.plugins.testapp"> @@ -238,13 +238,13 @@ - + - + - \ No newline at end of file + diff --git a/app/src/main/java/com/mapbox/android/core/permissions/PermissionsListener.java b/app/src/main/java/org/maplibre/android/core/permissions/PermissionsListener.java similarity index 82% rename from app/src/main/java/com/mapbox/android/core/permissions/PermissionsListener.java rename to app/src/main/java/org/maplibre/android/core/permissions/PermissionsListener.java index 3bde76a2..a37c1673 100644 --- a/app/src/main/java/com/mapbox/android/core/permissions/PermissionsListener.java +++ b/app/src/main/java/org/maplibre/android/core/permissions/PermissionsListener.java @@ -1,4 +1,4 @@ -package com.mapbox.android.core.permissions; +package org.maplibre.android.core.permissions; import java.util.List; diff --git a/app/src/main/java/com/mapbox/android/core/permissions/PermissionsManager.java b/app/src/main/java/org/maplibre/android/core/permissions/PermissionsManager.java similarity index 99% rename from app/src/main/java/com/mapbox/android/core/permissions/PermissionsManager.java rename to app/src/main/java/org/maplibre/android/core/permissions/PermissionsManager.java index 94f42f5a..ee71e345 100644 --- a/app/src/main/java/com/mapbox/android/core/permissions/PermissionsManager.java +++ b/app/src/main/java/org/maplibre/android/core/permissions/PermissionsManager.java @@ -1,4 +1,4 @@ -package com.mapbox.android.core.permissions; +package org.maplibre.android.core.permissions; import android.Manifest; import android.app.Activity; diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/PluginApplication.kt b/app/src/main/java/org/maplibre/android/plugins/testapp/PluginApplication.kt similarity index 92% rename from app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/PluginApplication.kt rename to app/src/main/java/org/maplibre/android/plugins/testapp/PluginApplication.kt index d3bd2c3f..3bdabf1d 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/PluginApplication.kt +++ b/app/src/main/java/org/maplibre/android/plugins/testapp/PluginApplication.kt @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.testapp +package org.maplibre.android.plugins.testapp import android.app.Application diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/Utils.kt b/app/src/main/java/org/maplibre/android/plugins/testapp/Utils.kt similarity index 97% rename from app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/Utils.kt rename to app/src/main/java/org/maplibre/android/plugins/testapp/Utils.kt index c57f236e..657c141d 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/Utils.kt +++ b/app/src/main/java/org/maplibre/android/plugins/testapp/Utils.kt @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.testapp +package org.maplibre.android.plugins.testapp import android.content.Context import android.location.Location @@ -71,4 +71,4 @@ object Utils { } return sb.toString() } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/FeatureOverviewActivity.java b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/FeatureOverviewActivity.java similarity index 99% rename from app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/FeatureOverviewActivity.java rename to app/src/main/java/org/maplibre/android/plugins/testapp/activity/FeatureOverviewActivity.java index bc1a4fa1..66e2893d 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/FeatureOverviewActivity.java +++ b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/FeatureOverviewActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.testapp.activity; +package org.maplibre.android.plugins.testapp.activity; import android.content.ComponentName; import android.content.Context; @@ -20,7 +20,7 @@ import android.widget.Toast; import com.mapbox.android.core.permissions.PermissionsListener; import com.mapbox.android.core.permissions.PermissionsManager; -import com.mapbox.mapboxsdk.plugins.testapp.R; +import org.maplibre.android.plugins.testapp.R; import androidx.annotation.IdRes; import androidx.annotation.LayoutRes; diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/BulkSymbolActivity.java b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/BulkSymbolActivity.java similarity index 95% rename from app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/BulkSymbolActivity.java rename to app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/BulkSymbolActivity.java index 5f670f8e..f9c366de 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/BulkSymbolActivity.java +++ b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/BulkSymbolActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.testapp.activity.annotation; +package org.maplibre.android.plugins.testapp.activity.annotation; import android.app.ProgressDialog; import android.content.Context; @@ -21,11 +21,11 @@ import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.Style; -import com.mapbox.mapboxsdk.plugins.annotation.Symbol; -import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager; -import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions; -import com.mapbox.mapboxsdk.plugins.testapp.R; -import com.mapbox.mapboxsdk.plugins.testapp.Utils; +import org.maplibre.android.plugins.annotation.Symbol; +import org.maplibre.android.plugins.annotation.SymbolManager; +import org.maplibre.android.plugins.annotation.SymbolOptions; +import org.maplibre.android.plugins.testapp.R; +import org.maplibre.android.plugins.testapp.Utils; import timber.log.Timber; diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/CircleActivity.java b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/CircleActivity.java similarity index 92% rename from app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/CircleActivity.java rename to app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/CircleActivity.java index dfd29c3f..9d9543cc 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/CircleActivity.java +++ b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/CircleActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.testapp.activity.annotation; +package org.maplibre.android.plugins.testapp.activity.annotation; import android.graphics.Color; import android.os.Bundle; @@ -12,12 +12,12 @@ import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.Style; -import com.mapbox.mapboxsdk.plugins.annotation.Circle; -import com.mapbox.mapboxsdk.plugins.annotation.CircleManager; -import com.mapbox.mapboxsdk.plugins.annotation.CircleOptions; -import com.mapbox.mapboxsdk.plugins.annotation.OnCircleDragListener; -import com.mapbox.mapboxsdk.plugins.testapp.R; -import com.mapbox.mapboxsdk.plugins.testapp.Utils; +import org.maplibre.android.plugins.annotation.Circle; +import org.maplibre.android.plugins.annotation.CircleManager; +import org.maplibre.android.plugins.annotation.CircleOptions; +import org.maplibre.android.plugins.annotation.OnCircleDragListener; +import org.maplibre.android.plugins.testapp.R; +import org.maplibre.android.plugins.testapp.Utils; import com.mapbox.mapboxsdk.utils.ColorUtils; import java.io.IOException; @@ -188,4 +188,4 @@ protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); mapView.onSaveInstanceState(outState); } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/ClusterSymbolActivity.java b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/ClusterSymbolActivity.java similarity index 94% rename from app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/ClusterSymbolActivity.java rename to app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/ClusterSymbolActivity.java index 16763809..354c4b4b 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/ClusterSymbolActivity.java +++ b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/ClusterSymbolActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.testapp.activity.annotation; +package org.maplibre.android.plugins.testapp.activity.annotation; import android.content.Context; import android.graphics.Color; @@ -16,11 +16,11 @@ import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.Style; -import com.mapbox.mapboxsdk.plugins.annotation.ClusterOptions; -import com.mapbox.mapboxsdk.plugins.annotation.Symbol; -import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager; -import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions; -import com.mapbox.mapboxsdk.plugins.testapp.R; +import org.maplibre.android.plugins.annotation.ClusterOptions; +import org.maplibre.android.plugins.annotation.Symbol; +import org.maplibre.android.plugins.annotation.SymbolManager; +import org.maplibre.android.plugins.annotation.SymbolOptions; +import org.maplibre.android.plugins.testapp.R; import java.io.BufferedReader; import java.io.IOException; diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/DynamicSymbolChangeActivity.java b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/DynamicSymbolChangeActivity.java similarity index 94% rename from app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/DynamicSymbolChangeActivity.java rename to app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/DynamicSymbolChangeActivity.java index 6b2c6cec..24de0e7a 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/DynamicSymbolChangeActivity.java +++ b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/DynamicSymbolChangeActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.testapp.activity.annotation; +package org.maplibre.android.plugins.testapp.activity.annotation; import android.graphics.Bitmap; import android.graphics.Canvas; @@ -13,10 +13,10 @@ import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.Style; -import com.mapbox.mapboxsdk.plugins.annotation.Symbol; -import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager; -import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions; -import com.mapbox.mapboxsdk.plugins.testapp.R; +import org.maplibre.android.plugins.annotation.Symbol; +import org.maplibre.android.plugins.annotation.SymbolManager; +import org.maplibre.android.plugins.annotation.SymbolOptions; +import org.maplibre.android.plugins.testapp.R; import androidx.annotation.DrawableRes; import androidx.appcompat.app.AppCompatActivity; diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillActivity.java b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/FillActivity.java similarity index 94% rename from app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillActivity.java rename to app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/FillActivity.java index 9697bb3d..2e72735c 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillActivity.java +++ b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/FillActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.testapp.activity.annotation; +package org.maplibre.android.plugins.testapp.activity.annotation; import android.graphics.Color; import android.os.Bundle; @@ -13,11 +13,11 @@ import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.Style; -import com.mapbox.mapboxsdk.plugins.annotation.Fill; -import com.mapbox.mapboxsdk.plugins.annotation.FillManager; -import com.mapbox.mapboxsdk.plugins.annotation.FillOptions; -import com.mapbox.mapboxsdk.plugins.testapp.R; -import com.mapbox.mapboxsdk.plugins.testapp.Utils; +import org.maplibre.android.plugins.annotation.Fill; +import org.maplibre.android.plugins.annotation.FillManager; +import org.maplibre.android.plugins.annotation.FillOptions; +import org.maplibre.android.plugins.testapp.R; +import org.maplibre.android.plugins.testapp.Utils; import com.mapbox.mapboxsdk.utils.ColorUtils; import java.io.IOException; @@ -188,4 +188,4 @@ protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); mapView.onSaveInstanceState(outState); } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillChangeActivity.java b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/FillChangeActivity.java similarity index 89% rename from app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillChangeActivity.java rename to app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/FillChangeActivity.java index 9b55ec25..3d603737 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillChangeActivity.java +++ b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/FillChangeActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.testapp.activity.annotation; +package org.maplibre.android.plugins.testapp.activity.annotation; import android.graphics.Color; import android.os.Bundle; @@ -13,10 +13,10 @@ import com.mapbox.mapboxsdk.maps.MapboxMapOptions; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.maps.Style; -import com.mapbox.mapboxsdk.plugins.annotation.Fill; -import com.mapbox.mapboxsdk.plugins.annotation.FillManager; -import com.mapbox.mapboxsdk.plugins.annotation.FillOptions; -import com.mapbox.mapboxsdk.plugins.testapp.R; +import org.maplibre.android.plugins.annotation.Fill; +import org.maplibre.android.plugins.annotation.FillManager; +import org.maplibre.android.plugins.annotation.FillOptions; +import org.maplibre.android.plugins.testapp.R; import com.mapbox.mapboxsdk.utils.ColorUtils; import java.util.ArrayList; @@ -25,14 +25,14 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; -import static com.mapbox.mapboxsdk.plugins.testapp.activity.annotation.FillChangeActivity.Config.BLUE_COLOR; -import static com.mapbox.mapboxsdk.plugins.testapp.activity.annotation.FillChangeActivity.Config.BROKEN_SHAPE_POINTS; -import static com.mapbox.mapboxsdk.plugins.testapp.activity.annotation.FillChangeActivity.Config.FULL_ALPHA; -import static com.mapbox.mapboxsdk.plugins.testapp.activity.annotation.FillChangeActivity.Config.NO_ALPHA; -import static com.mapbox.mapboxsdk.plugins.testapp.activity.annotation.FillChangeActivity.Config.PARTIAL_ALPHA; -import static com.mapbox.mapboxsdk.plugins.testapp.activity.annotation.FillChangeActivity.Config.RED_COLOR; -import static com.mapbox.mapboxsdk.plugins.testapp.activity.annotation.FillChangeActivity.Config.STAR_SHAPE_HOLES; -import static com.mapbox.mapboxsdk.plugins.testapp.activity.annotation.FillChangeActivity.Config.STAR_SHAPE_POINTS; +import static org.maplibre.android.plugins.testapp.activity.annotation.FillChangeActivity.Config.BLUE_COLOR; +import static org.maplibre.android.plugins.testapp.activity.annotation.FillChangeActivity.Config.BROKEN_SHAPE_POINTS; +import static org.maplibre.android.plugins.testapp.activity.annotation.FillChangeActivity.Config.FULL_ALPHA; +import static org.maplibre.android.plugins.testapp.activity.annotation.FillChangeActivity.Config.NO_ALPHA; +import static org.maplibre.android.plugins.testapp.activity.annotation.FillChangeActivity.Config.PARTIAL_ALPHA; +import static org.maplibre.android.plugins.testapp.activity.annotation.FillChangeActivity.Config.RED_COLOR; +import static org.maplibre.android.plugins.testapp.activity.annotation.FillChangeActivity.Config.STAR_SHAPE_HOLES; +import static org.maplibre.android.plugins.testapp.activity.annotation.FillChangeActivity.Config.STAR_SHAPE_POINTS; /** * Test activity to showcase the Polygon annotation API & programmatically creating a MapView. diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineActivity.java b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/LineActivity.java similarity index 93% rename from app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineActivity.java rename to app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/LineActivity.java index c05230f6..e288fcd7 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineActivity.java +++ b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/LineActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.testapp.activity.annotation; +package org.maplibre.android.plugins.testapp.activity.annotation; import android.graphics.Color; import android.os.Bundle; @@ -10,11 +10,11 @@ import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.Style; -import com.mapbox.mapboxsdk.plugins.annotation.Line; -import com.mapbox.mapboxsdk.plugins.annotation.LineManager; -import com.mapbox.mapboxsdk.plugins.annotation.LineOptions; -import com.mapbox.mapboxsdk.plugins.testapp.R; -import com.mapbox.mapboxsdk.plugins.testapp.Utils; +import org.maplibre.android.plugins.annotation.Line; +import org.maplibre.android.plugins.annotation.LineManager; +import org.maplibre.android.plugins.annotation.LineOptions; +import org.maplibre.android.plugins.testapp.R; +import org.maplibre.android.plugins.testapp.Utils; import com.mapbox.mapboxsdk.utils.ColorUtils; import java.io.IOException; @@ -166,4 +166,4 @@ protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); mapView.onSaveInstanceState(outState); } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineChangeActivity.java b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/LineChangeActivity.java similarity index 95% rename from app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineChangeActivity.java rename to app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/LineChangeActivity.java index 9e27aec4..c4b92e35 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineChangeActivity.java +++ b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/LineChangeActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.testapp.activity.annotation; +package org.maplibre.android.plugins.testapp.activity.annotation; import android.graphics.Color; import android.os.Bundle; @@ -12,11 +12,11 @@ import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.Style; -import com.mapbox.mapboxsdk.plugins.annotation.Line; -import com.mapbox.mapboxsdk.plugins.annotation.LineManager; -import com.mapbox.mapboxsdk.plugins.annotation.LineOptions; -import com.mapbox.mapboxsdk.plugins.testapp.R; -import com.mapbox.mapboxsdk.plugins.testapp.Utils; +import org.maplibre.android.plugins.annotation.Line; +import org.maplibre.android.plugins.annotation.LineManager; +import org.maplibre.android.plugins.annotation.LineOptions; +import org.maplibre.android.plugins.testapp.R; +import org.maplibre.android.plugins.testapp.Utils; import com.mapbox.mapboxsdk.utils.ColorUtils; import java.util.ArrayList; @@ -227,4 +227,4 @@ public boolean onOptionsItemSelected(MenuItem item) { lineManager.update(lines); return true; } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/PressForSymbolActivity.java b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/PressForSymbolActivity.java similarity index 93% rename from app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/PressForSymbolActivity.java rename to app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/PressForSymbolActivity.java index b115105b..94ea3b84 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/PressForSymbolActivity.java +++ b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/PressForSymbolActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.testapp.activity.annotation; +package org.maplibre.android.plugins.testapp.activity.annotation; import android.graphics.Bitmap; import android.graphics.Canvas; @@ -10,10 +10,10 @@ import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.Style; -import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager; -import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions; -import com.mapbox.mapboxsdk.plugins.testapp.R; -import com.mapbox.mapboxsdk.plugins.testapp.Utils; +import org.maplibre.android.plugins.annotation.SymbolManager; +import org.maplibre.android.plugins.annotation.SymbolOptions; +import org.maplibre.android.plugins.testapp.R; +import org.maplibre.android.plugins.testapp.Utils; import com.mapbox.mapboxsdk.style.layers.Property; import androidx.annotation.DrawableRes; @@ -152,4 +152,3 @@ static Bitmap getBitmapFromDrawable(Drawable drawable) { } } } - diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/SymbolActivity.java b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/SymbolActivity.java similarity index 96% rename from app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/SymbolActivity.java rename to app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/SymbolActivity.java index 6421996f..522d68bc 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/SymbolActivity.java +++ b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/SymbolActivity.java @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.testapp.activity.annotation; +package org.maplibre.android.plugins.testapp.activity.annotation; import android.animation.ValueAnimator; import android.graphics.Color; @@ -17,12 +17,12 @@ import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.Style; -import com.mapbox.mapboxsdk.plugins.annotation.OnSymbolDragListener; -import com.mapbox.mapboxsdk.plugins.annotation.Symbol; -import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager; -import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions; -import com.mapbox.mapboxsdk.plugins.testapp.R; -import com.mapbox.mapboxsdk.plugins.testapp.Utils; +import org.maplibre.android.plugins.annotation.OnSymbolDragListener; +import org.maplibre.android.plugins.annotation.Symbol; +import org.maplibre.android.plugins.annotation.SymbolManager; +import org.maplibre.android.plugins.annotation.SymbolOptions; +import org.maplibre.android.plugins.testapp.R; +import org.maplibre.android.plugins.testapp.Utils; import com.mapbox.mapboxsdk.style.expressions.Expression; import com.mapbox.mapboxsdk.style.layers.Property; import com.mapbox.mapboxsdk.style.sources.GeoJsonOptions; @@ -316,4 +316,4 @@ protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); mapView.onSaveInstanceState(outState); } -} \ No newline at end of file +} diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/ktx/maps/MapboxKtxActivity.kt b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/ktx/maps/MapboxKtxActivity.kt similarity index 92% rename from app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/ktx/maps/MapboxKtxActivity.kt rename to app/src/main/java/org/maplibre/android/plugins/testapp/activity/ktx/maps/MapboxKtxActivity.kt index fa30ae10..31c2d136 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/ktx/maps/MapboxKtxActivity.kt +++ b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/ktx/maps/MapboxKtxActivity.kt @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.testapp.activity.ktx.maps +package org.maplibre.android.plugins.testapp.activity.ktx.maps import android.os.Bundle import android.widget.Toast @@ -7,8 +7,8 @@ import com.mapbox.mapboxsdk.geometry.LatLng import com.mapbox.mapboxsdk.maps.MapboxMap import com.mapbox.mapboxsdk.maps.OnMapReadyCallback import com.mapbox.mapboxsdk.maps.Style -import com.mapbox.mapboxsdk.plugins.maps.queryRenderedFeatures -import com.mapbox.mapboxsdk.plugins.testapp.R +import org.maplibre.android.plugins.maps.queryRenderedFeatures +import org.maplibre.android.plugins.testapp.R import kotlinx.android.synthetic.main.activity_maps_ktx.* class MapboxKtxActivity : AppCompatActivity(), OnMapReadyCallback, MapboxMap.OnMapClickListener { diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/localization/LocalizationActivity.kt b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/localization/LocalizationActivity.kt similarity index 94% rename from app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/localization/LocalizationActivity.kt rename to app/src/main/java/org/maplibre/android/plugins/testapp/activity/localization/LocalizationActivity.kt index 29bb2ce3..e9f2762f 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/localization/LocalizationActivity.kt +++ b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/localization/LocalizationActivity.kt @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.testapp.activity.localization +package org.maplibre.android.plugins.testapp.activity.localization import android.os.Bundle import android.view.Menu @@ -8,10 +8,10 @@ import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.maps.MapboxMap import com.mapbox.mapboxsdk.maps.OnMapReadyCallback import com.mapbox.mapboxsdk.maps.Style -import com.mapbox.mapboxsdk.plugins.localization.LocalizationPlugin -import com.mapbox.mapboxsdk.plugins.localization.MapLocale -import com.mapbox.mapboxsdk.plugins.testapp.R -import com.mapbox.mapboxsdk.plugins.testapp.Utils +import org.maplibre.android.plugins.localization.LocalizationPlugin +import org.maplibre.android.plugins.localization.MapLocale +import org.maplibre.android.plugins.testapp.R +import org.maplibre.android.plugins.testapp.Utils import kotlinx.android.synthetic.main.activity_localization.* class LocalizationActivity : AppCompatActivity(), OnMapReadyCallback { diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/markerview/MarkerViewActivity.kt b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/markerview/MarkerViewActivity.kt similarity index 94% rename from app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/markerview/MarkerViewActivity.kt rename to app/src/main/java/org/maplibre/android/plugins/testapp/activity/markerview/MarkerViewActivity.kt index 668c7219..750a52fe 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/markerview/MarkerViewActivity.kt +++ b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/markerview/MarkerViewActivity.kt @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.testapp.activity.markerview +package org.maplibre.android.plugins.testapp.activity.markerview import android.animation.ValueAnimator import android.os.Bundle @@ -10,16 +10,16 @@ import android.widget.ImageView import com.mapbox.mapboxsdk.camera.CameraUpdateFactory import com.mapbox.mapboxsdk.geometry.LatLng import com.mapbox.mapboxsdk.maps.MapboxMap -import com.mapbox.mapboxsdk.plugins.markerview.MarkerView -import com.mapbox.mapboxsdk.plugins.markerview.MarkerViewManager -import com.mapbox.mapboxsdk.plugins.testapp.R +import org.maplibre.android.plugins.markerview.MarkerView +import org.maplibre.android.plugins.markerview.MarkerViewManager +import org.maplibre.android.plugins.testapp.R import java.util.Random import android.view.ViewGroup.LayoutParams.WRAP_CONTENT import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.maps.Style -import com.mapbox.mapboxsdk.plugins.testapp.Utils +import org.maplibre.android.plugins.testapp.Utils import kotlinx.android.synthetic.main.activity_annotation.* class MarkerViewActivity : AppCompatActivity(), MapboxMap.OnMapLongClickListener, MapboxMap.OnMapClickListener { diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineDownloadActivity.kt b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineDownloadActivity.kt similarity index 94% rename from app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineDownloadActivity.kt rename to app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineDownloadActivity.kt index fdc1be18..d27cd3a1 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineDownloadActivity.kt +++ b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineDownloadActivity.kt @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.testapp.activity.offline +package org.maplibre.android.plugins.testapp.activity.offline import android.os.Bundle import android.widget.ArrayAdapter @@ -11,11 +11,11 @@ import com.mapbox.mapboxsdk.geometry.LatLng import com.mapbox.mapboxsdk.geometry.LatLngBounds import com.mapbox.mapboxsdk.maps.Style import com.mapbox.mapboxsdk.offline.OfflineTilePyramidRegionDefinition -import com.mapbox.mapboxsdk.plugins.offline.offline.OfflinePlugin -import com.mapbox.mapboxsdk.plugins.offline.model.NotificationOptions -import com.mapbox.mapboxsdk.plugins.offline.model.OfflineDownloadOptions -import com.mapbox.mapboxsdk.plugins.offline.utils.OfflineUtils -import com.mapbox.mapboxsdk.plugins.testapp.R +import org.maplibre.android.plugins.offline.offline.OfflinePlugin +import org.maplibre.android.plugins.offline.model.NotificationOptions +import org.maplibre.android.plugins.offline.model.OfflineDownloadOptions +import org.maplibre.android.plugins.offline.utils.OfflineUtils +import org.maplibre.android.plugins.testapp.R import java.util.ArrayList diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineRegionDetailActivity.kt b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineRegionDetailActivity.kt similarity index 94% rename from app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineRegionDetailActivity.kt rename to app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineRegionDetailActivity.kt index eb8fae21..d3123f56 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineRegionDetailActivity.kt +++ b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineRegionDetailActivity.kt @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.testapp.activity.offline +package org.maplibre.android.plugins.testapp.activity.offline import android.os.Bundle import android.view.View @@ -8,12 +8,12 @@ import com.mapbox.mapboxsdk.offline.OfflineManager import com.mapbox.mapboxsdk.offline.OfflineRegion import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition import com.mapbox.mapboxsdk.offline.OfflineRegionStatus -import com.mapbox.mapboxsdk.plugins.offline.model.OfflineDownloadOptions -import com.mapbox.mapboxsdk.plugins.offline.offline.OfflineConstants.KEY_BUNDLE -import com.mapbox.mapboxsdk.plugins.offline.offline.OfflineDownloadChangeListener -import com.mapbox.mapboxsdk.plugins.offline.offline.OfflinePlugin -import com.mapbox.mapboxsdk.plugins.offline.utils.OfflineUtils -import com.mapbox.mapboxsdk.plugins.testapp.R +import org.maplibre.android.plugins.offline.model.OfflineDownloadOptions +import org.maplibre.android.plugins.offline.offline.OfflineConstants.KEY_BUNDLE +import org.maplibre.android.plugins.offline.offline.OfflineDownloadChangeListener +import org.maplibre.android.plugins.offline.offline.OfflinePlugin +import org.maplibre.android.plugins.offline.utils.OfflineUtils +import org.maplibre.android.plugins.testapp.R import kotlinx.android.synthetic.main.activity_offline_region_detail.* import timber.log.Timber @@ -241,6 +241,6 @@ class OfflineRegionDetailActivity : AppCompatActivity(), OfflineDownloadChangeLi companion object { - val KEY_REGION_ID_BUNDLE = "com.mapbox.mapboxsdk.plugins.offline.bundle.id" + val KEY_REGION_ID_BUNDLE = "org.maplibre.android.plugins.offline.bundle.id" } } \ No newline at end of file diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineRegionListActivity.kt b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineRegionListActivity.kt similarity index 95% rename from app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineRegionListActivity.kt rename to app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineRegionListActivity.kt index 916c9ece..0d4b95fe 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineRegionListActivity.kt +++ b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineRegionListActivity.kt @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.testapp.activity.offline +package org.maplibre.android.plugins.testapp.activity.offline import android.content.Intent import android.os.Bundle @@ -10,8 +10,8 @@ import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.offline.OfflineManager import com.mapbox.mapboxsdk.offline.OfflineRegion import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition -import com.mapbox.mapboxsdk.plugins.offline.utils.OfflineUtils -import com.mapbox.mapboxsdk.plugins.testapp.R +import org.maplibre.android.plugins.offline.utils.OfflineUtils +import org.maplibre.android.plugins.testapp.R import java.util.* /** diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt similarity index 87% rename from app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt rename to app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt index 376ae52a..40834e87 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt +++ b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt @@ -1,4 +1,4 @@ -package com.mapbox.mapboxsdk.plugins.testapp.activity.offline +package org.maplibre.android.plugins.testapp.activity.offline import android.app.Activity import android.content.Intent @@ -8,11 +8,11 @@ import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.camera.CameraPosition import com.mapbox.mapboxsdk.geometry.LatLng -import com.mapbox.mapboxsdk.plugins.offline.OfflineRegionSelector -import com.mapbox.mapboxsdk.plugins.offline.model.NotificationOptions -import com.mapbox.mapboxsdk.plugins.offline.model.RegionSelectionOptions -import com.mapbox.mapboxsdk.plugins.offline.offline.OfflinePlugin -import com.mapbox.mapboxsdk.plugins.testapp.R +import org.maplibre.android.plugins.offline.OfflineRegionSelector +import org.maplibre.android.plugins.offline.model.NotificationOptions +import org.maplibre.android.plugins.offline.model.RegionSelectionOptions +import org.maplibre.android.plugins.offline.offline.OfflinePlugin +import org.maplibre.android.plugins.testapp.R import java.util.Locale diff --git a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/scalebar/ScalebarActivity.kt b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/scalebar/ScalebarActivity.kt similarity index 93% rename from app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/scalebar/ScalebarActivity.kt rename to app/src/main/java/org/maplibre/android/plugins/testapp/activity/scalebar/ScalebarActivity.kt index a0746319..f593fbf7 100644 --- a/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/scalebar/ScalebarActivity.kt +++ b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/scalebar/ScalebarActivity.kt @@ -1,13 +1,13 @@ -package com.mapbox.mapboxsdk.plugins.testapp.activity.scalebar +package org.maplibre.android.plugins.testapp.activity.scalebar import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.maps.MapboxMap import com.mapbox.turf.TurfMeasurement import com.mapbox.mapboxsdk.maps.Style -import com.mapbox.mapboxsdk.plugins.testapp.R -import com.mapbox.pluginscalebar.ScaleBarOptions -import com.mapbox.pluginscalebar.ScaleBarPlugin +import org.maplibre.android.plugins.testapp.R +import org.maplibre.pluginscalebar.ScaleBarOptions +import org.maplibre.pluginscalebar.ScaleBarPlugin import kotlinx.android.synthetic.main.activity_scalebar.* import com.mapbox.geojson.LineString diff --git a/plugin-scalebar/README.md b/plugin-scalebar/README.md index f36cbf15..0d1febe2 100644 --- a/plugin-scalebar/README.md +++ b/plugin-scalebar/README.md @@ -20,7 +20,7 @@ repositories { // In the app build.gradle file dependencies { - implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-scalebar-v9:0.5.0' + implementation 'org.maplibre.android:maplibre-android-plugin-scalebar-v9:0.5.0' } ``` @@ -37,7 +37,7 @@ repositories { // In the app build.gradle file dependencies { - implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-scalebar-v9:0.6.0-SNAPSHOT' + implementation 'org.maplibre.android:maplibre-android-plugin-scalebar-v9:0.6.0-SNAPSHOT' } ``` diff --git a/plugin-scalebar/src/main/AndroidManifest.xml b/plugin-scalebar/src/main/AndroidManifest.xml index c2d2d0e9..2881c25e 100644 --- a/plugin-scalebar/src/main/AndroidManifest.xml +++ b/plugin-scalebar/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ + package="org.maplibre.pluginscalebar" /> diff --git a/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarConstants.java b/plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarConstants.java similarity index 98% rename from plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarConstants.java rename to plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarConstants.java index c743f906..6d979ff8 100644 --- a/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarConstants.java +++ b/plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarConstants.java @@ -1,4 +1,4 @@ -package com.mapbox.pluginscalebar; +package org.maplibre.pluginscalebar; import android.util.Pair; diff --git a/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarOptions.java b/plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarOptions.java similarity index 99% rename from plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarOptions.java rename to plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarOptions.java index a0589ead..f32ad8d4 100644 --- a/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarOptions.java +++ b/plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarOptions.java @@ -1,4 +1,4 @@ -package com.mapbox.pluginscalebar; +package org.maplibre.pluginscalebar; import android.content.Context; diff --git a/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarPlugin.java b/plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarPlugin.java similarity index 99% rename from plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarPlugin.java rename to plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarPlugin.java index 4094da85..e4c993fa 100644 --- a/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarPlugin.java +++ b/plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarPlugin.java @@ -1,4 +1,4 @@ -package com.mapbox.pluginscalebar; +package org.maplibre.pluginscalebar; import android.view.View; diff --git a/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarWidget.java b/plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarWidget.java similarity index 97% rename from plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarWidget.java rename to plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarWidget.java index 8679a134..0d4dbf2a 100644 --- a/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarWidget.java +++ b/plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarWidget.java @@ -1,4 +1,4 @@ -package com.mapbox.pluginscalebar; +package org.maplibre.pluginscalebar; import android.content.Context; import android.graphics.Canvas; @@ -17,10 +17,10 @@ import androidx.annotation.ColorInt; import androidx.annotation.NonNull; -import static com.mapbox.pluginscalebar.ScaleBarConstants.FEET_PER_MILE; -import static com.mapbox.pluginscalebar.ScaleBarConstants.KILOMETER; -import static com.mapbox.pluginscalebar.ScaleBarConstants.KILOMETER_UNIT; -import static com.mapbox.pluginscalebar.ScaleBarConstants.MILE_UNIT; +import static org.maplibre.pluginscalebar.ScaleBarConstants.FEET_PER_MILE; +import static org.maplibre.pluginscalebar.ScaleBarConstants.KILOMETER; +import static org.maplibre.pluginscalebar.ScaleBarConstants.KILOMETER_UNIT; +import static org.maplibre.pluginscalebar.ScaleBarConstants.MILE_UNIT; /** * The scale widget is a visual representation of the scale bar plugin. diff --git a/plugin-scalebar/src/test/java/com/mapbox/pluginscalebar/ScaleBarPluginTest.kt b/plugin-scalebar/src/test/java/org/maplibre/pluginscalebar/ScaleBarPluginTest.kt similarity index 99% rename from plugin-scalebar/src/test/java/com/mapbox/pluginscalebar/ScaleBarPluginTest.kt rename to plugin-scalebar/src/test/java/org/maplibre/pluginscalebar/ScaleBarPluginTest.kt index e89bab36..65fee4bb 100644 --- a/plugin-scalebar/src/test/java/com/mapbox/pluginscalebar/ScaleBarPluginTest.kt +++ b/plugin-scalebar/src/test/java/org/maplibre/pluginscalebar/ScaleBarPluginTest.kt @@ -1,4 +1,4 @@ -package com.mapbox.pluginscalebar +package org.maplibre.pluginscalebar import android.content.Context import android.content.res.Resources @@ -136,4 +136,4 @@ class ScaleBarPluginTest { verify(exactly = 2) { mapboxMap.cameraPosition } verify(exactly = 2) { scaleBarWidget.setDistancePerPixel(50_000.0) } } -} \ No newline at end of file +} From 1da78a14133c713dfb6059738f3fa8c4960b4f39 Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Sun, 19 Feb 2023 10:50:32 -0800 Subject: [PATCH 31/40] replacing some autogen files --- plugin-annotation/scripts/annotation.java.ejs | 2 +- .../scripts/annotation_click_listener.java.ejs | 2 +- .../scripts/annotation_drag_listener.java.ejs | 2 +- .../scripts/annotation_element_provider.java.ejs | 2 +- .../scripts/annotation_long_click_listener.java.ejs | 2 +- plugin-annotation/scripts/annotation_manager.java.ejs | 2 +- .../annotation_manager_instrumentation_test.junit.ejs | 8 ++++---- .../scripts/annotation_manager_unit_test.junit.ejs | 4 ++-- plugin-annotation/scripts/annotation_options.java.ejs | 8 ++++---- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/plugin-annotation/scripts/annotation.java.ejs b/plugin-annotation/scripts/annotation.java.ejs index b744656a..09f66cea 100644 --- a/plugin-annotation/scripts/annotation.java.ejs +++ b/plugin-annotation/scripts/annotation.java.ejs @@ -5,7 +5,7 @@ -%> // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.annotation.ColorInt; import androidx.annotation.NonNull; diff --git a/plugin-annotation/scripts/annotation_click_listener.java.ejs b/plugin-annotation/scripts/annotation_click_listener.java.ejs index 47a78839..7c9c94dd 100644 --- a/plugin-annotation/scripts/annotation_click_listener.java.ejs +++ b/plugin-annotation/scripts/annotation_click_listener.java.ejs @@ -5,7 +5,7 @@ -%> // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; /** * Interface definition for a callback to be invoked when a <%- type %> has been clicked. diff --git a/plugin-annotation/scripts/annotation_drag_listener.java.ejs b/plugin-annotation/scripts/annotation_drag_listener.java.ejs index 4efdc955..52b37e80 100644 --- a/plugin-annotation/scripts/annotation_drag_listener.java.ejs +++ b/plugin-annotation/scripts/annotation_drag_listener.java.ejs @@ -5,7 +5,7 @@ -%> // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; /** * Interface definition for a callback to be invoked when a <%- type %> is dragged. diff --git a/plugin-annotation/scripts/annotation_element_provider.java.ejs b/plugin-annotation/scripts/annotation_element_provider.java.ejs index c81af085..d4d6a7e7 100644 --- a/plugin-annotation/scripts/annotation_element_provider.java.ejs +++ b/plugin-annotation/scripts/annotation_element_provider.java.ejs @@ -5,7 +5,7 @@ -%> // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.annotation.Nullable; import com.mapbox.mapboxsdk.style.layers.<%- camelize(type) %>Layer; diff --git a/plugin-annotation/scripts/annotation_long_click_listener.java.ejs b/plugin-annotation/scripts/annotation_long_click_listener.java.ejs index 29f1eb1d..ec90c522 100644 --- a/plugin-annotation/scripts/annotation_long_click_listener.java.ejs +++ b/plugin-annotation/scripts/annotation_long_click_listener.java.ejs @@ -5,7 +5,7 @@ -%> // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; /** * Interface definition for a callback to be invoked when a <%- type %> has been long clicked. diff --git a/plugin-annotation/scripts/annotation_manager.java.ejs b/plugin-annotation/scripts/annotation_manager.java.ejs index 6a7dc3c8..66e93fc5 100644 --- a/plugin-annotation/scripts/annotation_manager.java.ejs +++ b/plugin-annotation/scripts/annotation_manager.java.ejs @@ -5,7 +5,7 @@ -%> // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/plugin-annotation/scripts/annotation_manager_instrumentation_test.junit.ejs b/plugin-annotation/scripts/annotation_manager_instrumentation_test.junit.ejs index 5355a108..bcce547e 100644 --- a/plugin-annotation/scripts/annotation_manager_instrumentation_test.junit.ejs +++ b/plugin-annotation/scripts/annotation_manager_instrumentation_test.junit.ejs @@ -4,13 +4,13 @@ -%> // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; -import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; -import com.mapbox.mapboxsdk.plugins.BaseActivityTest; +import org.maplibre.android.plugins.testapp.activity.TestActivity; +import org.maplibre.android.plugins.BaseActivityTest; import timber.log.Timber; import org.junit.Test; @@ -18,7 +18,7 @@ import org.junit.runner.RunWith; import java.util.Objects; -import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke; +import static org.maplibre.android.plugins.annotation.MapboxMapAction.invoke; import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; diff --git a/plugin-annotation/scripts/annotation_manager_unit_test.junit.ejs b/plugin-annotation/scripts/annotation_manager_unit_test.junit.ejs index 4102199e..94e7e944 100644 --- a/plugin-annotation/scripts/annotation_manager_unit_test.junit.ejs +++ b/plugin-annotation/scripts/annotation_manager_unit_test.junit.ejs @@ -5,7 +5,7 @@ -%> // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import com.google.gson.JsonPrimitive; import com.mapbox.geojson.*; @@ -27,7 +27,7 @@ import java.util.List; import java.util.Arrays; import android.graphics.PointF; -import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.convertArray; +import static org.maplibre.android.plugins.annotation.ConvertUtils.convertArray; import static com.mapbox.mapboxsdk.style.expressions.Expression.get; import static com.mapbox.mapboxsdk.style.layers.Property.*; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; diff --git a/plugin-annotation/scripts/annotation_options.java.ejs b/plugin-annotation/scripts/annotation_options.java.ejs index 0391b26a..b3abd0ed 100644 --- a/plugin-annotation/scripts/annotation_options.java.ejs +++ b/plugin-annotation/scripts/annotation_options.java.ejs @@ -5,7 +5,7 @@ -%> // This file is generated. -package com.mapbox.mapboxsdk.plugins.annotation; +package org.maplibre.android.plugins.annotation; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -21,9 +21,9 @@ import com.mapbox.mapboxsdk.geometry.LatLng; import java.util.ArrayList; import java.util.List; -import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.convertArray; -import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.toFloatArray; -import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.toStringArray; +import static org.maplibre.android.plugins.annotation.ConvertUtils.convertArray; +import static org.maplibre.android.plugins.annotation.ConvertUtils.toFloatArray; +import static org.maplibre.android.plugins.annotation.ConvertUtils.toStringArray; /** * Builder class from which a <%- type %> is created. From 35c7068f7f806303fde2c9c760e6c01fe9188e05 Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Sun, 19 Feb 2023 10:58:16 -0800 Subject: [PATCH 32/40] folder refs updated --- .gitignore | 2 +- README.md | 4 ++-- gradle/nitpick.gradle | 6 +++--- plugin-annotation/README.md | 4 ++-- plugin-annotation/scripts/code-gen.js | 20 ++++++++++---------- plugin-building/README.md | 4 ++-- plugin-localization/README.md | 4 ++-- plugin-markerview/README.md | 4 ++-- plugin-offline/README.md | 4 ++-- plugin-scalebar/README.md | 4 ++-- scripts/generate-activity-test.js | 8 ++++---- 11 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index f4356780..464bcc77 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,7 @@ build/ ### Code gen activity sanity tests ### /node_modules -app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/gen +app/src/androidTest/java/org/maplibre/android/plugins/gen ### Code gen annotation plugin ### plugin-annotation/scripts/code-gen.list diff --git a/README.md b/README.md index b591e85e..0e26d85a 100644 --- a/README.md +++ b/README.md @@ -76,8 +76,8 @@ A plugin is simply a library module built on top of the MapLibre Maps SDK for An ### Test app This repository includes an app with examples showing how you can use each plugin. -- To access ready-to-use snippets, [see its code here](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp). -- To run the application locally, open the [`PluginApplication`](https://github.com/maplibre/maplibre-plugins-android/blob/4ff768983323cc4a57791bcb577639109e4fd9ce/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/PluginApplication.kt) file +- To access ready-to-use snippets, [see its code here](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/org/maplibre/android/plugins/testapp). +- To run the application locally, open the [`PluginApplication`](https://github.com/maplibre/maplibre-plugins-android/blob/4ff768983323cc4a57791bcb577639109e4fd9ce/app/src/main/java/org/maplibre/android/plugins/testapp/PluginApplication.kt) file This might change in the future as we build more plugins and learn how you use them. We'd love to [hear your feedback](https://github.com/maplibre/maplibre-plugins-android/issues). diff --git a/gradle/nitpick.gradle b/gradle/nitpick.gradle index a31f349f..65aa9b2c 100644 --- a/gradle/nitpick.gradle +++ b/gradle/nitpick.gradle @@ -13,9 +13,9 @@ private def verifyAnnotationCodeGeneration() { workingDir = "${rootDir}" commandLine "make", "generate-annotation-code" } - checkDirectoryForChanges("app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation") - checkDirectoryForChanges("plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation") - checkDirectoryForChanges("plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation") + checkDirectoryForChanges("app/src/androidTest/java/org/maplibre/android/plugins/annotation") + checkDirectoryForChanges("plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation") + checkDirectoryForChanges("plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation") } private checkDirectoryForChanges(dir) { diff --git a/plugin-annotation/README.md b/plugin-annotation/README.md index ac7596a0..19fbb114 100644 --- a/plugin-annotation/README.md +++ b/plugin-annotation/README.md @@ -54,11 +54,11 @@ dependencies { ## Annotation plugin examples -- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation) +- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation) ## Help and Usage -This repository includes an app that shows how to use each plugin in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. +This repository includes an app that shows how to use each plugin in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity) for ready-to-use snippets. We'd love to [hear your feedback](https://github.com/maplibre/maplibre-plugins-android/issues) as we build more plugins and learn how you use them. diff --git a/plugin-annotation/scripts/code-gen.js b/plugin-annotation/scripts/code-gen.js index 1a5c3d14..5efb2577 100644 --- a/plugin-annotation/scripts/code-gen.js +++ b/plugin-annotation/scripts/code-gen.js @@ -400,15 +400,15 @@ const annotationManagerJavaUnitTests = ejs.compile(fs.readFileSync('plugin-annot for (const layer of layers) { if(layer.type === "symbol" || layer.type === "circle" || layer.type === "fill" || layer.type === "line"){ - writeIfModified(`plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/On${camelize(layer.type)}DragListener.java`, annotationDragListener(layer)); - writeIfModified(`plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/On${camelize(layer.type)}ClickListener.java`, annotationClickListener(layer)); - writeIfModified(`plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/On${camelize(layer.type)}LongClickListener.java`, annotationLongClickListener(layer)); - writeIfModified(`plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/${camelize(layer.type)}.java`, annotationJava(layer)); - writeIfModified(`plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/${camelize(layer.type)}Options.java`, annotationOptionsJava(layer)); - writeIfModified(`plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/${camelize(layer.type)}Manager.java`, annotationManagerJava(layer)); - writeIfModified(`plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/${camelize(layer.type)}ElementProvider.java`, annotationElementProvider(layer)); - writeIfModified(`app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/${camelize(layer.type)}Test.java`, annotationJavaInstrumentationTests(layer)); - writeIfModified(`app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/${camelize(layer.type)}ManagerTest.java`, annotationManagerJavaInstrumentationTests(layer)); - writeIfModified(`plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/${camelize(layer.type)}ManagerTest.java`, annotationManagerJavaUnitTests(layer)); + writeIfModified(`plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/On${camelize(layer.type)}DragListener.java`, annotationDragListener(layer)); + writeIfModified(`plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/On${camelize(layer.type)}ClickListener.java`, annotationClickListener(layer)); + writeIfModified(`plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/On${camelize(layer.type)}LongClickListener.java`, annotationLongClickListener(layer)); + writeIfModified(`plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/${camelize(layer.type)}.java`, annotationJava(layer)); + writeIfModified(`plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/${camelize(layer.type)}Options.java`, annotationOptionsJava(layer)); + writeIfModified(`plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/${camelize(layer.type)}Manager.java`, annotationManagerJava(layer)); + writeIfModified(`plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/${camelize(layer.type)}ElementProvider.java`, annotationElementProvider(layer)); + writeIfModified(`app/src/androidTest/java/org/maplibre/android/plugins/annotation/${camelize(layer.type)}Test.java`, annotationJavaInstrumentationTests(layer)); + writeIfModified(`app/src/androidTest/java/org/maplibre/android/plugins/annotation/${camelize(layer.type)}ManagerTest.java`, annotationManagerJavaInstrumentationTests(layer)); + writeIfModified(`plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/${camelize(layer.type)}ManagerTest.java`, annotationManagerJavaUnitTests(layer)); } } \ No newline at end of file diff --git a/plugin-building/README.md b/plugin-building/README.md index bd0743df..318d2cad 100644 --- a/plugin-building/README.md +++ b/plugin-building/README.md @@ -43,11 +43,11 @@ dependencies { ## Building plugin examples -- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/blob/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/building/BuildingActivity.kt) +- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/blob/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity/building/BuildingActivity.kt) ## Help and Usage -This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. +This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity) for ready-to-use snippets. We'd love to [hear your feedback](https://github.com/maplibre/maplibre-plugins-android/issues) as we build more plugins and learn how you use them. diff --git a/plugin-localization/README.md b/plugin-localization/README.md index f9c8be2a..01442a81 100644 --- a/plugin-localization/README.md +++ b/plugin-localization/README.md @@ -45,11 +45,11 @@ dependencies { ## Localization examples -- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/blob/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/localization/LocalizationActivity.kt) +- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/blob/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity/localization/LocalizationActivity.kt) ## Help and Usage -This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. +This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity) for ready-to-use snippets. We'd love to [hear your feedback](https://github.com/maplibre/maplibre-plugins-android/issues) as we build more plugins and learn how you use them. diff --git a/plugin-markerview/README.md b/plugin-markerview/README.md index 05f650e0..5feeb24f 100644 --- a/plugin-markerview/README.md +++ b/plugin-markerview/README.md @@ -45,11 +45,11 @@ dependencies { ## MarkerView plugin examples -- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/blob/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/markerview/MarkerViewActivity.kt) +- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/blob/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity/markerview/MarkerViewActivity.kt) ## Help and Usage -This repository includes an app that shows how to use each plugin in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. +This repository includes an app that shows how to use each plugin in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity) for ready-to-use snippets. We'd love to [hear your feedback](https://github.com/maplibre/maplibre-plugins-android/issues) as we build more plugins and learn how you use them. diff --git a/plugin-offline/README.md b/plugin-offline/README.md index 0f9f96da..1f99336a 100644 --- a/plugin-offline/README.md +++ b/plugin-offline/README.md @@ -43,11 +43,11 @@ dependencies { ## Offline plugin examples -- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline) +- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline) ## Help and Usage -This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. +This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity) for ready-to-use snippets. We'd love to [hear your feedback](https://github.com/maplibre/maplibre-plugins-android/issues) as we build more plugins and learn how you use them. diff --git a/plugin-scalebar/README.md b/plugin-scalebar/README.md index 0d1febe2..0525bece 100644 --- a/plugin-scalebar/README.md +++ b/plugin-scalebar/README.md @@ -43,11 +43,11 @@ dependencies { ## Scale bar plugin examples -- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/blob/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/scalebar/ScalebarActivity.kt) +- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/blob/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity/scalebar/ScalebarActivity.kt) ## Help and Usage -This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. +This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity) for ready-to-use snippets. Plugins are easy to use. A plugin is simply a library module built on top of the MapLibre Maps SDK for Android. Currently, we are not requiring plugins to register themselves or to implement any specific interfaces so that they're simple to consume. diff --git a/scripts/generate-activity-test.js b/scripts/generate-activity-test.js index c419a5ec..69f10ece 100644 --- a/scripts/generate-activity-test.js +++ b/scripts/generate-activity-test.js @@ -14,10 +14,10 @@ global.camelize = function (str) { } const excludeClasses = JSON.parse(fs.readFileSync('scripts/exclude-activity-gen.json', 'utf8')); -const appBasePath = 'app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity'; -const testBasePath = 'app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/gen'; +const appBasePath = 'app/src/main/java/org/maplibre/android/plugins/testapp/activity'; +const testBasePath = 'app/src/androidTest/java/org/maplibre/android/plugins/gen'; const subPackages = fs.readdirSync(appBasePath); -const ejsConversionTask = ejs.compile(fs.readFileSync('app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/activity.junit.ejs', 'utf8'), {strict: true}); +const ejsConversionTask = ejs.compile(fs.readFileSync('app/src/androidTest/java/org/maplibre/android/plugins/activity.junit.ejs', 'utf8'), {strict: true}); if (!fs.existsSync(testBasePath)){ fs.mkdirSync(testBasePath); @@ -70,4 +70,4 @@ for(const generatedClass of generatedClasses){ console.log(generatedClass+"Test"); } -console.log("\nFinished generating " + generatedClasses.length + " activity sanity tests, excluded " + excludeClasses.length + " classes.\n"); \ No newline at end of file +console.log("\nFinished generating " + generatedClasses.length + " activity sanity tests, excluded " + excludeClasses.length + " classes.\n"); From b07e4dbc1d334f2ede0c39e1078b8e7214ed3892 Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Tue, 21 Feb 2023 13:37:18 -0800 Subject: [PATCH 33/40] changing permissions import to maplibre --- .../plugins/testapp/activity/FeatureOverviewActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/FeatureOverviewActivity.java b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/FeatureOverviewActivity.java index 66e2893d..920fb450 100644 --- a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/FeatureOverviewActivity.java +++ b/app/src/main/java/org/maplibre/android/plugins/testapp/activity/FeatureOverviewActivity.java @@ -18,8 +18,8 @@ import android.view.ViewGroup; import android.widget.TextView; import android.widget.Toast; -import com.mapbox.android.core.permissions.PermissionsListener; -import com.mapbox.android.core.permissions.PermissionsManager; +import org.maplibre.android.core.permissions.PermissionsListener; +import org.maplibre.android.core.permissions.PermissionsManager; import org.maplibre.android.plugins.testapp.R; import androidx.annotation.IdRes; From 90cdb68181f9ba2055b39f322d2dd59a823e922a Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Wed, 22 Feb 2023 10:58:28 +0100 Subject: [PATCH 34/40] Update ci badge --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 0e26d85a..d34164ca 100644 --- a/README.md +++ b/README.md @@ -6,9 +6,7 @@

Plugins are single-purpose libraries built on top of the MapLibre Maps SDK for Android that you can include in your apps like any other Android dependency

- - - + [![ci](https://github.com/maplibre/maplibre-plugins-android/actions/workflows/ci.yml/badge.svg)](https://github.com/maplibre/maplibre-plugins-android/actions/workflows/ci.yml)


From 4152dfe553057257951c03123f5a9c56c095ba70 Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Wed, 22 Feb 2023 11:01:06 +0100 Subject: [PATCH 35/40] Remove comment about Transifex --- CONTRIBUTING.md | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3f5b3e71..2e8ac6b0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,15 +13,4 @@ If you're interested in building and sharing your own plugin, please follow thes - Tests. - Javadoc that documents the plugin usage and purpose in detail. -- Finally, once you're ready to share your code, list your plugin in this file and then open a PR for other contributors to review. - -## Adding or updating a localization - -The MapLibre Plugins SDK for Android features several translations contributed through [Transifex](https://www.transifex.com/maplibre/maplibre-plugins-android/). If your language already has a translation, feel free to complete or proofread it. Otherwise, please [request your language](https://www.transifex.com/maplibre/maplibre-plugins-android/) so you can start translating. Note that we’re primarily interested in languages that Android supports as system languages. - -Once you’ve finished translating the Android Plugins SDK into a new language in Transifex, open an issue in this repository asking to pull in your translations. You can also pull in the translations yourself: - -1. Create a new branch that will contain the new translations. -1. _(First time only.)_ Download the [`tx` command line tool](https://docs.transifex.com/client/installing-the-client) and [configure your .transifexrc](https://docs.transifex.com/client/client-configuration). -1. Run `tx pull -a` to fetch translations from Transifex. You can restrict the operation to just the new language using `tx pull -l xyz`, where _xyz_ is the language code. -1. Commit any new files that were added and open a pull request with your changes. +- Finally, once you're ready to share your code, list your plugin in this file and then open a PR for other contributors to review. \ No newline at end of file From 1ef77a0bad4972258bc04693793f712cad721071 Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Wed, 22 Feb 2023 11:17:28 +0100 Subject: [PATCH 36/40] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d34164ca..ae94d1b3 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ We are looking for maintainers for these plugins! Please reach out to the Maplib ## Installing a plugin -By using a plugin, you also have to include the MapLibre Maps SDK for Android which means that you'll need to setup your project to use the Maps SDK if you haven't already. Head over to the [overview page for the Maps SDK](https://maplibre.org/projects/maplibre-native/) to learn more. +By using a plugin, you also have to include the MapLibre GL Native for Android which means that you'll need to setup your project to use the Maps SDK if you haven't already. Head over to the [overview page for the Maps SDK](https://maplibre.org/projects/maplibre-native/) to learn more. Note that depending on the plugin you add, there might be required permissions and additional setup steps. You'll find more information on whether or not more configuration steps are involved when looking at the specific plugin documentation. From 206b18022537e54b6e573ab827c5765b9f91acf6 Mon Sep 17 00:00:00 2001 From: Victor Temprano Date: Fri, 24 Feb 2023 09:45:28 -0800 Subject: [PATCH 37/40] remove maven block --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 0e26d85a..4e5649fe 100644 --- a/README.md +++ b/README.md @@ -51,9 +51,6 @@ Note that depending on the plugin you add, there might be required permissions a ```gradle repositories { mavenCentral() - maven { - url 'https://api.maplibre.com/downloads/v2/releases/maven' - } } dependencies { From e74a14a3f693c99bbcfd939e8dd962ec8df0102e Mon Sep 17 00:00:00 2001 From: fynngodau Date: Thu, 23 Feb 2023 19:13:19 +0100 Subject: [PATCH 38/40] Fix performance when adding many individual annotations to map (#12) * Fix performance when adding many individual markers to map * Thread-safe `postUpdateSource` * Replace lambda with explicit anon class We still seem to be on java language level 7 --- .../plugins/annotation/AnnotationManager.java | 20 ++++++++++++++++++- .../DraggableAnnotationController.java | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/AnnotationManager.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/AnnotationManager.java index 00889077..a308b100 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/AnnotationManager.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/AnnotationManager.java @@ -19,6 +19,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.atomic.AtomicBoolean; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -45,6 +46,7 @@ public abstract class AnnotationManager< private static final String TAG = "AnnotationManager"; + private final MapView mapView; protected final MapboxMap mapboxMap; protected final LongSparseArray annotations = new LongSparseArray<>(); final Map dataDrivenPropertyUsageMap = new HashMap<>(); @@ -64,11 +66,14 @@ public abstract class AnnotationManager< protected CoreElementProvider coreElementProvider; private DraggableAnnotationController draggableAnnotationController; + private AtomicBoolean isSourceUpToDate = new AtomicBoolean(true); + @UiThread protected AnnotationManager(MapView mapView, final MapboxMap mapboxMap, Style style, CoreElementProvider coreElementProvider, DraggableAnnotationController draggableAnnotationController, String belowLayerId, final GeoJsonOptions geoJsonOptions) { + this.mapView = mapView; this.mapboxMap = mapboxMap; this.style = style; this.belowLayerId = belowLayerId; @@ -222,7 +227,20 @@ public void update(List annotationList) { */ public void updateSource() { draggableAnnotationController.onSourceUpdated(); - internalUpdateSource(); + postUpdateSource(); + } + + void postUpdateSource() { + // Only schedule a new refresh if not already scheduled + if (isSourceUpToDate.compareAndSet(true, false)) { + mapView.post(new Runnable() { + @Override + public void run() { + internalUpdateSource(); + isSourceUpToDate.set(true); + } + }); + } } void internalUpdateSource() { diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/DraggableAnnotationController.java b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/DraggableAnnotationController.java index 96aff7b7..f395a62c 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/DraggableAnnotationController.java +++ b/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/DraggableAnnotationController.java @@ -142,7 +142,7 @@ boolean onMove(MoveGestureDetector detector) { draggedAnnotation.setGeometry( shiftedGeometry ); - draggedAnnotationManager.internalUpdateSource(); + draggedAnnotationManager.postUpdateSource(); for (OnAnnotationDragListener d : (List) draggedAnnotationManager.getDragListeners()) { d.onAnnotationDrag(draggedAnnotation); } From aaf937e1e14a5ae5da14813e5f053b9c24637d92 Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Mon, 27 Feb 2023 12:28:56 +0100 Subject: [PATCH 39/40] fix merge conflict --- CONTRIBUTING.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2e8ac6b0..bb89e705 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,4 +13,5 @@ If you're interested in building and sharing your own plugin, please follow thes - Tests. - Javadoc that documents the plugin usage and purpose in detail. -- Finally, once you're ready to share your code, list your plugin in this file and then open a PR for other contributors to review. \ No newline at end of file +- Create a new activity inside the demo app that showcases how to use your plugin. As important as having a working plugin is to show how to use it so that anyone can include it in their projects easily. +- Finally, once you're ready to share your code, list your plugin in this file and then open a PR for other contributors to review. From f42f0b5e44787d513ac2333f34356096fcefb40d Mon Sep 17 00:00:00 2001 From: Bart Louwers Date: Tue, 14 May 2024 01:18:01 +0200 Subject: [PATCH 40/40] Reverted commits that modified files other than png or md --- .gitignore | 2 +- LICENSE | 1 - README.md | 4 +-- app/build.gradle | 4 +-- .../mapboxsdk}/plugins/BaseActivityTest.java | 9 +++--- .../mapboxsdk}/plugins/activity.junit.ejs | 6 ++-- .../plugins/annotation/CircleManagerTest.java | 8 +++--- .../plugins/annotation/CircleTest.java | 8 +++--- .../plugins/annotation/FillManagerTest.java | 8 +++--- .../plugins/annotation/FillTest.java | 8 +++--- .../plugins/annotation/LineManagerTest.java | 8 +++--- .../plugins/annotation/LineTest.java | 8 +++--- .../plugins/annotation/MapboxMapAction.java | 2 +- .../plugins/annotation/SymbolManagerTest.java | 8 +++--- .../plugins/annotation/SymbolTest.java | 8 +++--- .../plugins/annotation/WaitAction.java | 2 +- .../plugins/offline/OfflinePluginTest.java | 10 +++---- .../plugins/scalebar/ScaleBarTest.java | 16 +++++------ .../utils/OnMapReadyIdlingResource.java | 6 ++-- app/src/debug/AndroidManifest.xml | 4 +-- .../activity/SingleFragmentActivity.java | 6 ++-- .../plugins/testapp/activity/TestActivity.kt | 4 +-- app/src/main/AndroidManifest.xml | 10 +++---- .../core/permissions/PermissionsListener.java | 2 +- .../core/permissions/PermissionsManager.java | 2 +- .../plugins/testapp/PluginApplication.kt | 2 +- .../mapboxsdk}/plugins/testapp/Utils.kt | 4 +-- .../activity/FeatureOverviewActivity.java | 8 +++--- .../annotation/BulkSymbolActivity.java | 12 ++++---- .../activity/annotation/CircleActivity.java | 16 +++++------ .../annotation/ClusterSymbolActivity.java | 12 ++++---- .../DynamicSymbolChangeActivity.java | 10 +++---- .../activity/annotation/FillActivity.java | 14 +++++----- .../annotation/FillChangeActivity.java | 26 ++++++++--------- .../activity/annotation/LineActivity.java | 14 +++++----- .../annotation/LineChangeActivity.java | 14 +++++----- .../annotation/PressForSymbolActivity.java | 11 ++++---- .../activity/annotation/SymbolActivity.java | 16 +++++------ .../activity/ktx/maps/MapboxKtxActivity.kt | 6 ++-- .../localization/LocalizationActivity.kt | 10 +++---- .../activity/markerview/MarkerViewActivity.kt | 10 +++---- .../offline/OfflineDownloadActivity.kt | 12 ++++---- .../offline/OfflineRegionDetailActivity.kt | 16 +++++------ .../offline/OfflineRegionListActivity.kt | 6 ++-- .../offline/OfflineUiComponentsActivity.kt | 12 ++++---- .../activity/scalebar/ScalebarActivity.kt | 8 +++--- gradle/nitpick.gradle | 6 ++-- .../.gitignore | 0 .../build.gradle | 0 .../gradle.properties | 0 .../proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 2 +- .../mapboxsdk}/plugins/maps/Geometry.kt | 4 +-- .../mapbox/mapboxsdk}/plugins/maps/Maps.kt | 4 +-- .../mapboxsdk}/plugins/maps/GeometryTest.kt | 4 +-- .../org.mockito.plugins.MockMaker | 0 plugin-annotation/README.md | 8 +++--- plugin-annotation/scripts/annotation.java.ejs | 2 +- .../annotation_click_listener.java.ejs | 2 +- .../scripts/annotation_drag_listener.java.ejs | 2 +- .../annotation_element_provider.java.ejs | 4 +-- .../annotation_instrumentation_test.junit.ejs | 14 +++++----- .../annotation_long_click_listener.java.ejs | 2 +- .../scripts/annotation_manager.java.ejs | 2 +- ...ion_manager_instrumentation_test.junit.ejs | 8 +++--- .../annotation_manager_unit_test.junit.ejs | 4 +-- .../scripts/annotation_options.java.ejs | 8 +++--- plugin-annotation/scripts/code-gen.js | 20 ++++++------- .../src/main/AndroidManifest.xml | 2 +- .../plugins/annotation/Annotation.java | 4 +-- .../plugins/annotation/AnnotationManager.java | 22 ++------------- .../mapboxsdk}/plugins/annotation/Circle.java | 2 +- .../annotation/CircleElementProvider.java | 4 +-- .../plugins/annotation/CircleManager.java | 2 +- .../plugins/annotation/CircleOptions.java | 8 +++--- .../plugins/annotation/ClusterOptions.java | 2 +- .../plugins/annotation/ConvertUtils.java | 2 +- .../annotation/CoreElementProvider.java | 2 +- .../DraggableAnnotationController.java | 6 ++-- .../mapboxsdk}/plugins/annotation/Fill.java | 2 +- .../annotation/FillElementProvider.java | 4 +-- .../plugins/annotation/FillManager.java | 2 +- .../plugins/annotation/FillOptions.java | 8 +++--- .../mapboxsdk}/plugins/annotation/Line.java | 2 +- .../annotation/LineElementProvider.java | 4 +-- .../plugins/annotation/LineManager.java | 2 +- .../plugins/annotation/LineOptions.java | 8 +++--- .../annotation/OnAnnotationClickListener.java | 2 +- .../annotation/OnAnnotationDragListener.java | 4 +-- .../OnAnnotationLongClickListener.java | 2 +- .../annotation/OnCircleClickListener.java | 2 +- .../annotation/OnCircleDragListener.java | 2 +- .../annotation/OnCircleLongClickListener.java | 2 +- .../annotation/OnFillClickListener.java | 2 +- .../annotation/OnFillDragListener.java | 2 +- .../annotation/OnFillLongClickListener.java | 2 +- .../annotation/OnLineClickListener.java | 2 +- .../annotation/OnLineDragListener.java | 2 +- .../annotation/OnLineLongClickListener.java | 2 +- .../annotation/OnSymbolClickListener.java | 2 +- .../annotation/OnSymbolDragListener.java | 2 +- .../annotation/OnSymbolLongClickListener.java | 2 +- .../plugins/annotation/Options.java | 2 +- .../mapboxsdk}/plugins/annotation/Symbol.java | 2 +- .../annotation/SymbolElementProvider.java | 2 +- .../plugins/annotation/SymbolManager.java | 2 +- .../plugins/annotation/SymbolOptions.java | 8 +++--- .../plugins/annotation/CircleManagerTest.java | 4 +-- .../DraggableAnnotationControllerTest.java | 2 +- .../plugins/annotation/FillManagerTest.java | 4 +-- .../plugins/annotation/LineManagerTest.java | 4 +-- .../annotation/PropertyValueMatcher.java | 2 +- .../plugins/annotation/SymbolManagerTest.java | 4 +-- plugin-building/README.md | 8 +++--- plugin-building/src/main/AndroidManifest.xml | 2 +- .../plugins/building/BuildingPlugin.java | 6 ++-- .../plugins/building/package-info.java | 6 ++++ .../plugins/building/package-info.java | 6 ---- plugin-localization/README.md | 8 +++--- .../src/main/AndroidManifest.xml | 2 +- .../localization/LocalizationPlugin.java | 4 +-- .../plugins/localization/MapLocale.java | 6 ++-- .../plugins/localization/package-info.java | 6 ++++ .../plugins/localization/package-info.java | 6 ---- .../localization/LocalizationPluginTest.java | 4 +-- .../plugins/localization/MapLocaleTest.java | 2 +- plugin-markerview/README.md | 8 +++--- .../src/main/AndroidManifest.xml | 2 +- .../plugins/markerview/MarkerView.java | 4 +-- .../plugins/markerview/MarkerViewManager.java | 2 +- plugin-offline/README.md | 8 +++--- plugin-offline/src/main/AndroidManifest.xml | 8 +++--- .../offline/OfflinePluginConstants.java | 10 +++++++ .../offline/OfflineRegionSelector.java | 20 ++++++------- .../offline/model/NotificationOptions.java | 4 +-- .../offline/model/OfflineDownloadOptions.java | 6 ++-- .../offline/model/RegionSelectionOptions.java | 4 +-- .../offline/offline/OfflineConstants.java | 28 +++++++++++++++++++ .../OfflineDownloadChangeDispatcher.java | 4 +-- .../OfflineDownloadChangeListener.java | 4 +-- .../offline/OfflineDownloadService.java | 10 +++---- .../offline/OfflineDownloadStateReceiver.java | 6 ++-- .../offline/offline/OfflinePlugin.java | 6 ++-- .../plugins/offline/ui/OfflineActivity.java | 14 +++++----- .../offline/ui/RegionSelectedCallback.java | 2 +- .../offline/ui/RegionSelectionFragment.java | 8 +++--- .../plugins/offline/utils/ColorUtils.java | 2 +- .../offline/utils/NotificationUtils.java | 10 +++---- .../plugins/offline/utils/OfflineUtils.java | 2 +- .../offline/OfflinePluginConstants.java | 10 ------- .../offline/offline/OfflineConstants.java | 28 ------------------- plugin-scalebar/README.md | 8 +++--- plugin-scalebar/src/main/AndroidManifest.xml | 2 +- .../pluginscalebar/ScaleBarConstants.java | 2 +- .../pluginscalebar/ScaleBarOptions.java | 2 +- .../pluginscalebar/ScaleBarPlugin.java | 2 +- .../pluginscalebar/ScaleBarWidget.java | 10 +++---- .../pluginscalebar/ScaleBarPluginTest.kt | 4 +-- scripts/generate-activity-test.js | 8 +++--- settings.gradle | 4 +-- 160 files changed, 474 insertions(+), 489 deletions(-) rename app/src/androidTest/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/BaseActivityTest.java (93%) rename app/src/androidTest/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/activity.junit.ejs (75%) rename app/src/androidTest/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/CircleManagerTest.java (91%) rename app/src/androidTest/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/CircleTest.java (94%) rename app/src/androidTest/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/FillManagerTest.java (89%) rename app/src/androidTest/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/FillTest.java (93%) rename app/src/androidTest/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/LineManagerTest.java (93%) rename app/src/androidTest/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/LineTest.java (94%) rename app/src/androidTest/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/MapboxMapAction.java (96%) rename app/src/androidTest/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/SymbolManagerTest.java (97%) rename app/src/androidTest/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/SymbolTest.java (98%) rename app/src/androidTest/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/WaitAction.java (94%) rename app/src/androidTest/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/offline/OfflinePluginTest.java (83%) rename app/src/androidTest/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/scalebar/ScaleBarTest.java (96%) rename app/src/androidTest/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/utils/OnMapReadyIdlingResource.java (94%) rename app/src/debug/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/testapp/activity/SingleFragmentActivity.java (90%) rename app/src/debug/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/testapp/activity/TestActivity.kt (91%) rename app/src/main/java/{org/maplibre => com/mapbox}/android/core/permissions/PermissionsListener.java (82%) rename app/src/main/java/{org/maplibre => com/mapbox}/android/core/permissions/PermissionsManager.java (99%) rename app/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/testapp/PluginApplication.kt (92%) rename app/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/testapp/Utils.kt (97%) rename app/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/testapp/activity/FeatureOverviewActivity.java (98%) rename app/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/testapp/activity/annotation/BulkSymbolActivity.java (95%) rename app/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/testapp/activity/annotation/CircleActivity.java (92%) rename app/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/testapp/activity/annotation/ClusterSymbolActivity.java (94%) rename app/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/testapp/activity/annotation/DynamicSymbolChangeActivity.java (94%) rename app/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/testapp/activity/annotation/FillActivity.java (94%) rename app/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/testapp/activity/annotation/FillChangeActivity.java (89%) rename app/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/testapp/activity/annotation/LineActivity.java (93%) rename app/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/testapp/activity/annotation/LineChangeActivity.java (95%) rename app/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/testapp/activity/annotation/PressForSymbolActivity.java (93%) rename app/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/testapp/activity/annotation/SymbolActivity.java (96%) rename app/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/testapp/activity/ktx/maps/MapboxKtxActivity.kt (92%) rename app/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/testapp/activity/localization/LocalizationActivity.kt (94%) rename app/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/testapp/activity/markerview/MarkerViewActivity.kt (94%) rename app/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/testapp/activity/offline/OfflineDownloadActivity.kt (94%) rename app/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/testapp/activity/offline/OfflineRegionDetailActivity.kt (94%) rename app/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/testapp/activity/offline/OfflineRegionListActivity.kt (95%) rename app/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt (87%) rename app/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/testapp/activity/scalebar/ScalebarActivity.kt (93%) rename {ktx-maplibre-maps => ktx-mapbox-maps}/.gitignore (100%) rename {ktx-maplibre-maps => ktx-mapbox-maps}/build.gradle (100%) rename {ktx-maplibre-maps => ktx-mapbox-maps}/gradle.properties (100%) rename {ktx-maplibre-maps => ktx-mapbox-maps}/proguard-rules.pro (100%) rename {ktx-maplibre-maps => ktx-mapbox-maps}/src/main/AndroidManifest.xml (55%) rename {ktx-maplibre-maps/src/main/java/org/maplibre/android => ktx-mapbox-maps/src/main/java/com/mapbox/mapboxsdk}/plugins/maps/Geometry.kt (91%) rename {ktx-maplibre-maps/src/main/java/org/maplibre/android => ktx-mapbox-maps/src/main/java/com/mapbox/mapboxsdk}/plugins/maps/Maps.kt (98%) rename {ktx-maplibre-maps/src/test/java/org/maplibre/android => ktx-mapbox-maps/src/test/java/com/mapbox/mapboxsdk}/plugins/maps/GeometryTest.kt (93%) rename {ktx-maplibre-maps => ktx-mapbox-maps}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker (100%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/Annotation.java (98%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/AnnotationManager.java (95%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/Circle.java (99%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/CircleElementProvider.java (96%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/CircleManager.java (99%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/CircleOptions.java (97%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/ClusterOptions.java (99%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/ConvertUtils.java (96%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/CoreElementProvider.java (88%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/DraggableAnnotationController.java (98%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/Fill.java (99%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/FillElementProvider.java (96%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/FillManager.java (99%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/FillOptions.java (97%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/Line.java (99%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/LineElementProvider.java (96%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/LineManager.java (99%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/LineOptions.java (97%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/OnAnnotationClickListener.java (91%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/OnAnnotationDragListener.java (93%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/OnAnnotationLongClickListener.java (91%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/OnCircleClickListener.java (80%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/OnCircleDragListener.java (80%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/OnCircleLongClickListener.java (81%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/OnFillClickListener.java (80%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/OnFillDragListener.java (79%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/OnFillLongClickListener.java (81%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/OnLineClickListener.java (80%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/OnLineDragListener.java (79%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/OnLineLongClickListener.java (81%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/OnSymbolClickListener.java (80%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/OnSymbolDragListener.java (80%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/OnSymbolLongClickListener.java (81%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/Options.java (74%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/Symbol.java (99%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/SymbolElementProvider.java (96%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/SymbolManager.java (99%) rename plugin-annotation/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/SymbolOptions.java (99%) rename plugin-annotation/src/test/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/CircleManagerTest.java (99%) rename plugin-annotation/src/test/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/DraggableAnnotationControllerTest.java (99%) rename plugin-annotation/src/test/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/FillManagerTest.java (99%) rename plugin-annotation/src/test/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/LineManagerTest.java (99%) rename plugin-annotation/src/test/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/PropertyValueMatcher.java (95%) rename plugin-annotation/src/test/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/annotation/SymbolManagerTest.java (99%) rename plugin-building/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/building/BuildingPlugin.java (98%) create mode 100644 plugin-building/src/main/java/com/mapbox/mapboxsdk/plugins/building/package-info.java delete mode 100644 plugin-building/src/main/java/org/maplibre/android/plugins/building/package-info.java rename plugin-localization/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/localization/LocalizationPlugin.java (99%) rename plugin-localization/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/localization/MapLocale.java (98%) create mode 100644 plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/package-info.java delete mode 100644 plugin-localization/src/main/java/org/maplibre/android/plugins/localization/package-info.java rename plugin-localization/src/test/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/localization/LocalizationPluginTest.java (96%) rename plugin-localization/src/test/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/localization/MapLocaleTest.java (96%) rename plugin-markerview/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/markerview/MarkerView.java (97%) rename plugin-markerview/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/markerview/MarkerViewManager.java (98%) create mode 100644 plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/OfflinePluginConstants.java rename plugin-offline/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/offline/OfflineRegionSelector.java (92%) rename plugin-offline/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/offline/model/NotificationOptions.java (94%) rename plugin-offline/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/offline/model/OfflineDownloadOptions.java (97%) rename plugin-offline/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/offline/model/RegionSelectionOptions.java (96%) create mode 100644 plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineConstants.java rename plugin-offline/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/offline/offline/OfflineDownloadChangeDispatcher.java (94%) rename plugin-offline/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/offline/offline/OfflineDownloadChangeListener.java (77%) rename plugin-offline/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/offline/offline/OfflineDownloadService.java (97%) rename plugin-offline/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/offline/offline/OfflineDownloadStateReceiver.java (96%) rename plugin-offline/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/offline/offline/OfflinePlugin.java (97%) rename plugin-offline/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/offline/ui/OfflineActivity.java (84%) rename plugin-offline/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/offline/ui/RegionSelectedCallback.java (80%) rename plugin-offline/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/offline/ui/RegionSelectionFragment.java (97%) rename plugin-offline/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/offline/utils/ColorUtils.java (92%) rename plugin-offline/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/offline/utils/NotificationUtils.java (88%) rename plugin-offline/src/main/java/{org/maplibre/android => com/mapbox/mapboxsdk}/plugins/offline/utils/OfflineUtils.java (96%) delete mode 100644 plugin-offline/src/main/java/org/maplibre/android/plugins/offline/OfflinePluginConstants.java delete mode 100644 plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineConstants.java rename plugin-scalebar/src/main/java/{org/maplibre => com/mapbox}/pluginscalebar/ScaleBarConstants.java (98%) rename plugin-scalebar/src/main/java/{org/maplibre => com/mapbox}/pluginscalebar/ScaleBarOptions.java (99%) rename plugin-scalebar/src/main/java/{org/maplibre => com/mapbox}/pluginscalebar/ScaleBarPlugin.java (99%) rename plugin-scalebar/src/main/java/{org/maplibre => com/mapbox}/pluginscalebar/ScaleBarWidget.java (97%) rename plugin-scalebar/src/test/java/{org/maplibre => com/mapbox}/pluginscalebar/ScaleBarPluginTest.kt (99%) diff --git a/.gitignore b/.gitignore index 464bcc77..f4356780 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,7 @@ build/ ### Code gen activity sanity tests ### /node_modules -app/src/androidTest/java/org/maplibre/android/plugins/gen +app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/gen ### Code gen annotation plugin ### plugin-annotation/scripts/code-gen.list diff --git a/LICENSE b/LICENSE index c269014e..c6211c60 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,4 @@ Copyright (c) 2019, Mapbox -Copyright (c) 2023, MapLibre contributors Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.md b/README.md index 04bc6737..a6be5463 100644 --- a/README.md +++ b/README.md @@ -71,8 +71,8 @@ A plugin is simply a library module built on top of the MapLibre Maps SDK for An ### Test app This repository includes an app with examples showing how you can use each plugin. -- To access ready-to-use snippets, [see its code here](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/org/maplibre/android/plugins/testapp). -- To run the application locally, open the [`PluginApplication`](https://github.com/maplibre/maplibre-plugins-android/blob/4ff768983323cc4a57791bcb577639109e4fd9ce/app/src/main/java/org/maplibre/android/plugins/testapp/PluginApplication.kt) file +- To access ready-to-use snippets, [see its code here](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp). +- To run the application locally, open the [`PluginApplication`](https://github.com/maplibre/maplibre-plugins-android/blob/4ff768983323cc4a57791bcb577639109e4fd9ce/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/PluginApplication.kt) file This might change in the future as we build more plugins and learn how you use them. We'd love to [hear your feedback](https://github.com/maplibre/maplibre-plugins-android/issues). diff --git a/app/build.gradle b/app/build.gradle index 7ee9f5ed..90cdb87a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,7 +9,7 @@ android { defaultConfig { minSdkVersion androidVersions.minSdkVersion targetSdkVersion androidVersions.targetSdkVersion - applicationId "org.maplibre.android.plugins.testapp" + applicationId "com.mapbox.mapboxsdk.plugins.testapp" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true } @@ -111,7 +111,7 @@ dependencies { implementation project(':plugin-localization') implementation project(':plugin-annotation') implementation project(':plugin-markerview') - implementation project(':ktx-maplibre-maps') + implementation project(':ktx-mapbox-maps') implementation project(':plugin-scalebar') } diff --git a/app/src/androidTest/java/org/maplibre/android/plugins/BaseActivityTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/BaseActivityTest.java similarity index 93% rename from app/src/androidTest/java/org/maplibre/android/plugins/BaseActivityTest.java rename to app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/BaseActivityTest.java index 65c9e0cb..39f95d29 100644 --- a/app/src/androidTest/java/org/maplibre/android/plugins/BaseActivityTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/BaseActivityTest.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins; +package com.mapbox.mapboxsdk.plugins; import android.app.Activity; import android.content.Context; @@ -6,9 +6,9 @@ import android.net.NetworkInfo; import com.mapbox.mapboxsdk.maps.MapboxMap; -import org.maplibre.android.plugins.annotation.MapboxMapAction; -import org.maplibre.android.plugins.annotation.WaitAction; -import org.maplibre.android.plugins.utils.OnMapReadyIdlingResource; +import com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction; +import com.mapbox.mapboxsdk.plugins.annotation.WaitAction; +import com.mapbox.mapboxsdk.plugins.utils.OnMapReadyIdlingResource; import junit.framework.Assert; @@ -101,3 +101,4 @@ public void afterTest() { IdlingRegistry.getInstance().unregister(idlingResource); } } + diff --git a/app/src/androidTest/java/org/maplibre/android/plugins/activity.junit.ejs b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/activity.junit.ejs similarity index 75% rename from app/src/androidTest/java/org/maplibre/android/plugins/activity.junit.ejs rename to app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/activity.junit.ejs index 7f73c7ad..25f47339 100644 --- a/app/src/androidTest/java/org/maplibre/android/plugins/activity.junit.ejs +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/activity.junit.ejs @@ -3,12 +3,12 @@ const subPackage = locals[1]; -%> // This file is generated -package org.maplibre.android.plugins.gen.<%- subPackage %>; +package com.mapbox.mapboxsdk.plugins.gen.<%- subPackage %>; import androidx.test.ext.junit.runners.AndroidJUnit4; -import org.maplibre.android.plugins.BaseActivityTest; -import org.maplibre.android.plugins.testapp.activity.<%- subPackage %>.<%- activity %>; +import com.mapbox.mapboxsdk.plugins.BaseActivityTest; +import com.mapbox.mapboxsdk.plugins.testapp.activity.<%- subPackage %>.<%- activity %>; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/app/src/androidTest/java/org/maplibre/android/plugins/annotation/CircleManagerTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManagerTest.java similarity index 91% rename from app/src/androidTest/java/org/maplibre/android/plugins/annotation/CircleManagerTest.java rename to app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManagerTest.java index 46a804f1..e93883a9 100644 --- a/app/src/androidTest/java/org/maplibre/android/plugins/annotation/CircleManagerTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManagerTest.java @@ -1,12 +1,12 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; -import org.maplibre.android.plugins.testapp.activity.TestActivity; -import org.maplibre.android.plugins.BaseActivityTest; +import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; +import com.mapbox.mapboxsdk.plugins.BaseActivityTest; import timber.log.Timber; import org.junit.Test; @@ -14,7 +14,7 @@ import java.util.Objects; -import static org.maplibre.android.plugins.annotation.MapboxMapAction.invoke; +import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke; import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; diff --git a/app/src/androidTest/java/org/maplibre/android/plugins/annotation/CircleTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleTest.java similarity index 94% rename from app/src/androidTest/java/org/maplibre/android/plugins/annotation/CircleTest.java rename to app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleTest.java index 2e44d9d9..170325c9 100644 --- a/app/src/androidTest/java/org/maplibre/android/plugins/annotation/CircleTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/CircleTest.java @@ -1,13 +1,13 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import android.graphics.PointF; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; -import org.maplibre.android.plugins.BaseActivityTest; -import org.maplibre.android.plugins.testapp.activity.TestActivity; +import com.mapbox.mapboxsdk.plugins.BaseActivityTest; +import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; import com.mapbox.mapboxsdk.utils.ColorUtils; import timber.log.Timber; @@ -16,7 +16,7 @@ import java.util.Objects; -import static org.maplibre.android.plugins.annotation.MapboxMapAction.invoke; +import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke; import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; diff --git a/app/src/androidTest/java/org/maplibre/android/plugins/annotation/FillManagerTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillManagerTest.java similarity index 89% rename from app/src/androidTest/java/org/maplibre/android/plugins/annotation/FillManagerTest.java rename to app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillManagerTest.java index a18ebfa3..904157f6 100644 --- a/app/src/androidTest/java/org/maplibre/android/plugins/annotation/FillManagerTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillManagerTest.java @@ -1,12 +1,12 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; -import org.maplibre.android.plugins.testapp.activity.TestActivity; -import org.maplibre.android.plugins.BaseActivityTest; +import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; +import com.mapbox.mapboxsdk.plugins.BaseActivityTest; import timber.log.Timber; import org.junit.Test; @@ -14,7 +14,7 @@ import java.util.Objects; -import static org.maplibre.android.plugins.annotation.MapboxMapAction.invoke; +import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke; import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; diff --git a/app/src/androidTest/java/org/maplibre/android/plugins/annotation/FillTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillTest.java similarity index 93% rename from app/src/androidTest/java/org/maplibre/android/plugins/annotation/FillTest.java rename to app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillTest.java index 5b007aa7..728c2aa8 100644 --- a/app/src/androidTest/java/org/maplibre/android/plugins/annotation/FillTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/FillTest.java @@ -1,13 +1,13 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import android.graphics.PointF; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; -import org.maplibre.android.plugins.BaseActivityTest; -import org.maplibre.android.plugins.testapp.activity.TestActivity; +import com.mapbox.mapboxsdk.plugins.BaseActivityTest; +import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; import com.mapbox.mapboxsdk.utils.ColorUtils; import timber.log.Timber; @@ -16,7 +16,7 @@ import java.util.Objects; -import static org.maplibre.android.plugins.annotation.MapboxMapAction.invoke; +import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke; import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; diff --git a/app/src/androidTest/java/org/maplibre/android/plugins/annotation/LineManagerTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineManagerTest.java similarity index 93% rename from app/src/androidTest/java/org/maplibre/android/plugins/annotation/LineManagerTest.java rename to app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineManagerTest.java index b871bc91..000943f0 100644 --- a/app/src/androidTest/java/org/maplibre/android/plugins/annotation/LineManagerTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineManagerTest.java @@ -1,12 +1,12 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; -import org.maplibre.android.plugins.testapp.activity.TestActivity; -import org.maplibre.android.plugins.BaseActivityTest; +import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; +import com.mapbox.mapboxsdk.plugins.BaseActivityTest; import timber.log.Timber; import org.junit.Test; @@ -14,7 +14,7 @@ import java.util.Objects; -import static org.maplibre.android.plugins.annotation.MapboxMapAction.invoke; +import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke; import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; diff --git a/app/src/androidTest/java/org/maplibre/android/plugins/annotation/LineTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineTest.java similarity index 94% rename from app/src/androidTest/java/org/maplibre/android/plugins/annotation/LineTest.java rename to app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineTest.java index 2608f82a..a926d7f4 100644 --- a/app/src/androidTest/java/org/maplibre/android/plugins/annotation/LineTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/LineTest.java @@ -1,13 +1,13 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import android.graphics.PointF; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; -import org.maplibre.android.plugins.BaseActivityTest; -import org.maplibre.android.plugins.testapp.activity.TestActivity; +import com.mapbox.mapboxsdk.plugins.BaseActivityTest; +import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; import com.mapbox.mapboxsdk.utils.ColorUtils; import timber.log.Timber; @@ -16,7 +16,7 @@ import java.util.Objects; -import static org.maplibre.android.plugins.annotation.MapboxMapAction.invoke; +import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke; import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; diff --git a/app/src/androidTest/java/org/maplibre/android/plugins/annotation/MapboxMapAction.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/MapboxMapAction.java similarity index 96% rename from app/src/androidTest/java/org/maplibre/android/plugins/annotation/MapboxMapAction.java rename to app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/MapboxMapAction.java index e3626527..156b805c 100644 --- a/app/src/androidTest/java/org/maplibre/android/plugins/annotation/MapboxMapAction.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/MapboxMapAction.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import android.view.View; diff --git a/app/src/androidTest/java/org/maplibre/android/plugins/annotation/SymbolManagerTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManagerTest.java similarity index 97% rename from app/src/androidTest/java/org/maplibre/android/plugins/annotation/SymbolManagerTest.java rename to app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManagerTest.java index 8ffabe07..0b5fabf2 100644 --- a/app/src/androidTest/java/org/maplibre/android/plugins/annotation/SymbolManagerTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManagerTest.java @@ -1,12 +1,12 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; -import org.maplibre.android.plugins.testapp.activity.TestActivity; -import org.maplibre.android.plugins.BaseActivityTest; +import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; +import com.mapbox.mapboxsdk.plugins.BaseActivityTest; import timber.log.Timber; import org.junit.Test; @@ -14,7 +14,7 @@ import java.util.Objects; -import static org.maplibre.android.plugins.annotation.MapboxMapAction.invoke; +import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke; import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; diff --git a/app/src/androidTest/java/org/maplibre/android/plugins/annotation/SymbolTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolTest.java similarity index 98% rename from app/src/androidTest/java/org/maplibre/android/plugins/annotation/SymbolTest.java rename to app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolTest.java index 34cb7e07..87eb7684 100644 --- a/app/src/androidTest/java/org/maplibre/android/plugins/annotation/SymbolTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolTest.java @@ -1,13 +1,13 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import android.graphics.PointF; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; -import org.maplibre.android.plugins.BaseActivityTest; -import org.maplibre.android.plugins.testapp.activity.TestActivity; +import com.mapbox.mapboxsdk.plugins.BaseActivityTest; +import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; import com.mapbox.mapboxsdk.utils.ColorUtils; import timber.log.Timber; @@ -16,7 +16,7 @@ import java.util.Objects; -import static org.maplibre.android.plugins.annotation.MapboxMapAction.invoke; +import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke; import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; diff --git a/app/src/androidTest/java/org/maplibre/android/plugins/annotation/WaitAction.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/WaitAction.java similarity index 94% rename from app/src/androidTest/java/org/maplibre/android/plugins/annotation/WaitAction.java rename to app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/WaitAction.java index d7109f31..f8a479c3 100644 --- a/app/src/androidTest/java/org/maplibre/android/plugins/annotation/WaitAction.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/WaitAction.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import android.view.View; diff --git a/app/src/androidTest/java/org/maplibre/android/plugins/offline/OfflinePluginTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/offline/OfflinePluginTest.java similarity index 83% rename from app/src/androidTest/java/org/maplibre/android/plugins/offline/OfflinePluginTest.java rename to app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/offline/OfflinePluginTest.java index b5c43c48..9527436f 100644 --- a/app/src/androidTest/java/org/maplibre/android/plugins/offline/OfflinePluginTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/offline/OfflinePluginTest.java @@ -1,9 +1,9 @@ -package org.maplibre.android.plugins.offline; +package com.mapbox.mapboxsdk.plugins.offline; -import org.maplibre.android.plugins.offline.model.OfflineDownloadOptions; -import org.maplibre.android.plugins.offline.offline.OfflinePlugin; -import org.maplibre.android.plugins.testapp.R; -import org.maplibre.android.plugins.testapp.activity.offline.OfflineDownloadActivity; +import com.mapbox.mapboxsdk.plugins.offline.model.OfflineDownloadOptions; +import com.mapbox.mapboxsdk.plugins.offline.offline.OfflinePlugin; +import com.mapbox.mapboxsdk.plugins.testapp.R; +import com.mapbox.mapboxsdk.plugins.testapp.activity.offline.OfflineDownloadActivity; import org.junit.Before; import org.junit.Ignore; diff --git a/app/src/androidTest/java/org/maplibre/android/plugins/scalebar/ScaleBarTest.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/scalebar/ScaleBarTest.java similarity index 96% rename from app/src/androidTest/java/org/maplibre/android/plugins/scalebar/ScaleBarTest.java rename to app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/scalebar/ScaleBarTest.java index 461d78b8..31b823a4 100644 --- a/app/src/androidTest/java/org/maplibre/android/plugins/scalebar/ScaleBarTest.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/scalebar/ScaleBarTest.java @@ -1,16 +1,16 @@ -package org.maplibre.android.plugins.scalebar; +package com.mapbox.mapboxsdk.plugins.scalebar; import android.app.Activity; import android.view.View; import com.mapbox.mapboxsdk.maps.MapView; -import org.maplibre.android.plugins.BaseActivityTest; -import org.maplibre.android.plugins.testapp.R; -import org.maplibre.android.plugins.testapp.activity.TestActivity; -import org.maplibre.pluginscalebar.ScaleBarOptions; -import org.maplibre.pluginscalebar.ScaleBarPlugin; -import org.maplibre.pluginscalebar.ScaleBarWidget; +import com.mapbox.mapboxsdk.plugins.BaseActivityTest; +import com.mapbox.mapboxsdk.plugins.testapp.R; +import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; +import com.mapbox.pluginscalebar.ScaleBarOptions; +import com.mapbox.pluginscalebar.ScaleBarPlugin; +import com.mapbox.pluginscalebar.ScaleBarWidget; import org.junit.Test; import org.junit.runner.RunWith; @@ -19,7 +19,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import timber.log.Timber; -import static org.maplibre.android.plugins.annotation.MapboxMapAction.invoke; +import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke; import static junit.framework.TestCase.assertFalse; import static junit.framework.TestCase.assertTrue; import static org.junit.Assert.assertEquals; diff --git a/app/src/androidTest/java/org/maplibre/android/plugins/utils/OnMapReadyIdlingResource.java b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/utils/OnMapReadyIdlingResource.java similarity index 94% rename from app/src/androidTest/java/org/maplibre/android/plugins/utils/OnMapReadyIdlingResource.java rename to app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/utils/OnMapReadyIdlingResource.java index 3f606008..95ade81c 100644 --- a/app/src/androidTest/java/org/maplibre/android/plugins/utils/OnMapReadyIdlingResource.java +++ b/app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/utils/OnMapReadyIdlingResource.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.utils; +package com.mapbox.mapboxsdk.plugins.utils; import android.app.Activity; import android.os.Handler; @@ -8,7 +8,7 @@ import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.maps.Style; -import org.maplibre.android.plugins.testapp.R; +import com.mapbox.mapboxsdk.plugins.testapp.R; import androidx.annotation.NonNull; import androidx.test.espresso.IdlingResource; @@ -60,4 +60,4 @@ public void onMapReady(@NonNull MapboxMap mapboxMap) { } }); } -} +} \ No newline at end of file diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml index 416c5ff1..bb3922f6 100644 --- a/app/src/debug/AndroidManifest.xml +++ b/app/src/debug/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.mapbox.mapboxsdk.plugins.testapp"> @@ -16,4 +16,4 @@ android:label="@string/title_activity_test" android:theme="@style/AppTheme.NoActionBar"/> - + \ No newline at end of file diff --git a/app/src/debug/java/org/maplibre/android/plugins/testapp/activity/SingleFragmentActivity.java b/app/src/debug/java/com/mapbox/mapboxsdk/plugins/testapp/activity/SingleFragmentActivity.java similarity index 90% rename from app/src/debug/java/org/maplibre/android/plugins/testapp/activity/SingleFragmentActivity.java rename to app/src/debug/java/com/mapbox/mapboxsdk/plugins/testapp/activity/SingleFragmentActivity.java index 6c30f605..d2e47679 100644 --- a/app/src/debug/java/org/maplibre/android/plugins/testapp/activity/SingleFragmentActivity.java +++ b/app/src/debug/java/com/mapbox/mapboxsdk/plugins/testapp/activity/SingleFragmentActivity.java @@ -1,10 +1,10 @@ -package org.maplibre.android.plugins.testapp.activity; +package com.mapbox.mapboxsdk.plugins.testapp.activity; import android.os.Bundle; import android.view.ViewGroup; import android.widget.FrameLayout; -import org.maplibre.android.plugins.testapp.R; +import com.mapbox.mapboxsdk.plugins.testapp.R; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; @@ -34,4 +34,4 @@ public void replaceFragment(Fragment fragment) { getSupportFragmentManager().beginTransaction() .replace(R.id.container, fragment).commit(); } -} +} \ No newline at end of file diff --git a/app/src/debug/java/org/maplibre/android/plugins/testapp/activity/TestActivity.kt b/app/src/debug/java/com/mapbox/mapboxsdk/plugins/testapp/activity/TestActivity.kt similarity index 91% rename from app/src/debug/java/org/maplibre/android/plugins/testapp/activity/TestActivity.kt rename to app/src/debug/java/com/mapbox/mapboxsdk/plugins/testapp/activity/TestActivity.kt index 72790a28..0cba4bfe 100644 --- a/app/src/debug/java/org/maplibre/android/plugins/testapp/activity/TestActivity.kt +++ b/app/src/debug/java/com/mapbox/mapboxsdk/plugins/testapp/activity/TestActivity.kt @@ -1,9 +1,9 @@ -package org.maplibre.android.plugins.testapp.activity +package com.mapbox.mapboxsdk.plugins.testapp.activity import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.maps.MapView -import org.maplibre.android.plugins.testapp.R +import com.mapbox.mapboxsdk.plugins.testapp.R class TestActivity : AppCompatActivity() { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4b8df386..464e12e6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools" package="com.mapbox.mapboxsdk.plugins.testapp"> @@ -238,13 +238,13 @@ - + - + - + \ No newline at end of file diff --git a/app/src/main/java/org/maplibre/android/core/permissions/PermissionsListener.java b/app/src/main/java/com/mapbox/android/core/permissions/PermissionsListener.java similarity index 82% rename from app/src/main/java/org/maplibre/android/core/permissions/PermissionsListener.java rename to app/src/main/java/com/mapbox/android/core/permissions/PermissionsListener.java index a37c1673..3bde76a2 100644 --- a/app/src/main/java/org/maplibre/android/core/permissions/PermissionsListener.java +++ b/app/src/main/java/com/mapbox/android/core/permissions/PermissionsListener.java @@ -1,4 +1,4 @@ -package org.maplibre.android.core.permissions; +package com.mapbox.android.core.permissions; import java.util.List; diff --git a/app/src/main/java/org/maplibre/android/core/permissions/PermissionsManager.java b/app/src/main/java/com/mapbox/android/core/permissions/PermissionsManager.java similarity index 99% rename from app/src/main/java/org/maplibre/android/core/permissions/PermissionsManager.java rename to app/src/main/java/com/mapbox/android/core/permissions/PermissionsManager.java index ee71e345..94f42f5a 100644 --- a/app/src/main/java/org/maplibre/android/core/permissions/PermissionsManager.java +++ b/app/src/main/java/com/mapbox/android/core/permissions/PermissionsManager.java @@ -1,4 +1,4 @@ -package org.maplibre.android.core.permissions; +package com.mapbox.android.core.permissions; import android.Manifest; import android.app.Activity; diff --git a/app/src/main/java/org/maplibre/android/plugins/testapp/PluginApplication.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/PluginApplication.kt similarity index 92% rename from app/src/main/java/org/maplibre/android/plugins/testapp/PluginApplication.kt rename to app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/PluginApplication.kt index 3bdabf1d..d3bd2c3f 100644 --- a/app/src/main/java/org/maplibre/android/plugins/testapp/PluginApplication.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/PluginApplication.kt @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.testapp +package com.mapbox.mapboxsdk.plugins.testapp import android.app.Application diff --git a/app/src/main/java/org/maplibre/android/plugins/testapp/Utils.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/Utils.kt similarity index 97% rename from app/src/main/java/org/maplibre/android/plugins/testapp/Utils.kt rename to app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/Utils.kt index 657c141d..c57f236e 100644 --- a/app/src/main/java/org/maplibre/android/plugins/testapp/Utils.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/Utils.kt @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.testapp +package com.mapbox.mapboxsdk.plugins.testapp import android.content.Context import android.location.Location @@ -71,4 +71,4 @@ object Utils { } return sb.toString() } -} +} \ No newline at end of file diff --git a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/FeatureOverviewActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/FeatureOverviewActivity.java similarity index 98% rename from app/src/main/java/org/maplibre/android/plugins/testapp/activity/FeatureOverviewActivity.java rename to app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/FeatureOverviewActivity.java index 920fb450..bc1a4fa1 100644 --- a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/FeatureOverviewActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/FeatureOverviewActivity.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.testapp.activity; +package com.mapbox.mapboxsdk.plugins.testapp.activity; import android.content.ComponentName; import android.content.Context; @@ -18,9 +18,9 @@ import android.view.ViewGroup; import android.widget.TextView; import android.widget.Toast; -import org.maplibre.android.core.permissions.PermissionsListener; -import org.maplibre.android.core.permissions.PermissionsManager; -import org.maplibre.android.plugins.testapp.R; +import com.mapbox.android.core.permissions.PermissionsListener; +import com.mapbox.android.core.permissions.PermissionsManager; +import com.mapbox.mapboxsdk.plugins.testapp.R; import androidx.annotation.IdRes; import androidx.annotation.LayoutRes; diff --git a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/BulkSymbolActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/BulkSymbolActivity.java similarity index 95% rename from app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/BulkSymbolActivity.java rename to app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/BulkSymbolActivity.java index f9c366de..5f670f8e 100644 --- a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/BulkSymbolActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/BulkSymbolActivity.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.testapp.activity.annotation; +package com.mapbox.mapboxsdk.plugins.testapp.activity.annotation; import android.app.ProgressDialog; import android.content.Context; @@ -21,11 +21,11 @@ import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.Style; -import org.maplibre.android.plugins.annotation.Symbol; -import org.maplibre.android.plugins.annotation.SymbolManager; -import org.maplibre.android.plugins.annotation.SymbolOptions; -import org.maplibre.android.plugins.testapp.R; -import org.maplibre.android.plugins.testapp.Utils; +import com.mapbox.mapboxsdk.plugins.annotation.Symbol; +import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager; +import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions; +import com.mapbox.mapboxsdk.plugins.testapp.R; +import com.mapbox.mapboxsdk.plugins.testapp.Utils; import timber.log.Timber; diff --git a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/CircleActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/CircleActivity.java similarity index 92% rename from app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/CircleActivity.java rename to app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/CircleActivity.java index 9d9543cc..dfd29c3f 100644 --- a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/CircleActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/CircleActivity.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.testapp.activity.annotation; +package com.mapbox.mapboxsdk.plugins.testapp.activity.annotation; import android.graphics.Color; import android.os.Bundle; @@ -12,12 +12,12 @@ import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.Style; -import org.maplibre.android.plugins.annotation.Circle; -import org.maplibre.android.plugins.annotation.CircleManager; -import org.maplibre.android.plugins.annotation.CircleOptions; -import org.maplibre.android.plugins.annotation.OnCircleDragListener; -import org.maplibre.android.plugins.testapp.R; -import org.maplibre.android.plugins.testapp.Utils; +import com.mapbox.mapboxsdk.plugins.annotation.Circle; +import com.mapbox.mapboxsdk.plugins.annotation.CircleManager; +import com.mapbox.mapboxsdk.plugins.annotation.CircleOptions; +import com.mapbox.mapboxsdk.plugins.annotation.OnCircleDragListener; +import com.mapbox.mapboxsdk.plugins.testapp.R; +import com.mapbox.mapboxsdk.plugins.testapp.Utils; import com.mapbox.mapboxsdk.utils.ColorUtils; import java.io.IOException; @@ -188,4 +188,4 @@ protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); mapView.onSaveInstanceState(outState); } -} +} \ No newline at end of file diff --git a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/ClusterSymbolActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/ClusterSymbolActivity.java similarity index 94% rename from app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/ClusterSymbolActivity.java rename to app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/ClusterSymbolActivity.java index 354c4b4b..16763809 100644 --- a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/ClusterSymbolActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/ClusterSymbolActivity.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.testapp.activity.annotation; +package com.mapbox.mapboxsdk.plugins.testapp.activity.annotation; import android.content.Context; import android.graphics.Color; @@ -16,11 +16,11 @@ import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.Style; -import org.maplibre.android.plugins.annotation.ClusterOptions; -import org.maplibre.android.plugins.annotation.Symbol; -import org.maplibre.android.plugins.annotation.SymbolManager; -import org.maplibre.android.plugins.annotation.SymbolOptions; -import org.maplibre.android.plugins.testapp.R; +import com.mapbox.mapboxsdk.plugins.annotation.ClusterOptions; +import com.mapbox.mapboxsdk.plugins.annotation.Symbol; +import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager; +import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions; +import com.mapbox.mapboxsdk.plugins.testapp.R; import java.io.BufferedReader; import java.io.IOException; diff --git a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/DynamicSymbolChangeActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/DynamicSymbolChangeActivity.java similarity index 94% rename from app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/DynamicSymbolChangeActivity.java rename to app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/DynamicSymbolChangeActivity.java index 24de0e7a..6b2c6cec 100644 --- a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/DynamicSymbolChangeActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/DynamicSymbolChangeActivity.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.testapp.activity.annotation; +package com.mapbox.mapboxsdk.plugins.testapp.activity.annotation; import android.graphics.Bitmap; import android.graphics.Canvas; @@ -13,10 +13,10 @@ import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.Style; -import org.maplibre.android.plugins.annotation.Symbol; -import org.maplibre.android.plugins.annotation.SymbolManager; -import org.maplibre.android.plugins.annotation.SymbolOptions; -import org.maplibre.android.plugins.testapp.R; +import com.mapbox.mapboxsdk.plugins.annotation.Symbol; +import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager; +import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions; +import com.mapbox.mapboxsdk.plugins.testapp.R; import androidx.annotation.DrawableRes; import androidx.appcompat.app.AppCompatActivity; diff --git a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/FillActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillActivity.java similarity index 94% rename from app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/FillActivity.java rename to app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillActivity.java index 2e72735c..9697bb3d 100644 --- a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/FillActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillActivity.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.testapp.activity.annotation; +package com.mapbox.mapboxsdk.plugins.testapp.activity.annotation; import android.graphics.Color; import android.os.Bundle; @@ -13,11 +13,11 @@ import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.Style; -import org.maplibre.android.plugins.annotation.Fill; -import org.maplibre.android.plugins.annotation.FillManager; -import org.maplibre.android.plugins.annotation.FillOptions; -import org.maplibre.android.plugins.testapp.R; -import org.maplibre.android.plugins.testapp.Utils; +import com.mapbox.mapboxsdk.plugins.annotation.Fill; +import com.mapbox.mapboxsdk.plugins.annotation.FillManager; +import com.mapbox.mapboxsdk.plugins.annotation.FillOptions; +import com.mapbox.mapboxsdk.plugins.testapp.R; +import com.mapbox.mapboxsdk.plugins.testapp.Utils; import com.mapbox.mapboxsdk.utils.ColorUtils; import java.io.IOException; @@ -188,4 +188,4 @@ protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); mapView.onSaveInstanceState(outState); } -} +} \ No newline at end of file diff --git a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/FillChangeActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillChangeActivity.java similarity index 89% rename from app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/FillChangeActivity.java rename to app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillChangeActivity.java index 3d603737..9b55ec25 100644 --- a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/FillChangeActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/FillChangeActivity.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.testapp.activity.annotation; +package com.mapbox.mapboxsdk.plugins.testapp.activity.annotation; import android.graphics.Color; import android.os.Bundle; @@ -13,10 +13,10 @@ import com.mapbox.mapboxsdk.maps.MapboxMapOptions; import com.mapbox.mapboxsdk.maps.OnMapReadyCallback; import com.mapbox.mapboxsdk.maps.Style; -import org.maplibre.android.plugins.annotation.Fill; -import org.maplibre.android.plugins.annotation.FillManager; -import org.maplibre.android.plugins.annotation.FillOptions; -import org.maplibre.android.plugins.testapp.R; +import com.mapbox.mapboxsdk.plugins.annotation.Fill; +import com.mapbox.mapboxsdk.plugins.annotation.FillManager; +import com.mapbox.mapboxsdk.plugins.annotation.FillOptions; +import com.mapbox.mapboxsdk.plugins.testapp.R; import com.mapbox.mapboxsdk.utils.ColorUtils; import java.util.ArrayList; @@ -25,14 +25,14 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; -import static org.maplibre.android.plugins.testapp.activity.annotation.FillChangeActivity.Config.BLUE_COLOR; -import static org.maplibre.android.plugins.testapp.activity.annotation.FillChangeActivity.Config.BROKEN_SHAPE_POINTS; -import static org.maplibre.android.plugins.testapp.activity.annotation.FillChangeActivity.Config.FULL_ALPHA; -import static org.maplibre.android.plugins.testapp.activity.annotation.FillChangeActivity.Config.NO_ALPHA; -import static org.maplibre.android.plugins.testapp.activity.annotation.FillChangeActivity.Config.PARTIAL_ALPHA; -import static org.maplibre.android.plugins.testapp.activity.annotation.FillChangeActivity.Config.RED_COLOR; -import static org.maplibre.android.plugins.testapp.activity.annotation.FillChangeActivity.Config.STAR_SHAPE_HOLES; -import static org.maplibre.android.plugins.testapp.activity.annotation.FillChangeActivity.Config.STAR_SHAPE_POINTS; +import static com.mapbox.mapboxsdk.plugins.testapp.activity.annotation.FillChangeActivity.Config.BLUE_COLOR; +import static com.mapbox.mapboxsdk.plugins.testapp.activity.annotation.FillChangeActivity.Config.BROKEN_SHAPE_POINTS; +import static com.mapbox.mapboxsdk.plugins.testapp.activity.annotation.FillChangeActivity.Config.FULL_ALPHA; +import static com.mapbox.mapboxsdk.plugins.testapp.activity.annotation.FillChangeActivity.Config.NO_ALPHA; +import static com.mapbox.mapboxsdk.plugins.testapp.activity.annotation.FillChangeActivity.Config.PARTIAL_ALPHA; +import static com.mapbox.mapboxsdk.plugins.testapp.activity.annotation.FillChangeActivity.Config.RED_COLOR; +import static com.mapbox.mapboxsdk.plugins.testapp.activity.annotation.FillChangeActivity.Config.STAR_SHAPE_HOLES; +import static com.mapbox.mapboxsdk.plugins.testapp.activity.annotation.FillChangeActivity.Config.STAR_SHAPE_POINTS; /** * Test activity to showcase the Polygon annotation API & programmatically creating a MapView. diff --git a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/LineActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineActivity.java similarity index 93% rename from app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/LineActivity.java rename to app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineActivity.java index e288fcd7..c05230f6 100644 --- a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/LineActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineActivity.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.testapp.activity.annotation; +package com.mapbox.mapboxsdk.plugins.testapp.activity.annotation; import android.graphics.Color; import android.os.Bundle; @@ -10,11 +10,11 @@ import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.Style; -import org.maplibre.android.plugins.annotation.Line; -import org.maplibre.android.plugins.annotation.LineManager; -import org.maplibre.android.plugins.annotation.LineOptions; -import org.maplibre.android.plugins.testapp.R; -import org.maplibre.android.plugins.testapp.Utils; +import com.mapbox.mapboxsdk.plugins.annotation.Line; +import com.mapbox.mapboxsdk.plugins.annotation.LineManager; +import com.mapbox.mapboxsdk.plugins.annotation.LineOptions; +import com.mapbox.mapboxsdk.plugins.testapp.R; +import com.mapbox.mapboxsdk.plugins.testapp.Utils; import com.mapbox.mapboxsdk.utils.ColorUtils; import java.io.IOException; @@ -166,4 +166,4 @@ protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); mapView.onSaveInstanceState(outState); } -} +} \ No newline at end of file diff --git a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/LineChangeActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineChangeActivity.java similarity index 95% rename from app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/LineChangeActivity.java rename to app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineChangeActivity.java index c4b92e35..9e27aec4 100644 --- a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/LineChangeActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/LineChangeActivity.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.testapp.activity.annotation; +package com.mapbox.mapboxsdk.plugins.testapp.activity.annotation; import android.graphics.Color; import android.os.Bundle; @@ -12,11 +12,11 @@ import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.Style; -import org.maplibre.android.plugins.annotation.Line; -import org.maplibre.android.plugins.annotation.LineManager; -import org.maplibre.android.plugins.annotation.LineOptions; -import org.maplibre.android.plugins.testapp.R; -import org.maplibre.android.plugins.testapp.Utils; +import com.mapbox.mapboxsdk.plugins.annotation.Line; +import com.mapbox.mapboxsdk.plugins.annotation.LineManager; +import com.mapbox.mapboxsdk.plugins.annotation.LineOptions; +import com.mapbox.mapboxsdk.plugins.testapp.R; +import com.mapbox.mapboxsdk.plugins.testapp.Utils; import com.mapbox.mapboxsdk.utils.ColorUtils; import java.util.ArrayList; @@ -227,4 +227,4 @@ public boolean onOptionsItemSelected(MenuItem item) { lineManager.update(lines); return true; } -} +} \ No newline at end of file diff --git a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/PressForSymbolActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/PressForSymbolActivity.java similarity index 93% rename from app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/PressForSymbolActivity.java rename to app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/PressForSymbolActivity.java index 94ea3b84..b115105b 100644 --- a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/PressForSymbolActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/PressForSymbolActivity.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.testapp.activity.annotation; +package com.mapbox.mapboxsdk.plugins.testapp.activity.annotation; import android.graphics.Bitmap; import android.graphics.Canvas; @@ -10,10 +10,10 @@ import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.Style; -import org.maplibre.android.plugins.annotation.SymbolManager; -import org.maplibre.android.plugins.annotation.SymbolOptions; -import org.maplibre.android.plugins.testapp.R; -import org.maplibre.android.plugins.testapp.Utils; +import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager; +import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions; +import com.mapbox.mapboxsdk.plugins.testapp.R; +import com.mapbox.mapboxsdk.plugins.testapp.Utils; import com.mapbox.mapboxsdk.style.layers.Property; import androidx.annotation.DrawableRes; @@ -152,3 +152,4 @@ static Bitmap getBitmapFromDrawable(Drawable drawable) { } } } + diff --git a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/SymbolActivity.java b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/SymbolActivity.java similarity index 96% rename from app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/SymbolActivity.java rename to app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/SymbolActivity.java index 522d68bc..6421996f 100644 --- a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation/SymbolActivity.java +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation/SymbolActivity.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.testapp.activity.annotation; +package com.mapbox.mapboxsdk.plugins.testapp.activity.annotation; import android.animation.ValueAnimator; import android.graphics.Color; @@ -17,12 +17,12 @@ import com.mapbox.mapboxsdk.geometry.LatLng; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.Style; -import org.maplibre.android.plugins.annotation.OnSymbolDragListener; -import org.maplibre.android.plugins.annotation.Symbol; -import org.maplibre.android.plugins.annotation.SymbolManager; -import org.maplibre.android.plugins.annotation.SymbolOptions; -import org.maplibre.android.plugins.testapp.R; -import org.maplibre.android.plugins.testapp.Utils; +import com.mapbox.mapboxsdk.plugins.annotation.OnSymbolDragListener; +import com.mapbox.mapboxsdk.plugins.annotation.Symbol; +import com.mapbox.mapboxsdk.plugins.annotation.SymbolManager; +import com.mapbox.mapboxsdk.plugins.annotation.SymbolOptions; +import com.mapbox.mapboxsdk.plugins.testapp.R; +import com.mapbox.mapboxsdk.plugins.testapp.Utils; import com.mapbox.mapboxsdk.style.expressions.Expression; import com.mapbox.mapboxsdk.style.layers.Property; import com.mapbox.mapboxsdk.style.sources.GeoJsonOptions; @@ -316,4 +316,4 @@ protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); mapView.onSaveInstanceState(outState); } -} +} \ No newline at end of file diff --git a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/ktx/maps/MapboxKtxActivity.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/ktx/maps/MapboxKtxActivity.kt similarity index 92% rename from app/src/main/java/org/maplibre/android/plugins/testapp/activity/ktx/maps/MapboxKtxActivity.kt rename to app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/ktx/maps/MapboxKtxActivity.kt index 31c2d136..fa30ae10 100644 --- a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/ktx/maps/MapboxKtxActivity.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/ktx/maps/MapboxKtxActivity.kt @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.testapp.activity.ktx.maps +package com.mapbox.mapboxsdk.plugins.testapp.activity.ktx.maps import android.os.Bundle import android.widget.Toast @@ -7,8 +7,8 @@ import com.mapbox.mapboxsdk.geometry.LatLng import com.mapbox.mapboxsdk.maps.MapboxMap import com.mapbox.mapboxsdk.maps.OnMapReadyCallback import com.mapbox.mapboxsdk.maps.Style -import org.maplibre.android.plugins.maps.queryRenderedFeatures -import org.maplibre.android.plugins.testapp.R +import com.mapbox.mapboxsdk.plugins.maps.queryRenderedFeatures +import com.mapbox.mapboxsdk.plugins.testapp.R import kotlinx.android.synthetic.main.activity_maps_ktx.* class MapboxKtxActivity : AppCompatActivity(), OnMapReadyCallback, MapboxMap.OnMapClickListener { diff --git a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/localization/LocalizationActivity.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/localization/LocalizationActivity.kt similarity index 94% rename from app/src/main/java/org/maplibre/android/plugins/testapp/activity/localization/LocalizationActivity.kt rename to app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/localization/LocalizationActivity.kt index e9f2762f..29bb2ce3 100644 --- a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/localization/LocalizationActivity.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/localization/LocalizationActivity.kt @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.testapp.activity.localization +package com.mapbox.mapboxsdk.plugins.testapp.activity.localization import android.os.Bundle import android.view.Menu @@ -8,10 +8,10 @@ import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.maps.MapboxMap import com.mapbox.mapboxsdk.maps.OnMapReadyCallback import com.mapbox.mapboxsdk.maps.Style -import org.maplibre.android.plugins.localization.LocalizationPlugin -import org.maplibre.android.plugins.localization.MapLocale -import org.maplibre.android.plugins.testapp.R -import org.maplibre.android.plugins.testapp.Utils +import com.mapbox.mapboxsdk.plugins.localization.LocalizationPlugin +import com.mapbox.mapboxsdk.plugins.localization.MapLocale +import com.mapbox.mapboxsdk.plugins.testapp.R +import com.mapbox.mapboxsdk.plugins.testapp.Utils import kotlinx.android.synthetic.main.activity_localization.* class LocalizationActivity : AppCompatActivity(), OnMapReadyCallback { diff --git a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/markerview/MarkerViewActivity.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/markerview/MarkerViewActivity.kt similarity index 94% rename from app/src/main/java/org/maplibre/android/plugins/testapp/activity/markerview/MarkerViewActivity.kt rename to app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/markerview/MarkerViewActivity.kt index 750a52fe..668c7219 100644 --- a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/markerview/MarkerViewActivity.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/markerview/MarkerViewActivity.kt @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.testapp.activity.markerview +package com.mapbox.mapboxsdk.plugins.testapp.activity.markerview import android.animation.ValueAnimator import android.os.Bundle @@ -10,16 +10,16 @@ import android.widget.ImageView import com.mapbox.mapboxsdk.camera.CameraUpdateFactory import com.mapbox.mapboxsdk.geometry.LatLng import com.mapbox.mapboxsdk.maps.MapboxMap -import org.maplibre.android.plugins.markerview.MarkerView -import org.maplibre.android.plugins.markerview.MarkerViewManager -import org.maplibre.android.plugins.testapp.R +import com.mapbox.mapboxsdk.plugins.markerview.MarkerView +import com.mapbox.mapboxsdk.plugins.markerview.MarkerViewManager +import com.mapbox.mapboxsdk.plugins.testapp.R import java.util.Random import android.view.ViewGroup.LayoutParams.WRAP_CONTENT import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.maps.Style -import org.maplibre.android.plugins.testapp.Utils +import com.mapbox.mapboxsdk.plugins.testapp.Utils import kotlinx.android.synthetic.main.activity_annotation.* class MarkerViewActivity : AppCompatActivity(), MapboxMap.OnMapLongClickListener, MapboxMap.OnMapClickListener { diff --git a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineDownloadActivity.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineDownloadActivity.kt similarity index 94% rename from app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineDownloadActivity.kt rename to app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineDownloadActivity.kt index d27cd3a1..fdc1be18 100644 --- a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineDownloadActivity.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineDownloadActivity.kt @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.testapp.activity.offline +package com.mapbox.mapboxsdk.plugins.testapp.activity.offline import android.os.Bundle import android.widget.ArrayAdapter @@ -11,11 +11,11 @@ import com.mapbox.mapboxsdk.geometry.LatLng import com.mapbox.mapboxsdk.geometry.LatLngBounds import com.mapbox.mapboxsdk.maps.Style import com.mapbox.mapboxsdk.offline.OfflineTilePyramidRegionDefinition -import org.maplibre.android.plugins.offline.offline.OfflinePlugin -import org.maplibre.android.plugins.offline.model.NotificationOptions -import org.maplibre.android.plugins.offline.model.OfflineDownloadOptions -import org.maplibre.android.plugins.offline.utils.OfflineUtils -import org.maplibre.android.plugins.testapp.R +import com.mapbox.mapboxsdk.plugins.offline.offline.OfflinePlugin +import com.mapbox.mapboxsdk.plugins.offline.model.NotificationOptions +import com.mapbox.mapboxsdk.plugins.offline.model.OfflineDownloadOptions +import com.mapbox.mapboxsdk.plugins.offline.utils.OfflineUtils +import com.mapbox.mapboxsdk.plugins.testapp.R import java.util.ArrayList diff --git a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineRegionDetailActivity.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineRegionDetailActivity.kt similarity index 94% rename from app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineRegionDetailActivity.kt rename to app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineRegionDetailActivity.kt index d3123f56..eb8fae21 100644 --- a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineRegionDetailActivity.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineRegionDetailActivity.kt @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.testapp.activity.offline +package com.mapbox.mapboxsdk.plugins.testapp.activity.offline import android.os.Bundle import android.view.View @@ -8,12 +8,12 @@ import com.mapbox.mapboxsdk.offline.OfflineManager import com.mapbox.mapboxsdk.offline.OfflineRegion import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition import com.mapbox.mapboxsdk.offline.OfflineRegionStatus -import org.maplibre.android.plugins.offline.model.OfflineDownloadOptions -import org.maplibre.android.plugins.offline.offline.OfflineConstants.KEY_BUNDLE -import org.maplibre.android.plugins.offline.offline.OfflineDownloadChangeListener -import org.maplibre.android.plugins.offline.offline.OfflinePlugin -import org.maplibre.android.plugins.offline.utils.OfflineUtils -import org.maplibre.android.plugins.testapp.R +import com.mapbox.mapboxsdk.plugins.offline.model.OfflineDownloadOptions +import com.mapbox.mapboxsdk.plugins.offline.offline.OfflineConstants.KEY_BUNDLE +import com.mapbox.mapboxsdk.plugins.offline.offline.OfflineDownloadChangeListener +import com.mapbox.mapboxsdk.plugins.offline.offline.OfflinePlugin +import com.mapbox.mapboxsdk.plugins.offline.utils.OfflineUtils +import com.mapbox.mapboxsdk.plugins.testapp.R import kotlinx.android.synthetic.main.activity_offline_region_detail.* import timber.log.Timber @@ -241,6 +241,6 @@ class OfflineRegionDetailActivity : AppCompatActivity(), OfflineDownloadChangeLi companion object { - val KEY_REGION_ID_BUNDLE = "org.maplibre.android.plugins.offline.bundle.id" + val KEY_REGION_ID_BUNDLE = "com.mapbox.mapboxsdk.plugins.offline.bundle.id" } } \ No newline at end of file diff --git a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineRegionListActivity.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineRegionListActivity.kt similarity index 95% rename from app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineRegionListActivity.kt rename to app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineRegionListActivity.kt index 0d4b95fe..916c9ece 100644 --- a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineRegionListActivity.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineRegionListActivity.kt @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.testapp.activity.offline +package com.mapbox.mapboxsdk.plugins.testapp.activity.offline import android.content.Intent import android.os.Bundle @@ -10,8 +10,8 @@ import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.offline.OfflineManager import com.mapbox.mapboxsdk.offline.OfflineRegion import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition -import org.maplibre.android.plugins.offline.utils.OfflineUtils -import org.maplibre.android.plugins.testapp.R +import com.mapbox.mapboxsdk.plugins.offline.utils.OfflineUtils +import com.mapbox.mapboxsdk.plugins.testapp.R import java.util.* /** diff --git a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt similarity index 87% rename from app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt rename to app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt index 40834e87..376ae52a 100644 --- a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline/OfflineUiComponentsActivity.kt @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.testapp.activity.offline +package com.mapbox.mapboxsdk.plugins.testapp.activity.offline import android.app.Activity import android.content.Intent @@ -8,11 +8,11 @@ import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.camera.CameraPosition import com.mapbox.mapboxsdk.geometry.LatLng -import org.maplibre.android.plugins.offline.OfflineRegionSelector -import org.maplibre.android.plugins.offline.model.NotificationOptions -import org.maplibre.android.plugins.offline.model.RegionSelectionOptions -import org.maplibre.android.plugins.offline.offline.OfflinePlugin -import org.maplibre.android.plugins.testapp.R +import com.mapbox.mapboxsdk.plugins.offline.OfflineRegionSelector +import com.mapbox.mapboxsdk.plugins.offline.model.NotificationOptions +import com.mapbox.mapboxsdk.plugins.offline.model.RegionSelectionOptions +import com.mapbox.mapboxsdk.plugins.offline.offline.OfflinePlugin +import com.mapbox.mapboxsdk.plugins.testapp.R import java.util.Locale diff --git a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/scalebar/ScalebarActivity.kt b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/scalebar/ScalebarActivity.kt similarity index 93% rename from app/src/main/java/org/maplibre/android/plugins/testapp/activity/scalebar/ScalebarActivity.kt rename to app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/scalebar/ScalebarActivity.kt index f593fbf7..a0746319 100644 --- a/app/src/main/java/org/maplibre/android/plugins/testapp/activity/scalebar/ScalebarActivity.kt +++ b/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/scalebar/ScalebarActivity.kt @@ -1,13 +1,13 @@ -package org.maplibre.android.plugins.testapp.activity.scalebar +package com.mapbox.mapboxsdk.plugins.testapp.activity.scalebar import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import com.mapbox.mapboxsdk.maps.MapboxMap import com.mapbox.turf.TurfMeasurement import com.mapbox.mapboxsdk.maps.Style -import org.maplibre.android.plugins.testapp.R -import org.maplibre.pluginscalebar.ScaleBarOptions -import org.maplibre.pluginscalebar.ScaleBarPlugin +import com.mapbox.mapboxsdk.plugins.testapp.R +import com.mapbox.pluginscalebar.ScaleBarOptions +import com.mapbox.pluginscalebar.ScaleBarPlugin import kotlinx.android.synthetic.main.activity_scalebar.* import com.mapbox.geojson.LineString diff --git a/gradle/nitpick.gradle b/gradle/nitpick.gradle index 65aa9b2c..a31f349f 100644 --- a/gradle/nitpick.gradle +++ b/gradle/nitpick.gradle @@ -13,9 +13,9 @@ private def verifyAnnotationCodeGeneration() { workingDir = "${rootDir}" commandLine "make", "generate-annotation-code" } - checkDirectoryForChanges("app/src/androidTest/java/org/maplibre/android/plugins/annotation") - checkDirectoryForChanges("plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation") - checkDirectoryForChanges("plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation") + checkDirectoryForChanges("app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation") + checkDirectoryForChanges("plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation") + checkDirectoryForChanges("plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation") } private checkDirectoryForChanges(dir) { diff --git a/ktx-maplibre-maps/.gitignore b/ktx-mapbox-maps/.gitignore similarity index 100% rename from ktx-maplibre-maps/.gitignore rename to ktx-mapbox-maps/.gitignore diff --git a/ktx-maplibre-maps/build.gradle b/ktx-mapbox-maps/build.gradle similarity index 100% rename from ktx-maplibre-maps/build.gradle rename to ktx-mapbox-maps/build.gradle diff --git a/ktx-maplibre-maps/gradle.properties b/ktx-mapbox-maps/gradle.properties similarity index 100% rename from ktx-maplibre-maps/gradle.properties rename to ktx-mapbox-maps/gradle.properties diff --git a/ktx-maplibre-maps/proguard-rules.pro b/ktx-mapbox-maps/proguard-rules.pro similarity index 100% rename from ktx-maplibre-maps/proguard-rules.pro rename to ktx-mapbox-maps/proguard-rules.pro diff --git a/ktx-maplibre-maps/src/main/AndroidManifest.xml b/ktx-mapbox-maps/src/main/AndroidManifest.xml similarity index 55% rename from ktx-maplibre-maps/src/main/AndroidManifest.xml rename to ktx-mapbox-maps/src/main/AndroidManifest.xml index 997d4dc6..f003536f 100644 --- a/ktx-maplibre-maps/src/main/AndroidManifest.xml +++ b/ktx-mapbox-maps/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ + package="com.mapbox.mapboxsdk.plugins.maps"/> diff --git a/ktx-maplibre-maps/src/main/java/org/maplibre/android/plugins/maps/Geometry.kt b/ktx-mapbox-maps/src/main/java/com/mapbox/mapboxsdk/plugins/maps/Geometry.kt similarity index 91% rename from ktx-maplibre-maps/src/main/java/org/maplibre/android/plugins/maps/Geometry.kt rename to ktx-mapbox-maps/src/main/java/com/mapbox/mapboxsdk/plugins/maps/Geometry.kt index 22d7d841..b207551a 100644 --- a/ktx-maplibre-maps/src/main/java/org/maplibre/android/plugins/maps/Geometry.kt +++ b/ktx-mapbox-maps/src/main/java/com/mapbox/mapboxsdk/plugins/maps/Geometry.kt @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.maps +package com.mapbox.mapboxsdk.plugins.maps import com.mapbox.geojson.Point import com.mapbox.mapboxsdk.geometry.LatLng @@ -19,4 +19,4 @@ inline fun LatLng.toPoint(): Point { */ inline fun Point.toLatLng(): LatLng { return LatLng(this.latitude(), this.longitude()) -} +} \ No newline at end of file diff --git a/ktx-maplibre-maps/src/main/java/org/maplibre/android/plugins/maps/Maps.kt b/ktx-mapbox-maps/src/main/java/com/mapbox/mapboxsdk/plugins/maps/Maps.kt similarity index 98% rename from ktx-maplibre-maps/src/main/java/org/maplibre/android/plugins/maps/Maps.kt rename to ktx-mapbox-maps/src/main/java/com/mapbox/mapboxsdk/plugins/maps/Maps.kt index b3c14058..4469e785 100644 --- a/ktx-maplibre-maps/src/main/java/org/maplibre/android/plugins/maps/Maps.kt +++ b/ktx-mapbox-maps/src/main/java/com/mapbox/mapboxsdk/plugins/maps/Maps.kt @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.maps +package com.mapbox.mapboxsdk.plugins.maps import android.graphics.RectF import com.mapbox.geojson.Feature @@ -59,4 +59,4 @@ inline fun MapboxMap.queryRenderedFeatures(latLngBounds: LatLngBounds, val bottomLeft = this.projection.toScreenLocation(latLngBounds.southWest) val rectF = RectF(bottomLeft.x, topRight.y, topRight.x, bottomLeft.y) return this.queryRenderedFeatures(rectF, filter, *layerIds) -} +} \ No newline at end of file diff --git a/ktx-maplibre-maps/src/test/java/org/maplibre/android/plugins/maps/GeometryTest.kt b/ktx-mapbox-maps/src/test/java/com/mapbox/mapboxsdk/plugins/maps/GeometryTest.kt similarity index 93% rename from ktx-maplibre-maps/src/test/java/org/maplibre/android/plugins/maps/GeometryTest.kt rename to ktx-mapbox-maps/src/test/java/com/mapbox/mapboxsdk/plugins/maps/GeometryTest.kt index 06ae04e8..17c5b54b 100644 --- a/ktx-maplibre-maps/src/test/java/org/maplibre/android/plugins/maps/GeometryTest.kt +++ b/ktx-mapbox-maps/src/test/java/com/mapbox/mapboxsdk/plugins/maps/GeometryTest.kt @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.maps +package com.mapbox.mapboxsdk.plugins.maps import com.mapbox.geojson.Point import com.mapbox.mapboxsdk.geometry.LatLng @@ -23,4 +23,4 @@ class GeometryTest { val point = Point.fromLngLat(10.0, 25.0) Assert.assertEquals("LatLng should match", expectedLatLng, point.toLatLng()) } -} +} \ No newline at end of file diff --git a/ktx-maplibre-maps/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/ktx-mapbox-maps/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker similarity index 100% rename from ktx-maplibre-maps/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker rename to ktx-mapbox-maps/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker diff --git a/plugin-annotation/README.md b/plugin-annotation/README.md index 19fbb114..9cf867a9 100644 --- a/plugin-annotation/README.md +++ b/plugin-annotation/README.md @@ -31,7 +31,7 @@ android { } dependencies { - implementation 'org.maplibre.android:maplibre-android-plugin-annotation-v9:0.9.0' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-annotation-v9:0.9.0' } ``` @@ -48,17 +48,17 @@ repositories { // In the app build.gradle file dependencies { - implementation 'org.maplibre.android:maplibre-android-plugin-annotation-v9:0.10.0-SNAPSHOT' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-annotation-v9:0.10.0-SNAPSHOT' } ``` ## Annotation plugin examples -- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity/annotation) +- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/annotation) ## Help and Usage -This repository includes an app that shows how to use each plugin in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity) for ready-to-use snippets. +This repository includes an app that shows how to use each plugin in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. We'd love to [hear your feedback](https://github.com/maplibre/maplibre-plugins-android/issues) as we build more plugins and learn how you use them. diff --git a/plugin-annotation/scripts/annotation.java.ejs b/plugin-annotation/scripts/annotation.java.ejs index 09f66cea..b744656a 100644 --- a/plugin-annotation/scripts/annotation.java.ejs +++ b/plugin-annotation/scripts/annotation.java.ejs @@ -5,7 +5,7 @@ -%> // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.annotation.ColorInt; import androidx.annotation.NonNull; diff --git a/plugin-annotation/scripts/annotation_click_listener.java.ejs b/plugin-annotation/scripts/annotation_click_listener.java.ejs index 7c9c94dd..47a78839 100644 --- a/plugin-annotation/scripts/annotation_click_listener.java.ejs +++ b/plugin-annotation/scripts/annotation_click_listener.java.ejs @@ -5,7 +5,7 @@ -%> // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; /** * Interface definition for a callback to be invoked when a <%- type %> has been clicked. diff --git a/plugin-annotation/scripts/annotation_drag_listener.java.ejs b/plugin-annotation/scripts/annotation_drag_listener.java.ejs index 52b37e80..4efdc955 100644 --- a/plugin-annotation/scripts/annotation_drag_listener.java.ejs +++ b/plugin-annotation/scripts/annotation_drag_listener.java.ejs @@ -5,7 +5,7 @@ -%> // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; /** * Interface definition for a callback to be invoked when a <%- type %> is dragged. diff --git a/plugin-annotation/scripts/annotation_element_provider.java.ejs b/plugin-annotation/scripts/annotation_element_provider.java.ejs index d4d6a7e7..1c4d38b1 100644 --- a/plugin-annotation/scripts/annotation_element_provider.java.ejs +++ b/plugin-annotation/scripts/annotation_element_provider.java.ejs @@ -5,7 +5,7 @@ -%> // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.annotation.Nullable; import com.mapbox.mapboxsdk.style.layers.<%- camelize(type) %>Layer; @@ -51,4 +51,4 @@ class <%- camelize(type) %>ElementProvider implements CoreElementProvider<<%- ca public GeoJsonSource getSource(@Nullable GeoJsonOptions geoJsonOptions) { return new GeoJsonSource(sourceId, geoJsonOptions); } -} +} \ No newline at end of file diff --git a/plugin-annotation/scripts/annotation_instrumentation_test.junit.ejs b/plugin-annotation/scripts/annotation_instrumentation_test.junit.ejs index 54216f91..d2e5e645 100644 --- a/plugin-annotation/scripts/annotation_instrumentation_test.junit.ejs +++ b/plugin-annotation/scripts/annotation_instrumentation_test.junit.ejs @@ -4,15 +4,15 @@ -%> // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import android.graphics.PointF; import androidx.test.ext.junit.runners.AndroidJUnit4; -import org.maplibre.android.geometry.LatLng; -import org.maplibre.android.plugins.BaseActivityTest; -import org.maplibre.android.plugins.testapp.activity.TestActivity; -import org.maplibre.android.utils.ColorUtils; +import com.mapbox.mapboxsdk.geometry.LatLng; +import com.mapbox.mapboxsdk.plugins.BaseActivityTest; +import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; +import com.mapbox.mapboxsdk.utils.ColorUtils; import timber.log.Timber; import org.junit.Test; @@ -20,9 +20,9 @@ import org.junit.runner.RunWith; import java.util.Objects; -import static org.maplibre.android.plugins.annotation.MapboxMapAction.invoke; +import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke; import static org.junit.Assert.*; -import static org.maplibre.android.style.layers.Property.*; +import static com.mapbox.mapboxsdk.style.layers.Property.*; import java.util.ArrayList; import java.util.List; diff --git a/plugin-annotation/scripts/annotation_long_click_listener.java.ejs b/plugin-annotation/scripts/annotation_long_click_listener.java.ejs index ec90c522..29f1eb1d 100644 --- a/plugin-annotation/scripts/annotation_long_click_listener.java.ejs +++ b/plugin-annotation/scripts/annotation_long_click_listener.java.ejs @@ -5,7 +5,7 @@ -%> // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; /** * Interface definition for a callback to be invoked when a <%- type %> has been long clicked. diff --git a/plugin-annotation/scripts/annotation_manager.java.ejs b/plugin-annotation/scripts/annotation_manager.java.ejs index 66e93fc5..6a7dc3c8 100644 --- a/plugin-annotation/scripts/annotation_manager.java.ejs +++ b/plugin-annotation/scripts/annotation_manager.java.ejs @@ -5,7 +5,7 @@ -%> // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/plugin-annotation/scripts/annotation_manager_instrumentation_test.junit.ejs b/plugin-annotation/scripts/annotation_manager_instrumentation_test.junit.ejs index bcce547e..5355a108 100644 --- a/plugin-annotation/scripts/annotation_manager_instrumentation_test.junit.ejs +++ b/plugin-annotation/scripts/annotation_manager_instrumentation_test.junit.ejs @@ -4,13 +4,13 @@ -%> // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.mapbox.mapboxsdk.geometry.LatLng; -import org.maplibre.android.plugins.testapp.activity.TestActivity; -import org.maplibre.android.plugins.BaseActivityTest; +import com.mapbox.mapboxsdk.plugins.testapp.activity.TestActivity; +import com.mapbox.mapboxsdk.plugins.BaseActivityTest; import timber.log.Timber; import org.junit.Test; @@ -18,7 +18,7 @@ import org.junit.runner.RunWith; import java.util.Objects; -import static org.maplibre.android.plugins.annotation.MapboxMapAction.invoke; +import static com.mapbox.mapboxsdk.plugins.annotation.MapboxMapAction.invoke; import static org.junit.Assert.*; import static com.mapbox.mapboxsdk.style.layers.Property.*; diff --git a/plugin-annotation/scripts/annotation_manager_unit_test.junit.ejs b/plugin-annotation/scripts/annotation_manager_unit_test.junit.ejs index 94e7e944..4102199e 100644 --- a/plugin-annotation/scripts/annotation_manager_unit_test.junit.ejs +++ b/plugin-annotation/scripts/annotation_manager_unit_test.junit.ejs @@ -5,7 +5,7 @@ -%> // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import com.google.gson.JsonPrimitive; import com.mapbox.geojson.*; @@ -27,7 +27,7 @@ import java.util.List; import java.util.Arrays; import android.graphics.PointF; -import static org.maplibre.android.plugins.annotation.ConvertUtils.convertArray; +import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.convertArray; import static com.mapbox.mapboxsdk.style.expressions.Expression.get; import static com.mapbox.mapboxsdk.style.layers.Property.*; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; diff --git a/plugin-annotation/scripts/annotation_options.java.ejs b/plugin-annotation/scripts/annotation_options.java.ejs index b3abd0ed..0391b26a 100644 --- a/plugin-annotation/scripts/annotation_options.java.ejs +++ b/plugin-annotation/scripts/annotation_options.java.ejs @@ -5,7 +5,7 @@ -%> // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -21,9 +21,9 @@ import com.mapbox.mapboxsdk.geometry.LatLng; import java.util.ArrayList; import java.util.List; -import static org.maplibre.android.plugins.annotation.ConvertUtils.convertArray; -import static org.maplibre.android.plugins.annotation.ConvertUtils.toFloatArray; -import static org.maplibre.android.plugins.annotation.ConvertUtils.toStringArray; +import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.convertArray; +import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.toFloatArray; +import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.toStringArray; /** * Builder class from which a <%- type %> is created. diff --git a/plugin-annotation/scripts/code-gen.js b/plugin-annotation/scripts/code-gen.js index 5efb2577..1a5c3d14 100644 --- a/plugin-annotation/scripts/code-gen.js +++ b/plugin-annotation/scripts/code-gen.js @@ -400,15 +400,15 @@ const annotationManagerJavaUnitTests = ejs.compile(fs.readFileSync('plugin-annot for (const layer of layers) { if(layer.type === "symbol" || layer.type === "circle" || layer.type === "fill" || layer.type === "line"){ - writeIfModified(`plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/On${camelize(layer.type)}DragListener.java`, annotationDragListener(layer)); - writeIfModified(`plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/On${camelize(layer.type)}ClickListener.java`, annotationClickListener(layer)); - writeIfModified(`plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/On${camelize(layer.type)}LongClickListener.java`, annotationLongClickListener(layer)); - writeIfModified(`plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/${camelize(layer.type)}.java`, annotationJava(layer)); - writeIfModified(`plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/${camelize(layer.type)}Options.java`, annotationOptionsJava(layer)); - writeIfModified(`plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/${camelize(layer.type)}Manager.java`, annotationManagerJava(layer)); - writeIfModified(`plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/${camelize(layer.type)}ElementProvider.java`, annotationElementProvider(layer)); - writeIfModified(`app/src/androidTest/java/org/maplibre/android/plugins/annotation/${camelize(layer.type)}Test.java`, annotationJavaInstrumentationTests(layer)); - writeIfModified(`app/src/androidTest/java/org/maplibre/android/plugins/annotation/${camelize(layer.type)}ManagerTest.java`, annotationManagerJavaInstrumentationTests(layer)); - writeIfModified(`plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/${camelize(layer.type)}ManagerTest.java`, annotationManagerJavaUnitTests(layer)); + writeIfModified(`plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/On${camelize(layer.type)}DragListener.java`, annotationDragListener(layer)); + writeIfModified(`plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/On${camelize(layer.type)}ClickListener.java`, annotationClickListener(layer)); + writeIfModified(`plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/On${camelize(layer.type)}LongClickListener.java`, annotationLongClickListener(layer)); + writeIfModified(`plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/${camelize(layer.type)}.java`, annotationJava(layer)); + writeIfModified(`plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/${camelize(layer.type)}Options.java`, annotationOptionsJava(layer)); + writeIfModified(`plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/${camelize(layer.type)}Manager.java`, annotationManagerJava(layer)); + writeIfModified(`plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/${camelize(layer.type)}ElementProvider.java`, annotationElementProvider(layer)); + writeIfModified(`app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/${camelize(layer.type)}Test.java`, annotationJavaInstrumentationTests(layer)); + writeIfModified(`app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/annotation/${camelize(layer.type)}ManagerTest.java`, annotationManagerJavaInstrumentationTests(layer)); + writeIfModified(`plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/${camelize(layer.type)}ManagerTest.java`, annotationManagerJavaUnitTests(layer)); } } \ No newline at end of file diff --git a/plugin-annotation/src/main/AndroidManifest.xml b/plugin-annotation/src/main/AndroidManifest.xml index b8c8da0a..f7cf8b79 100644 --- a/plugin-annotation/src/main/AndroidManifest.xml +++ b/plugin-annotation/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Annotation.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Annotation.java similarity index 98% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Annotation.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Annotation.java index 4bdf734f..27b097b1 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Annotation.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Annotation.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -140,4 +140,4 @@ public String toString() { + ", isDraggable=" + isDraggable + '}'; } -} +} \ No newline at end of file diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/AnnotationManager.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/AnnotationManager.java similarity index 95% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/AnnotationManager.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/AnnotationManager.java index a308b100..d7d5def5 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/AnnotationManager.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/AnnotationManager.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import android.graphics.PointF; @@ -19,7 +19,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.concurrent.atomic.AtomicBoolean; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -46,7 +45,6 @@ public abstract class AnnotationManager< private static final String TAG = "AnnotationManager"; - private final MapView mapView; protected final MapboxMap mapboxMap; protected final LongSparseArray annotations = new LongSparseArray<>(); final Map dataDrivenPropertyUsageMap = new HashMap<>(); @@ -66,14 +64,11 @@ public abstract class AnnotationManager< protected CoreElementProvider coreElementProvider; private DraggableAnnotationController draggableAnnotationController; - private AtomicBoolean isSourceUpToDate = new AtomicBoolean(true); - @UiThread protected AnnotationManager(MapView mapView, final MapboxMap mapboxMap, Style style, CoreElementProvider coreElementProvider, DraggableAnnotationController draggableAnnotationController, String belowLayerId, final GeoJsonOptions geoJsonOptions) { - this.mapView = mapView; this.mapboxMap = mapboxMap; this.style = style; this.belowLayerId = belowLayerId; @@ -227,20 +222,7 @@ public void update(List annotationList) { */ public void updateSource() { draggableAnnotationController.onSourceUpdated(); - postUpdateSource(); - } - - void postUpdateSource() { - // Only schedule a new refresh if not already scheduled - if (isSourceUpToDate.compareAndSet(true, false)) { - mapView.post(new Runnable() { - @Override - public void run() { - internalUpdateSource(); - isSourceUpToDate.set(true); - } - }); - } + internalUpdateSource(); } void internalUpdateSource() { diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Circle.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Circle.java similarity index 99% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Circle.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Circle.java index df23450d..5ef645eb 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Circle.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Circle.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.annotation.ColorInt; import androidx.annotation.NonNull; diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CircleElementProvider.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleElementProvider.java similarity index 96% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CircleElementProvider.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleElementProvider.java index 296be57a..a8321e18 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CircleElementProvider.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleElementProvider.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.annotation.Nullable; import com.mapbox.mapboxsdk.style.layers.CircleLayer; @@ -46,4 +46,4 @@ public CircleLayer getLayer() { public GeoJsonSource getSource(@Nullable GeoJsonOptions geoJsonOptions) { return new GeoJsonSource(sourceId, geoJsonOptions); } -} +} \ No newline at end of file diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CircleManager.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManager.java similarity index 99% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CircleManager.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManager.java index 60ac7fe7..d64fa7f9 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CircleManager.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManager.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CircleOptions.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleOptions.java similarity index 97% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CircleOptions.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleOptions.java index bb79ac4d..d839cb72 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CircleOptions.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CircleOptions.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -16,9 +16,9 @@ import java.util.ArrayList; import java.util.List; -import static org.maplibre.android.plugins.annotation.ConvertUtils.convertArray; -import static org.maplibre.android.plugins.annotation.ConvertUtils.toFloatArray; -import static org.maplibre.android.plugins.annotation.ConvertUtils.toStringArray; +import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.convertArray; +import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.toFloatArray; +import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.toStringArray; /** * Builder class from which a circle is created. diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/ClusterOptions.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/ClusterOptions.java similarity index 99% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/ClusterOptions.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/ClusterOptions.java index 3bb09b9a..c9f372f5 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/ClusterOptions.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/ClusterOptions.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import android.graphics.Color; diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/ConvertUtils.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/ConvertUtils.java similarity index 96% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/ConvertUtils.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/ConvertUtils.java index 30fd551a..5460063b 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/ConvertUtils.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/ConvertUtils.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import com.google.gson.JsonArray; diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CoreElementProvider.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CoreElementProvider.java similarity index 88% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CoreElementProvider.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CoreElementProvider.java index d656ec27..37a64f23 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/CoreElementProvider.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/CoreElementProvider.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import com.mapbox.mapboxsdk.style.layers.Layer; import com.mapbox.mapboxsdk.style.sources.GeoJsonOptions; diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/DraggableAnnotationController.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/DraggableAnnotationController.java similarity index 98% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/DraggableAnnotationController.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/DraggableAnnotationController.java index f395a62c..b9be243d 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/DraggableAnnotationController.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/DraggableAnnotationController.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import android.annotation.SuppressLint; import android.graphics.PointF; @@ -142,7 +142,7 @@ boolean onMove(MoveGestureDetector detector) { draggedAnnotation.setGeometry( shiftedGeometry ); - draggedAnnotationManager.postUpdateSource(); + draggedAnnotationManager.internalUpdateSource(); for (OnAnnotationDragListener d : (List) draggedAnnotationManager.getDragListeners()) { d.onAnnotationDrag(draggedAnnotation); } @@ -197,4 +197,4 @@ public void onMoveEnd(MoveGestureDetector detector, float velocityX, float veloc DraggableAnnotationController.this.onMoveEnd(); } } -} +} \ No newline at end of file diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Fill.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Fill.java similarity index 99% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Fill.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Fill.java index e6e81185..b009df4f 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Fill.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Fill.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.annotation.ColorInt; import androidx.annotation.NonNull; diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/FillElementProvider.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/FillElementProvider.java similarity index 96% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/FillElementProvider.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/FillElementProvider.java index 6a5f83d4..4b9648af 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/FillElementProvider.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/FillElementProvider.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.annotation.Nullable; import com.mapbox.mapboxsdk.style.layers.FillLayer; @@ -46,4 +46,4 @@ public FillLayer getLayer() { public GeoJsonSource getSource(@Nullable GeoJsonOptions geoJsonOptions) { return new GeoJsonSource(sourceId, geoJsonOptions); } -} +} \ No newline at end of file diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/FillManager.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/FillManager.java similarity index 99% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/FillManager.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/FillManager.java index dfb1d10c..cc903f34 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/FillManager.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/FillManager.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/FillOptions.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/FillOptions.java similarity index 97% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/FillOptions.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/FillOptions.java index 2b174a31..752cd288 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/FillOptions.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/FillOptions.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -16,9 +16,9 @@ import java.util.ArrayList; import java.util.List; -import static org.maplibre.android.plugins.annotation.ConvertUtils.convertArray; -import static org.maplibre.android.plugins.annotation.ConvertUtils.toFloatArray; -import static org.maplibre.android.plugins.annotation.ConvertUtils.toStringArray; +import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.convertArray; +import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.toFloatArray; +import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.toStringArray; /** * Builder class from which a fill is created. diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Line.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Line.java similarity index 99% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Line.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Line.java index dbc9cb8c..c4cac02d 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Line.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Line.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.annotation.ColorInt; import androidx.annotation.NonNull; diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/LineElementProvider.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/LineElementProvider.java similarity index 96% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/LineElementProvider.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/LineElementProvider.java index 82726c97..4d7079e7 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/LineElementProvider.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/LineElementProvider.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.annotation.Nullable; import com.mapbox.mapboxsdk.style.layers.LineLayer; @@ -46,4 +46,4 @@ public LineLayer getLayer() { public GeoJsonSource getSource(@Nullable GeoJsonOptions geoJsonOptions) { return new GeoJsonSource(sourceId, geoJsonOptions); } -} +} \ No newline at end of file diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/LineManager.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/LineManager.java similarity index 99% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/LineManager.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/LineManager.java index 500a53c5..d9e8aa54 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/LineManager.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/LineManager.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/LineOptions.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/LineOptions.java similarity index 97% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/LineOptions.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/LineOptions.java index 2acbf364..b530dd7d 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/LineOptions.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/LineOptions.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -16,9 +16,9 @@ import java.util.ArrayList; import java.util.List; -import static org.maplibre.android.plugins.annotation.ConvertUtils.convertArray; -import static org.maplibre.android.plugins.annotation.ConvertUtils.toFloatArray; -import static org.maplibre.android.plugins.annotation.ConvertUtils.toStringArray; +import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.convertArray; +import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.toFloatArray; +import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.toStringArray; /** * Builder class from which a line is created. diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnAnnotationClickListener.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnAnnotationClickListener.java similarity index 91% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnAnnotationClickListener.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnAnnotationClickListener.java index cfa15236..e89828d3 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnAnnotationClickListener.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnAnnotationClickListener.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; /** * Generic interface definition of a callback to be invoked when an annotation has been clicked. diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnAnnotationDragListener.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnAnnotationDragListener.java similarity index 93% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnAnnotationDragListener.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnAnnotationDragListener.java index a10b1962..adeed4d8 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnAnnotationDragListener.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnAnnotationDragListener.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; /** * Generic interface definition of a callback to be invoked when an annotation is being dragged. @@ -27,4 +27,4 @@ public interface OnAnnotationDragListener { * @param annotation the annotation */ void onAnnotationDragFinished(T annotation); -} +} \ No newline at end of file diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnAnnotationLongClickListener.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnAnnotationLongClickListener.java similarity index 91% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnAnnotationLongClickListener.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnAnnotationLongClickListener.java index 7af1ffc4..da075472 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnAnnotationLongClickListener.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnAnnotationLongClickListener.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; /** * Generic interface definition of a callback to be invoked when an annotation has been long clicked. diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnCircleClickListener.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnCircleClickListener.java similarity index 80% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnCircleClickListener.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnCircleClickListener.java index e6709d3e..22b4957a 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnCircleClickListener.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnCircleClickListener.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; /** * Interface definition for a callback to be invoked when a circle has been clicked. diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnCircleDragListener.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnCircleDragListener.java similarity index 80% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnCircleDragListener.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnCircleDragListener.java index d07adfaa..b345e964 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnCircleDragListener.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnCircleDragListener.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; /** * Interface definition for a callback to be invoked when a circle is dragged. diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnCircleLongClickListener.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnCircleLongClickListener.java similarity index 81% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnCircleLongClickListener.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnCircleLongClickListener.java index 01ef6bf9..a3d9bf85 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnCircleLongClickListener.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnCircleLongClickListener.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; /** * Interface definition for a callback to be invoked when a circle has been long clicked. diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnFillClickListener.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnFillClickListener.java similarity index 80% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnFillClickListener.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnFillClickListener.java index 20366b64..eadaf81b 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnFillClickListener.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnFillClickListener.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; /** * Interface definition for a callback to be invoked when a fill has been clicked. diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnFillDragListener.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnFillDragListener.java similarity index 79% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnFillDragListener.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnFillDragListener.java index 86071217..da1728bb 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnFillDragListener.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnFillDragListener.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; /** * Interface definition for a callback to be invoked when a fill is dragged. diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnFillLongClickListener.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnFillLongClickListener.java similarity index 81% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnFillLongClickListener.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnFillLongClickListener.java index 21dcd471..5e695109 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnFillLongClickListener.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnFillLongClickListener.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; /** * Interface definition for a callback to be invoked when a fill has been long clicked. diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnLineClickListener.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnLineClickListener.java similarity index 80% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnLineClickListener.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnLineClickListener.java index 92c9e30d..e7b8e57b 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnLineClickListener.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnLineClickListener.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; /** * Interface definition for a callback to be invoked when a line has been clicked. diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnLineDragListener.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnLineDragListener.java similarity index 79% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnLineDragListener.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnLineDragListener.java index 45bd86ab..ed7d9fd3 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnLineDragListener.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnLineDragListener.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; /** * Interface definition for a callback to be invoked when a line is dragged. diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnLineLongClickListener.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnLineLongClickListener.java similarity index 81% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnLineLongClickListener.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnLineLongClickListener.java index 423b26e4..791d0a77 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnLineLongClickListener.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnLineLongClickListener.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; /** * Interface definition for a callback to be invoked when a line has been long clicked. diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnSymbolClickListener.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnSymbolClickListener.java similarity index 80% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnSymbolClickListener.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnSymbolClickListener.java index d0f66c38..1c804d35 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnSymbolClickListener.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnSymbolClickListener.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; /** * Interface definition for a callback to be invoked when a symbol has been clicked. diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnSymbolDragListener.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnSymbolDragListener.java similarity index 80% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnSymbolDragListener.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnSymbolDragListener.java index e4273b68..405b31c4 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnSymbolDragListener.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnSymbolDragListener.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; /** * Interface definition for a callback to be invoked when a symbol is dragged. diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnSymbolLongClickListener.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnSymbolLongClickListener.java similarity index 81% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnSymbolLongClickListener.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnSymbolLongClickListener.java index 6ae91b98..35a1f63f 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/OnSymbolLongClickListener.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/OnSymbolLongClickListener.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; /** * Interface definition for a callback to be invoked when a symbol has been long clicked. diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Options.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Options.java similarity index 74% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Options.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Options.java index 241a6ca3..eb95be46 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Options.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Options.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; public abstract class Options { diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Symbol.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Symbol.java similarity index 99% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Symbol.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Symbol.java index 9260440b..28a89d64 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/Symbol.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/Symbol.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.annotation.ColorInt; import androidx.annotation.NonNull; diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/SymbolElementProvider.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolElementProvider.java similarity index 96% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/SymbolElementProvider.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolElementProvider.java index 71ff0c15..c27b8678 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/SymbolElementProvider.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolElementProvider.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.annotation.Nullable; import com.mapbox.mapboxsdk.style.layers.SymbolLayer; diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/SymbolManager.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManager.java similarity index 99% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/SymbolManager.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManager.java index 7785ae2e..e5f62e88 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/SymbolManager.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManager.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/SymbolOptions.java b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolOptions.java similarity index 99% rename from plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/SymbolOptions.java rename to plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolOptions.java index d249b2c7..88561c87 100644 --- a/plugin-annotation/src/main/java/org/maplibre/android/plugins/annotation/SymbolOptions.java +++ b/plugin-annotation/src/main/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolOptions.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -16,9 +16,9 @@ import java.util.ArrayList; import java.util.List; -import static org.maplibre.android.plugins.annotation.ConvertUtils.convertArray; -import static org.maplibre.android.plugins.annotation.ConvertUtils.toFloatArray; -import static org.maplibre.android.plugins.annotation.ConvertUtils.toStringArray; +import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.convertArray; +import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.toFloatArray; +import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.toStringArray; /** * Builder class from which a symbol is created. diff --git a/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/CircleManagerTest.java b/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManagerTest.java similarity index 99% rename from plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/CircleManagerTest.java rename to plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManagerTest.java index caff247d..3ff0f271 100644 --- a/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/CircleManagerTest.java +++ b/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/CircleManagerTest.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import com.google.gson.JsonPrimitive; import com.mapbox.geojson.*; @@ -22,7 +22,7 @@ import java.util.Arrays; import android.graphics.PointF; -import static org.maplibre.android.plugins.annotation.ConvertUtils.convertArray; +import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.convertArray; import static com.mapbox.mapboxsdk.style.expressions.Expression.get; import static com.mapbox.mapboxsdk.style.layers.Property.*; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; diff --git a/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/DraggableAnnotationControllerTest.java b/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/DraggableAnnotationControllerTest.java similarity index 99% rename from plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/DraggableAnnotationControllerTest.java rename to plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/DraggableAnnotationControllerTest.java index c140bf5a..8902cd65 100644 --- a/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/DraggableAnnotationControllerTest.java +++ b/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/DraggableAnnotationControllerTest.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import android.graphics.PointF; diff --git a/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/FillManagerTest.java b/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/FillManagerTest.java similarity index 99% rename from plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/FillManagerTest.java rename to plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/FillManagerTest.java index 02aa7bf4..84b5469c 100644 --- a/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/FillManagerTest.java +++ b/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/FillManagerTest.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import com.google.gson.JsonPrimitive; import com.mapbox.geojson.*; @@ -22,7 +22,7 @@ import java.util.Arrays; import android.graphics.PointF; -import static org.maplibre.android.plugins.annotation.ConvertUtils.convertArray; +import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.convertArray; import static com.mapbox.mapboxsdk.style.expressions.Expression.get; import static com.mapbox.mapboxsdk.style.layers.Property.*; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; diff --git a/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/LineManagerTest.java b/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/LineManagerTest.java similarity index 99% rename from plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/LineManagerTest.java rename to plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/LineManagerTest.java index 02da2bfc..b062de62 100644 --- a/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/LineManagerTest.java +++ b/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/LineManagerTest.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import com.google.gson.JsonPrimitive; import com.mapbox.geojson.*; @@ -22,7 +22,7 @@ import java.util.Arrays; import android.graphics.PointF; -import static org.maplibre.android.plugins.annotation.ConvertUtils.convertArray; +import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.convertArray; import static com.mapbox.mapboxsdk.style.expressions.Expression.get; import static com.mapbox.mapboxsdk.style.layers.Property.*; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; diff --git a/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/PropertyValueMatcher.java b/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/PropertyValueMatcher.java similarity index 95% rename from plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/PropertyValueMatcher.java rename to plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/PropertyValueMatcher.java index 7f12e054..5c8a0ee7 100644 --- a/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/PropertyValueMatcher.java +++ b/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/PropertyValueMatcher.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import com.mapbox.mapboxsdk.style.layers.PropertyValue; diff --git a/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/SymbolManagerTest.java b/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManagerTest.java similarity index 99% rename from plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/SymbolManagerTest.java rename to plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManagerTest.java index beb2af08..0ee0a554 100644 --- a/plugin-annotation/src/test/java/org/maplibre/android/plugins/annotation/SymbolManagerTest.java +++ b/plugin-annotation/src/test/java/com/mapbox/mapboxsdk/plugins/annotation/SymbolManagerTest.java @@ -1,6 +1,6 @@ // This file is generated. -package org.maplibre.android.plugins.annotation; +package com.mapbox.mapboxsdk.plugins.annotation; import com.google.gson.JsonPrimitive; import com.mapbox.geojson.*; @@ -22,7 +22,7 @@ import java.util.Arrays; import android.graphics.PointF; -import static org.maplibre.android.plugins.annotation.ConvertUtils.convertArray; +import static com.mapbox.mapboxsdk.plugins.annotation.ConvertUtils.convertArray; import static com.mapbox.mapboxsdk.style.expressions.Expression.get; import static com.mapbox.mapboxsdk.style.layers.Property.*; import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.*; diff --git a/plugin-building/README.md b/plugin-building/README.md index 318d2cad..eebd6f77 100644 --- a/plugin-building/README.md +++ b/plugin-building/README.md @@ -20,7 +20,7 @@ repositories { // In the app build.gradle file dependencies { - implementation 'org.maplibre.android:maplibre-android-plugin-building-v9:0.7.0' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-building-v9:0.7.0' } ``` @@ -37,17 +37,17 @@ repositories { // In the app build.gradle file dependencies { - implementation 'org.maplibre.android:maplibre-android-plugin-building-v9:0.8.0-SNAPSHOT' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-building-v9:0.8.0-SNAPSHOT' } ``` ## Building plugin examples -- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/blob/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity/building/BuildingActivity.kt) +- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/blob/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/building/BuildingActivity.kt) ## Help and Usage -This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity) for ready-to-use snippets. +This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. We'd love to [hear your feedback](https://github.com/maplibre/maplibre-plugins-android/issues) as we build more plugins and learn how you use them. diff --git a/plugin-building/src/main/AndroidManifest.xml b/plugin-building/src/main/AndroidManifest.xml index 9e739606..64632bbd 100644 --- a/plugin-building/src/main/AndroidManifest.xml +++ b/plugin-building/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/plugin-building/src/main/java/org/maplibre/android/plugins/building/BuildingPlugin.java b/plugin-building/src/main/java/com/mapbox/mapboxsdk/plugins/building/BuildingPlugin.java similarity index 98% rename from plugin-building/src/main/java/org/maplibre/android/plugins/building/BuildingPlugin.java rename to plugin-building/src/main/java/com/mapbox/mapboxsdk/plugins/building/BuildingPlugin.java index 91246f75..44ca01e2 100644 --- a/plugin-building/src/main/java/org/maplibre/android/plugins/building/BuildingPlugin.java +++ b/plugin-building/src/main/java/com/mapbox/mapboxsdk/plugins/building/BuildingPlugin.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.building; +package com.mapbox.mapboxsdk.plugins.building; import android.graphics.Color; @@ -29,7 +29,7 @@ import static com.mapbox.mapboxsdk.style.layers.PropertyFactory.visibility; /** - * The building plugin allows you to add 3d buildings FillExtrusionLayer to the Maplibre Maps SDK for + * The building plugin allows you to add 3d buildings FillExtrusionLayer to the Mapbox Maps SDK for * Android v5.1.0. *

* Initialise this plugin in the {@link com.mapbox.mapboxsdk.maps.OnMapReadyCallback#onMapReady(MapboxMap)} @@ -218,3 +218,5 @@ public Light getLight() { return light; } } + + diff --git a/plugin-building/src/main/java/com/mapbox/mapboxsdk/plugins/building/package-info.java b/plugin-building/src/main/java/com/mapbox/mapboxsdk/plugins/building/package-info.java new file mode 100644 index 00000000..99d39d42 --- /dev/null +++ b/plugin-building/src/main/java/com/mapbox/mapboxsdk/plugins/building/package-info.java @@ -0,0 +1,6 @@ +/** + * Contains logic used for the Mapbox Buildings Plugin. + * + * @since 0.1.0 + */ +package com.mapbox.mapboxsdk.plugins.building; \ No newline at end of file diff --git a/plugin-building/src/main/java/org/maplibre/android/plugins/building/package-info.java b/plugin-building/src/main/java/org/maplibre/android/plugins/building/package-info.java deleted file mode 100644 index 2c97f5de..00000000 --- a/plugin-building/src/main/java/org/maplibre/android/plugins/building/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Contains logic used for the Maplibre Buildings Plugin. - * - * @since 0.1.0 - */ -package org.maplibre.android.plugins.building; diff --git a/plugin-localization/README.md b/plugin-localization/README.md index 01442a81..a767abc7 100644 --- a/plugin-localization/README.md +++ b/plugin-localization/README.md @@ -21,7 +21,7 @@ repositories { // In the app build.gradle file dependencies { - implementation 'org.maplibre.android:maplibre-android-plugin-localization-v9:0.12.0' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-localization-v9:0.12.0' } ``` @@ -39,17 +39,17 @@ repositories { // In the app build.gradle file dependencies { - implementation 'org.maplibre.android:maplibre-android-plugin-localization-v9:0.13.0-SNAPSHOT' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-localization-v9:0.13.0-SNAPSHOT' } ``` ## Localization examples -- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/blob/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity/localization/LocalizationActivity.kt) +- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/blob/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/localization/LocalizationActivity.kt) ## Help and Usage -This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity) for ready-to-use snippets. +This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. We'd love to [hear your feedback](https://github.com/maplibre/maplibre-plugins-android/issues) as we build more plugins and learn how you use them. diff --git a/plugin-localization/src/main/AndroidManifest.xml b/plugin-localization/src/main/AndroidManifest.xml index 257168d1..060257cf 100644 --- a/plugin-localization/src/main/AndroidManifest.xml +++ b/plugin-localization/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - + \ No newline at end of file diff --git a/plugin-localization/src/main/java/org/maplibre/android/plugins/localization/LocalizationPlugin.java b/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/LocalizationPlugin.java similarity index 99% rename from plugin-localization/src/main/java/org/maplibre/android/plugins/localization/LocalizationPlugin.java rename to plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/LocalizationPlugin.java index f2e3c4ec..89580da9 100644 --- a/plugin-localization/src/main/java/org/maplibre/android/plugins/localization/LocalizationPlugin.java +++ b/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/LocalizationPlugin.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.localization; +package com.mapbox.mapboxsdk.plugins.localization; import com.mapbox.mapboxsdk.camera.CameraUpdateFactory; @@ -6,7 +6,7 @@ import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; import com.mapbox.mapboxsdk.maps.Style; -import org.maplibre.android.plugins.localization.MapLocale.Languages; +import com.mapbox.mapboxsdk.plugins.localization.MapLocale.Languages; import com.mapbox.mapboxsdk.style.expressions.Expression; import com.mapbox.mapboxsdk.style.layers.Layer; import com.mapbox.mapboxsdk.style.layers.PropertyValue; diff --git a/plugin-localization/src/main/java/org/maplibre/android/plugins/localization/MapLocale.java b/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/MapLocale.java similarity index 98% rename from plugin-localization/src/main/java/org/maplibre/android/plugins/localization/MapLocale.java rename to plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/MapLocale.java index 223d2c6d..3afb51c1 100644 --- a/plugin-localization/src/main/java/org/maplibre/android/plugins/localization/MapLocale.java +++ b/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/MapLocale.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.localization; +package com.mapbox.mapboxsdk.plugins.localization; import com.mapbox.mapboxsdk.geometry.LatLng; @@ -17,7 +17,7 @@ /** * A {@link MapLocale} object builds off of the {@link Locale} object and provides additional - * geographical information particular to the Maplibre Maps SDK. Like Locale, MapLocale can be used to + * geographical information particular to the Mapbox Maps SDK. Like Locale, MapLocale can be used to * make the map locale sensitive. *

* The {@link MapLocale} object can be used to acquire the matching Locale's map language; useful for @@ -38,7 +38,7 @@ public final class MapLocale { /* - * Supported Maplibre map languages. + * Supported Mapbox map languages. */ /** diff --git a/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/package-info.java b/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/package-info.java new file mode 100644 index 00000000..6b045cd4 --- /dev/null +++ b/plugin-localization/src/main/java/com/mapbox/mapboxsdk/plugins/localization/package-info.java @@ -0,0 +1,6 @@ +/** + * Contains the classes relevant to the Mapbox Localization Plugin. + * + * @since 0.1.0 + */ +package com.mapbox.mapboxsdk.plugins.localization; \ No newline at end of file diff --git a/plugin-localization/src/main/java/org/maplibre/android/plugins/localization/package-info.java b/plugin-localization/src/main/java/org/maplibre/android/plugins/localization/package-info.java deleted file mode 100644 index 45efe634..00000000 --- a/plugin-localization/src/main/java/org/maplibre/android/plugins/localization/package-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Contains the classes relevant to the Maplibre Localization Plugin. - * - * @since 0.1.0 - */ -package org.maplibre.android.plugins.localization; diff --git a/plugin-localization/src/test/java/org/maplibre/android/plugins/localization/LocalizationPluginTest.java b/plugin-localization/src/test/java/com/mapbox/mapboxsdk/plugins/localization/LocalizationPluginTest.java similarity index 96% rename from plugin-localization/src/test/java/org/maplibre/android/plugins/localization/LocalizationPluginTest.java rename to plugin-localization/src/test/java/com/mapbox/mapboxsdk/plugins/localization/LocalizationPluginTest.java index a5f1d0b5..c5dcd527 100644 --- a/plugin-localization/src/test/java/org/maplibre/android/plugins/localization/LocalizationPluginTest.java +++ b/plugin-localization/src/test/java/com/mapbox/mapboxsdk/plugins/localization/LocalizationPluginTest.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.localization; +package com.mapbox.mapboxsdk.plugins.localization; import com.mapbox.mapboxsdk.maps.MapView; import com.mapbox.mapboxsdk.maps.MapboxMap; @@ -48,4 +48,4 @@ public void setMapLanguage_localePassedInNotValid() throws Exception { = new LocalizationPlugin(mock(MapView.class), mock(MapboxMap.class), style); localizationPlugin.setMapLanguage(new Locale("foo", "bar"), false); } -} +} \ No newline at end of file diff --git a/plugin-localization/src/test/java/org/maplibre/android/plugins/localization/MapLocaleTest.java b/plugin-localization/src/test/java/com/mapbox/mapboxsdk/plugins/localization/MapLocaleTest.java similarity index 96% rename from plugin-localization/src/test/java/org/maplibre/android/plugins/localization/MapLocaleTest.java rename to plugin-localization/src/test/java/com/mapbox/mapboxsdk/plugins/localization/MapLocaleTest.java index c4e15dbe..f66f8a0a 100644 --- a/plugin-localization/src/test/java/org/maplibre/android/plugins/localization/MapLocaleTest.java +++ b/plugin-localization/src/test/java/com/mapbox/mapboxsdk/plugins/localization/MapLocaleTest.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.localization; +package com.mapbox.mapboxsdk.plugins.localization; import org.junit.Assert; import org.junit.Test; diff --git a/plugin-markerview/README.md b/plugin-markerview/README.md index 5feeb24f..1527f69b 100644 --- a/plugin-markerview/README.md +++ b/plugin-markerview/README.md @@ -22,7 +22,7 @@ repositories { // In the app build.gradle file dependencies { - implementation 'org.maplibre.android:maplibre-android-plugin-markerview-v9:0.4.0' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-markerview-v9:0.4.0' } ``` @@ -39,17 +39,17 @@ repositories { // In the app build.gradle file dependencies { - implementation 'org.maplibre.android:maplibre-android-plugin-markerview-v9:0.5.0-SNAPSHOT' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-markerview-v9:0.5.0-SNAPSHOT' } ``` ## MarkerView plugin examples -- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/blob/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity/markerview/MarkerViewActivity.kt) +- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/blob/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/markerview/MarkerViewActivity.kt) ## Help and Usage -This repository includes an app that shows how to use each plugin in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity) for ready-to-use snippets. +This repository includes an app that shows how to use each plugin in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. We'd love to [hear your feedback](https://github.com/maplibre/maplibre-plugins-android/issues) as we build more plugins and learn how you use them. diff --git a/plugin-markerview/src/main/AndroidManifest.xml b/plugin-markerview/src/main/AndroidManifest.xml index 81ee0945..c53efedd 100644 --- a/plugin-markerview/src/main/AndroidManifest.xml +++ b/plugin-markerview/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ + package="com.mapbox.mapboxsdk.plugins.markerview"/> diff --git a/plugin-markerview/src/main/java/org/maplibre/android/plugins/markerview/MarkerView.java b/plugin-markerview/src/main/java/com/mapbox/mapboxsdk/plugins/markerview/MarkerView.java similarity index 97% rename from plugin-markerview/src/main/java/org/maplibre/android/plugins/markerview/MarkerView.java rename to plugin-markerview/src/main/java/com/mapbox/mapboxsdk/plugins/markerview/MarkerView.java index 76bbd495..9ded3b12 100644 --- a/plugin-markerview/src/main/java/org/maplibre/android/plugins/markerview/MarkerView.java +++ b/plugin-markerview/src/main/java/com/mapbox/mapboxsdk/plugins/markerview/MarkerView.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.markerview; +package com.mapbox.mapboxsdk.plugins.markerview; import android.graphics.PointF; import android.view.View; @@ -81,4 +81,4 @@ void update() { view.setY(point.y); } -} +} \ No newline at end of file diff --git a/plugin-markerview/src/main/java/org/maplibre/android/plugins/markerview/MarkerViewManager.java b/plugin-markerview/src/main/java/com/mapbox/mapboxsdk/plugins/markerview/MarkerViewManager.java similarity index 98% rename from plugin-markerview/src/main/java/org/maplibre/android/plugins/markerview/MarkerViewManager.java rename to plugin-markerview/src/main/java/com/mapbox/mapboxsdk/plugins/markerview/MarkerViewManager.java index b7c71e98..e58ea1ff 100644 --- a/plugin-markerview/src/main/java/org/maplibre/android/plugins/markerview/MarkerViewManager.java +++ b/plugin-markerview/src/main/java/com/mapbox/mapboxsdk/plugins/markerview/MarkerViewManager.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.markerview; +package com.mapbox.mapboxsdk.plugins.markerview; import com.mapbox.mapboxsdk.maps.MapView; diff --git a/plugin-offline/README.md b/plugin-offline/README.md index 1f99336a..a1128a33 100644 --- a/plugin-offline/README.md +++ b/plugin-offline/README.md @@ -20,7 +20,7 @@ repositories { // In the app build.gradle file dependencies { - implementation 'org.maplibre.android:maplibre-android-plugin-offline-v9:0.7.0' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-offline-v9:0.7.0' } ``` @@ -37,17 +37,17 @@ repositories { // In the app build.gradle file dependencies { - implementation 'org.maplibre.android:maplibre-android-plugin-offline-v9:0.8.0-SNAPSHOT' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-offline-v9:0.8.0-SNAPSHOT' } ``` ## Offline plugin examples -- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity/offline) +- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/offline) ## Help and Usage -This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity) for ready-to-use snippets. +This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. We'd love to [hear your feedback](https://github.com/maplibre/maplibre-plugins-android/issues) as we build more plugins and learn how you use them. diff --git a/plugin-offline/src/main/AndroidManifest.xml b/plugin-offline/src/main/AndroidManifest.xml index 48b844c5..e4c58ebf 100644 --- a/plugin-offline/src/main/AndroidManifest.xml +++ b/plugin-offline/src/main/AndroidManifest.xml @@ -1,16 +1,16 @@ + package="com.mapbox.mapboxsdk.plugins.offline"> - + \ No newline at end of file diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/OfflinePluginConstants.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/OfflinePluginConstants.java new file mode 100644 index 00000000..2fa47529 --- /dev/null +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/OfflinePluginConstants.java @@ -0,0 +1,10 @@ +package com.mapbox.mapboxsdk.plugins.offline; + +public class OfflinePluginConstants { + + private OfflinePluginConstants() { + // No Instances + } + + public static final String REGION_SELECTION_OPTIONS = "com.mapbox.mapboxsdk.plugins.offline:region_selection_options"; +} diff --git a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/OfflineRegionSelector.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/OfflineRegionSelector.java similarity index 92% rename from plugin-offline/src/main/java/org/maplibre/android/plugins/offline/OfflineRegionSelector.java rename to plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/OfflineRegionSelector.java index 4e44d944..54b22917 100644 --- a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/OfflineRegionSelector.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/OfflineRegionSelector.java @@ -1,19 +1,19 @@ -package org.maplibre.android.plugins.offline; +package com.mapbox.mapboxsdk.plugins.offline; import android.app.Activity; import android.content.Context; import android.content.Intent; import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition; -import org.maplibre.android.plugins.offline.model.NotificationOptions; -import org.maplibre.android.plugins.offline.model.OfflineDownloadOptions; -import org.maplibre.android.plugins.offline.model.RegionSelectionOptions; -import org.maplibre.android.plugins.offline.ui.OfflineActivity; +import com.mapbox.mapboxsdk.plugins.offline.model.NotificationOptions; +import com.mapbox.mapboxsdk.plugins.offline.model.OfflineDownloadOptions; +import com.mapbox.mapboxsdk.plugins.offline.model.RegionSelectionOptions; +import com.mapbox.mapboxsdk.plugins.offline.ui.OfflineActivity; import androidx.annotation.NonNull; -import static org.maplibre.android.plugins.offline.offline.OfflineConstants.RETURNING_DEFINITION; -import static org.maplibre.android.plugins.offline.offline.OfflineConstants.RETURNING_REGION_NAME; +import static com.mapbox.mapboxsdk.plugins.offline.offline.OfflineConstants.RETURNING_DEFINITION; +import static com.mapbox.mapboxsdk.plugins.offline.offline.OfflineConstants.RETURNING_REGION_NAME; /** * While the offline plugin includes a service for optimally launching an offline download session, @@ -56,7 +56,7 @@ private OfflineRegionSelector() { * it * @return a new {@link OfflineDownloadOptions} instance which can be used to launch the download * service using - * {@link org.maplibre.android.plugins.offline.offline.OfflinePlugin#startDownload(OfflineDownloadOptions)} + * {@link com.mapbox.mapboxsdk.plugins.offline.offline.OfflinePlugin#startDownload(OfflineDownloadOptions)} * @since 0.1.0 */ public static OfflineDownloadOptions getOfflineDownloadOptions(final Intent data, byte[] metadata) { @@ -78,7 +78,7 @@ public static OfflineDownloadOptions getOfflineDownloadOptions(final Intent data * when launching the offline region download service. * @return a new {@link OfflineDownloadOptions} instance which can be used to launch the download * service using - * {@link org.maplibre.android.plugins.offline.offline.OfflinePlugin#startDownload(OfflineDownloadOptions)} + * {@link com.mapbox.mapboxsdk.plugins.offline.offline.OfflinePlugin#startDownload(OfflineDownloadOptions)} * @since 0.1.0 */ public static OfflineDownloadOptions getOfflineDownloadOptions(final Intent data, @@ -104,7 +104,7 @@ public static OfflineDownloadOptions getOfflineDownloadOptions(final Intent data * still wish to use it * @return a new {@link OfflineDownloadOptions} instance which can be used to launch the download * service using - * {@link org.maplibre.android.plugins.offline.offline.OfflinePlugin#startDownload(OfflineDownloadOptions)} + * {@link com.mapbox.mapboxsdk.plugins.offline.offline.OfflinePlugin#startDownload(OfflineDownloadOptions)} * @since 0.1.0 */ public static OfflineDownloadOptions getOfflineDownloadOptions(final Intent data, diff --git a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/model/NotificationOptions.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/NotificationOptions.java similarity index 94% rename from plugin-offline/src/main/java/org/maplibre/android/plugins/offline/model/NotificationOptions.java rename to plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/NotificationOptions.java index 47fd2ece..28915927 100644 --- a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/model/NotificationOptions.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/NotificationOptions.java @@ -1,10 +1,10 @@ -package org.maplibre.android.plugins.offline.model; +package com.mapbox.mapboxsdk.plugins.offline.model; import android.content.Context; import android.os.Parcelable; import com.google.auto.value.AutoValue; -import org.maplibre.android.plugins.offline.R; +import com.mapbox.mapboxsdk.plugins.offline.R; import androidx.annotation.DrawableRes; diff --git a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/model/OfflineDownloadOptions.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/OfflineDownloadOptions.java similarity index 97% rename from plugin-offline/src/main/java/org/maplibre/android/plugins/offline/model/OfflineDownloadOptions.java rename to plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/OfflineDownloadOptions.java index 907bfe74..65d9f4ce 100644 --- a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/model/OfflineDownloadOptions.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/OfflineDownloadOptions.java @@ -1,12 +1,12 @@ -package org.maplibre.android.plugins.offline.model; +package com.mapbox.mapboxsdk.plugins.offline.model; import android.os.Parcelable; import com.google.auto.value.AutoValue; import com.mapbox.mapboxsdk.offline.OfflineRegion; import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition; -import org.maplibre.android.plugins.offline.offline.OfflineDownloadService; -import org.maplibre.android.plugins.offline.offline.OfflinePlugin; +import com.mapbox.mapboxsdk.plugins.offline.offline.OfflineDownloadService; +import com.mapbox.mapboxsdk.plugins.offline.offline.OfflinePlugin; import java.util.UUID; diff --git a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/model/RegionSelectionOptions.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/RegionSelectionOptions.java similarity index 96% rename from plugin-offline/src/main/java/org/maplibre/android/plugins/offline/model/RegionSelectionOptions.java rename to plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/RegionSelectionOptions.java index 7851bcfa..971e45cc 100644 --- a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/model/RegionSelectionOptions.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/model/RegionSelectionOptions.java @@ -1,11 +1,11 @@ -package org.maplibre.android.plugins.offline.model; +package com.mapbox.mapboxsdk.plugins.offline.model; import android.os.Parcelable; import com.google.auto.value.AutoValue; import com.mapbox.mapboxsdk.camera.CameraPosition; import com.mapbox.mapboxsdk.geometry.LatLngBounds; -import org.maplibre.android.plugins.offline.ui.OfflineActivity; +import com.mapbox.mapboxsdk.plugins.offline.ui.OfflineActivity; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineConstants.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineConstants.java new file mode 100644 index 00000000..e60bbf9e --- /dev/null +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineConstants.java @@ -0,0 +1,28 @@ +package com.mapbox.mapboxsdk.plugins.offline.offline; + +public class OfflineConstants { + + private OfflineConstants() { + // No Instances + } + + static final String ACTION_START_DOWNLOAD = "com.mapbox.mapboxsdk.plugins.offline.download.start"; + static final String ACTION_CANCEL_DOWNLOAD = "com.mapbox.mapboxsdk.plugins.offline.download.cancel"; + static final String ACTION_OFFLINE = "com.mapbox.mapboxsdk.plugins.offline"; + static final String KEY_STATE = "com.mapbox.mapboxsdk.plugins.offline.state"; + static final String STATE_STARTED = "com.mapbox.mapboxsdk.plugins.offline.state.started"; + static final String STATE_FINISHED = "com.mapbox.mapboxsdk.plugins.offline.state.complete"; + static final String STATE_ERROR = "com.mapbox.mapboxsdk.plugins.offline.state.error"; + static final String STATE_CANCEL = "com.mapbox.mapboxsdk.plugins.offline.state.cancel"; + static final String STATE_PROGRESS = "com.mapbox.mapboxsdk.plugins.offline.state.progress"; + static final String KEY_BUNDLE_OFFLINE_REGION = "com.mapbox.mapboxsdk.plugins.offline.region"; + static final String KEY_BUNDLE_ERROR = "com.mapbox.mapboxsdk.plugins.offline.error"; + static final String KEY_BUNDLE_MESSAGE = "com.mapbox.mapboxsdk.plugins.offline.error"; + static final String KEY_PROGRESS = "com.mapbox.mapboxsdk.plugins.offline.progress"; + public static final String NOTIFICATION_CHANNEL = "offline"; + + public static final String RETURNING_DEFINITION = "com.mapbox.mapboxsdk.plugins.offline.returning.definition"; + public static final String RETURNING_REGION_NAME = "com.mapbox.mapboxsdk.plugins.offline.returing.region.name"; + + public static final String KEY_BUNDLE = "com.mapbox.mapboxsdk.plugins.offline.download.object"; +} diff --git a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadChangeDispatcher.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadChangeDispatcher.java similarity index 94% rename from plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadChangeDispatcher.java rename to plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadChangeDispatcher.java index 3fa943ad..99244f3e 100644 --- a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadChangeDispatcher.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadChangeDispatcher.java @@ -1,6 +1,6 @@ -package org.maplibre.android.plugins.offline.offline; +package com.mapbox.mapboxsdk.plugins.offline.offline; -import org.maplibre.android.plugins.offline.model.OfflineDownloadOptions; +import com.mapbox.mapboxsdk.plugins.offline.model.OfflineDownloadOptions; import java.util.ArrayList; import java.util.List; diff --git a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadChangeListener.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadChangeListener.java similarity index 77% rename from plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadChangeListener.java rename to plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadChangeListener.java index 02139ac8..cc33af54 100644 --- a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadChangeListener.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadChangeListener.java @@ -1,6 +1,6 @@ -package org.maplibre.android.plugins.offline.offline; +package com.mapbox.mapboxsdk.plugins.offline.offline; -import org.maplibre.android.plugins.offline.model.OfflineDownloadOptions; +import com.mapbox.mapboxsdk.plugins.offline.model.OfflineDownloadOptions; public interface OfflineDownloadChangeListener { diff --git a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadService.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadService.java similarity index 97% rename from plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadService.java rename to plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadService.java index 794e5da8..39dc34b8 100644 --- a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadService.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadService.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.offline.offline; +package com.mapbox.mapboxsdk.plugins.offline.offline; import android.app.Service; import android.content.Intent; @@ -17,15 +17,15 @@ import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition; import com.mapbox.mapboxsdk.offline.OfflineRegionError; import com.mapbox.mapboxsdk.offline.OfflineRegionStatus; -import org.maplibre.android.plugins.offline.model.OfflineDownloadOptions; -import org.maplibre.android.plugins.offline.utils.NotificationUtils; +import com.mapbox.mapboxsdk.plugins.offline.model.OfflineDownloadOptions; +import com.mapbox.mapboxsdk.plugins.offline.utils.NotificationUtils; import com.mapbox.mapboxsdk.snapshotter.MapSnapshot; import com.mapbox.mapboxsdk.snapshotter.MapSnapshotter; import timber.log.Timber; -import static org.maplibre.android.plugins.offline.offline.OfflineConstants.KEY_BUNDLE; -import static org.maplibre.android.plugins.offline.utils.NotificationUtils.setupNotificationChannel; +import static com.mapbox.mapboxsdk.plugins.offline.offline.OfflineConstants.KEY_BUNDLE; +import static com.mapbox.mapboxsdk.plugins.offline.utils.NotificationUtils.setupNotificationChannel; /** * Internal usage only, use this service indirectly by using methods found in diff --git a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadStateReceiver.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadStateReceiver.java similarity index 96% rename from plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadStateReceiver.java rename to plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadStateReceiver.java index 2a716d84..b641bd11 100644 --- a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineDownloadStateReceiver.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflineDownloadStateReceiver.java @@ -1,13 +1,13 @@ -package org.maplibre.android.plugins.offline.offline; +package com.mapbox.mapboxsdk.plugins.offline.offline; import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import org.maplibre.android.plugins.offline.model.OfflineDownloadOptions; +import com.mapbox.mapboxsdk.plugins.offline.model.OfflineDownloadOptions; -import static org.maplibre.android.plugins.offline.offline.OfflineConstants.KEY_BUNDLE; +import static com.mapbox.mapboxsdk.plugins.offline.offline.OfflineConstants.KEY_BUNDLE; public class OfflineDownloadStateReceiver extends BroadcastReceiver { diff --git a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflinePlugin.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflinePlugin.java similarity index 97% rename from plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflinePlugin.java rename to plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflinePlugin.java index eb8b4cd9..cd0df737 100644 --- a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflinePlugin.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/offline/OfflinePlugin.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.offline.offline; +package com.mapbox.mapboxsdk.plugins.offline.offline; import android.annotation.SuppressLint; import android.app.Activity; @@ -6,7 +6,7 @@ import android.content.Intent; import com.mapbox.mapboxsdk.offline.OfflineRegion; -import org.maplibre.android.plugins.offline.model.OfflineDownloadOptions; +import com.mapbox.mapboxsdk.plugins.offline.model.OfflineDownloadOptions; import java.util.ArrayList; import java.util.List; @@ -14,7 +14,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import static org.maplibre.android.plugins.offline.offline.OfflineConstants.KEY_BUNDLE; +import static com.mapbox.mapboxsdk.plugins.offline.offline.OfflineConstants.KEY_BUNDLE; /** * OfflinePlugin is the main entry point for integrating the offline plugin into your app. diff --git a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/ui/OfflineActivity.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/OfflineActivity.java similarity index 84% rename from plugin-offline/src/main/java/org/maplibre/android/plugins/offline/ui/OfflineActivity.java rename to plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/OfflineActivity.java index e70b5ef9..d7e390a3 100644 --- a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/ui/OfflineActivity.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/OfflineActivity.java @@ -1,21 +1,21 @@ -package org.maplibre.android.plugins.offline.ui; +package com.mapbox.mapboxsdk.plugins.offline.ui; import android.content.Intent; import android.os.Bundle; import android.view.Window; import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition; -import org.maplibre.android.plugins.offline.OfflinePluginConstants; -import org.maplibre.android.plugins.offline.R; -import org.maplibre.android.plugins.offline.model.RegionSelectionOptions; -import org.maplibre.android.plugins.offline.utils.ColorUtils; +import com.mapbox.mapboxsdk.plugins.offline.OfflinePluginConstants; +import com.mapbox.mapboxsdk.plugins.offline.R; +import com.mapbox.mapboxsdk.plugins.offline.model.RegionSelectionOptions; +import com.mapbox.mapboxsdk.plugins.offline.utils.ColorUtils; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import androidx.constraintlayout.widget.ConstraintLayout; -import static org.maplibre.android.plugins.offline.offline.OfflineConstants.RETURNING_DEFINITION; -import static org.maplibre.android.plugins.offline.offline.OfflineConstants.RETURNING_REGION_NAME; +import static com.mapbox.mapboxsdk.plugins.offline.offline.OfflineConstants.RETURNING_DEFINITION; +import static com.mapbox.mapboxsdk.plugins.offline.offline.OfflineConstants.RETURNING_REGION_NAME; public class OfflineActivity extends AppCompatActivity implements RegionSelectedCallback { diff --git a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/ui/RegionSelectedCallback.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/RegionSelectedCallback.java similarity index 80% rename from plugin-offline/src/main/java/org/maplibre/android/plugins/offline/ui/RegionSelectedCallback.java rename to plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/RegionSelectedCallback.java index e48e7125..dcc5473c 100644 --- a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/ui/RegionSelectedCallback.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/RegionSelectedCallback.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.offline.ui; +package com.mapbox.mapboxsdk.plugins.offline.ui; import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition; diff --git a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/ui/RegionSelectionFragment.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/RegionSelectionFragment.java similarity index 97% rename from plugin-offline/src/main/java/org/maplibre/android/plugins/offline/ui/RegionSelectionFragment.java rename to plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/RegionSelectionFragment.java index 6cf60a4d..1194034c 100644 --- a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/ui/RegionSelectionFragment.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/ui/RegionSelectionFragment.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.offline.ui; +package com.mapbox.mapboxsdk.plugins.offline.ui; import android.graphics.PointF; import android.graphics.RectF; @@ -19,9 +19,9 @@ import com.mapbox.mapboxsdk.maps.Style; import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition; import com.mapbox.mapboxsdk.offline.OfflineTilePyramidRegionDefinition; -import org.maplibre.android.plugins.offline.OfflinePluginConstants; -import org.maplibre.android.plugins.offline.R; -import org.maplibre.android.plugins.offline.model.RegionSelectionOptions; +import com.mapbox.mapboxsdk.plugins.offline.OfflinePluginConstants; +import com.mapbox.mapboxsdk.plugins.offline.R; +import com.mapbox.mapboxsdk.plugins.offline.model.RegionSelectionOptions; import com.mapbox.mapboxsdk.style.sources.VectorSource; import java.util.List; diff --git a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/utils/ColorUtils.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/ColorUtils.java similarity index 92% rename from plugin-offline/src/main/java/org/maplibre/android/plugins/offline/utils/ColorUtils.java rename to plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/ColorUtils.java index ea8365f8..aa389bce 100644 --- a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/utils/ColorUtils.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/ColorUtils.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.offline.utils; +package com.mapbox.mapboxsdk.plugins.offline.utils; import android.content.Context; import android.content.res.Resources; diff --git a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/utils/NotificationUtils.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/NotificationUtils.java similarity index 88% rename from plugin-offline/src/main/java/org/maplibre/android/plugins/offline/utils/NotificationUtils.java rename to plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/NotificationUtils.java index bace5c51..df3519d5 100644 --- a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/utils/NotificationUtils.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/NotificationUtils.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.offline.utils; +package com.mapbox.mapboxsdk.plugins.offline.utils; import android.app.Notification; import android.app.NotificationChannel; @@ -12,10 +12,10 @@ import androidx.annotation.RequiresApi; import androidx.core.app.NotificationCompat; -import org.maplibre.android.plugins.offline.R; -import org.maplibre.android.plugins.offline.model.NotificationOptions; -import org.maplibre.android.plugins.offline.model.OfflineDownloadOptions; -import org.maplibre.android.plugins.offline.offline.OfflineConstants; +import com.mapbox.mapboxsdk.plugins.offline.R; +import com.mapbox.mapboxsdk.plugins.offline.model.NotificationOptions; +import com.mapbox.mapboxsdk.plugins.offline.model.OfflineDownloadOptions; +import com.mapbox.mapboxsdk.plugins.offline.offline.OfflineConstants; import static com.mapbox.mapboxsdk.Mapbox.getApplicationContext; diff --git a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/utils/OfflineUtils.java b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/OfflineUtils.java similarity index 96% rename from plugin-offline/src/main/java/org/maplibre/android/plugins/offline/utils/OfflineUtils.java rename to plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/OfflineUtils.java index db629481..8a4061f2 100644 --- a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/utils/OfflineUtils.java +++ b/plugin-offline/src/main/java/com/mapbox/mapboxsdk/plugins/offline/utils/OfflineUtils.java @@ -1,4 +1,4 @@ -package org.maplibre.android.plugins.offline.utils; +package com.mapbox.mapboxsdk.plugins.offline.utils; import android.util.Log; diff --git a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/OfflinePluginConstants.java b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/OfflinePluginConstants.java deleted file mode 100644 index 929bab4f..00000000 --- a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/OfflinePluginConstants.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.maplibre.android.plugins.offline; - -public class OfflinePluginConstants { - - private OfflinePluginConstants() { - // No Instances - } - - public static final String REGION_SELECTION_OPTIONS = "org.maplibre.android.plugins.offline:region_selection_options"; -} diff --git a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineConstants.java b/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineConstants.java deleted file mode 100644 index 7bd220b3..00000000 --- a/plugin-offline/src/main/java/org/maplibre/android/plugins/offline/offline/OfflineConstants.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.maplibre.android.plugins.offline.offline; - -public class OfflineConstants { - - private OfflineConstants() { - // No Instances - } - - static final String ACTION_START_DOWNLOAD = "org.maplibre.android.plugins.offline.download.start"; - static final String ACTION_CANCEL_DOWNLOAD = "org.maplibre.android.plugins.offline.download.cancel"; - static final String ACTION_OFFLINE = "org.maplibre.android.plugins.offline"; - static final String KEY_STATE = "org.maplibre.android.plugins.offline.state"; - static final String STATE_STARTED = "org.maplibre.android.plugins.offline.state.started"; - static final String STATE_FINISHED = "org.maplibre.android.plugins.offline.state.complete"; - static final String STATE_ERROR = "org.maplibre.android.plugins.offline.state.error"; - static final String STATE_CANCEL = "org.maplibre.android.plugins.offline.state.cancel"; - static final String STATE_PROGRESS = "org.maplibre.android.plugins.offline.state.progress"; - static final String KEY_BUNDLE_OFFLINE_REGION = "org.maplibre.android.plugins.offline.region"; - static final String KEY_BUNDLE_ERROR = "org.maplibre.android.plugins.offline.error"; - static final String KEY_BUNDLE_MESSAGE = "org.maplibre.android.plugins.offline.error"; - static final String KEY_PROGRESS = "org.maplibre.android.plugins.offline.progress"; - public static final String NOTIFICATION_CHANNEL = "offline"; - - public static final String RETURNING_DEFINITION = "org.maplibre.android.plugins.offline.returning.definition"; - public static final String RETURNING_REGION_NAME = "org.maplibre.android.plugins.offline.returing.region.name"; - - public static final String KEY_BUNDLE = "org.maplibre.android.plugins.offline.download.object"; -} diff --git a/plugin-scalebar/README.md b/plugin-scalebar/README.md index 0525bece..f36cbf15 100644 --- a/plugin-scalebar/README.md +++ b/plugin-scalebar/README.md @@ -20,7 +20,7 @@ repositories { // In the app build.gradle file dependencies { - implementation 'org.maplibre.android:maplibre-android-plugin-scalebar-v9:0.5.0' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-scalebar-v9:0.5.0' } ``` @@ -37,17 +37,17 @@ repositories { // In the app build.gradle file dependencies { - implementation 'org.maplibre.android:maplibre-android-plugin-scalebar-v9:0.6.0-SNAPSHOT' + implementation 'com.maplibre.maplibresdk:maplibre-android-plugin-scalebar-v9:0.6.0-SNAPSHOT' } ``` ## Scale bar plugin examples -- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/blob/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity/scalebar/ScalebarActivity.kt) +- [In this repo's test app](https://github.com/maplibre/maplibre-plugins-android/blob/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity/scalebar/ScalebarActivity.kt) ## Help and Usage -This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/org/maplibre/android/plugins/testapp/activity) for ready-to-use snippets. +This repository includes an app that shows how to use each plugins in this repository. [Check out its code](https://github.com/maplibre/maplibre-plugins-android/tree/master/app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity) for ready-to-use snippets. Plugins are easy to use. A plugin is simply a library module built on top of the MapLibre Maps SDK for Android. Currently, we are not requiring plugins to register themselves or to implement any specific interfaces so that they're simple to consume. diff --git a/plugin-scalebar/src/main/AndroidManifest.xml b/plugin-scalebar/src/main/AndroidManifest.xml index 2881c25e..c2d2d0e9 100644 --- a/plugin-scalebar/src/main/AndroidManifest.xml +++ b/plugin-scalebar/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ + package="com.mapbox.pluginscalebar" /> diff --git a/plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarConstants.java b/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarConstants.java similarity index 98% rename from plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarConstants.java rename to plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarConstants.java index 6d979ff8..c743f906 100644 --- a/plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarConstants.java +++ b/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarConstants.java @@ -1,4 +1,4 @@ -package org.maplibre.pluginscalebar; +package com.mapbox.pluginscalebar; import android.util.Pair; diff --git a/plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarOptions.java b/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarOptions.java similarity index 99% rename from plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarOptions.java rename to plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarOptions.java index f32ad8d4..a0589ead 100644 --- a/plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarOptions.java +++ b/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarOptions.java @@ -1,4 +1,4 @@ -package org.maplibre.pluginscalebar; +package com.mapbox.pluginscalebar; import android.content.Context; diff --git a/plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarPlugin.java b/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarPlugin.java similarity index 99% rename from plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarPlugin.java rename to plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarPlugin.java index e4c993fa..4094da85 100644 --- a/plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarPlugin.java +++ b/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarPlugin.java @@ -1,4 +1,4 @@ -package org.maplibre.pluginscalebar; +package com.mapbox.pluginscalebar; import android.view.View; diff --git a/plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarWidget.java b/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarWidget.java similarity index 97% rename from plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarWidget.java rename to plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarWidget.java index 0d4dbf2a..8679a134 100644 --- a/plugin-scalebar/src/main/java/org/maplibre/pluginscalebar/ScaleBarWidget.java +++ b/plugin-scalebar/src/main/java/com/mapbox/pluginscalebar/ScaleBarWidget.java @@ -1,4 +1,4 @@ -package org.maplibre.pluginscalebar; +package com.mapbox.pluginscalebar; import android.content.Context; import android.graphics.Canvas; @@ -17,10 +17,10 @@ import androidx.annotation.ColorInt; import androidx.annotation.NonNull; -import static org.maplibre.pluginscalebar.ScaleBarConstants.FEET_PER_MILE; -import static org.maplibre.pluginscalebar.ScaleBarConstants.KILOMETER; -import static org.maplibre.pluginscalebar.ScaleBarConstants.KILOMETER_UNIT; -import static org.maplibre.pluginscalebar.ScaleBarConstants.MILE_UNIT; +import static com.mapbox.pluginscalebar.ScaleBarConstants.FEET_PER_MILE; +import static com.mapbox.pluginscalebar.ScaleBarConstants.KILOMETER; +import static com.mapbox.pluginscalebar.ScaleBarConstants.KILOMETER_UNIT; +import static com.mapbox.pluginscalebar.ScaleBarConstants.MILE_UNIT; /** * The scale widget is a visual representation of the scale bar plugin. diff --git a/plugin-scalebar/src/test/java/org/maplibre/pluginscalebar/ScaleBarPluginTest.kt b/plugin-scalebar/src/test/java/com/mapbox/pluginscalebar/ScaleBarPluginTest.kt similarity index 99% rename from plugin-scalebar/src/test/java/org/maplibre/pluginscalebar/ScaleBarPluginTest.kt rename to plugin-scalebar/src/test/java/com/mapbox/pluginscalebar/ScaleBarPluginTest.kt index 65fee4bb..e89bab36 100644 --- a/plugin-scalebar/src/test/java/org/maplibre/pluginscalebar/ScaleBarPluginTest.kt +++ b/plugin-scalebar/src/test/java/com/mapbox/pluginscalebar/ScaleBarPluginTest.kt @@ -1,4 +1,4 @@ -package org.maplibre.pluginscalebar +package com.mapbox.pluginscalebar import android.content.Context import android.content.res.Resources @@ -136,4 +136,4 @@ class ScaleBarPluginTest { verify(exactly = 2) { mapboxMap.cameraPosition } verify(exactly = 2) { scaleBarWidget.setDistancePerPixel(50_000.0) } } -} +} \ No newline at end of file diff --git a/scripts/generate-activity-test.js b/scripts/generate-activity-test.js index 69f10ece..c419a5ec 100644 --- a/scripts/generate-activity-test.js +++ b/scripts/generate-activity-test.js @@ -14,10 +14,10 @@ global.camelize = function (str) { } const excludeClasses = JSON.parse(fs.readFileSync('scripts/exclude-activity-gen.json', 'utf8')); -const appBasePath = 'app/src/main/java/org/maplibre/android/plugins/testapp/activity'; -const testBasePath = 'app/src/androidTest/java/org/maplibre/android/plugins/gen'; +const appBasePath = 'app/src/main/java/com/mapbox/mapboxsdk/plugins/testapp/activity'; +const testBasePath = 'app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/gen'; const subPackages = fs.readdirSync(appBasePath); -const ejsConversionTask = ejs.compile(fs.readFileSync('app/src/androidTest/java/org/maplibre/android/plugins/activity.junit.ejs', 'utf8'), {strict: true}); +const ejsConversionTask = ejs.compile(fs.readFileSync('app/src/androidTest/java/com/mapbox/mapboxsdk/plugins/activity.junit.ejs', 'utf8'), {strict: true}); if (!fs.existsSync(testBasePath)){ fs.mkdirSync(testBasePath); @@ -70,4 +70,4 @@ for(const generatedClass of generatedClasses){ console.log(generatedClass+"Test"); } -console.log("\nFinished generating " + generatedClasses.length + " activity sanity tests, excluded " + excludeClasses.length + " classes.\n"); +console.log("\nFinished generating " + generatedClasses.length + " activity sanity tests, excluded " + excludeClasses.length + " classes.\n"); \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 5fa41572..b5b13d71 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,5 +4,5 @@ include ':plugin-offline' include ':plugin-localization' include ':plugin-annotation' include ':plugin-markerview' -include ':ktx-maplibre-maps' -include ':plugin-scalebar' +include ':ktx-mapbox-maps' +include ':plugin-scalebar' \ No newline at end of file