From b3444f7f475a3a013f6cc81ea6dfbd361e35d143 Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Mon, 11 Jul 2016 15:33:08 +0300 Subject: [PATCH] Added new bookmark type on Android --- .../ic_bookmark_marker_hotel_off.png | Bin 0 -> 680 bytes .../ic_bookmark_marker_hotel_on.png | Bin 0 -> 749 bytes .../ic_bookmark_marker_hotel_off.png | Bin 0 -> 473 bytes .../ic_bookmark_marker_hotel_on.png | Bin 0 -> 479 bytes .../ic_bookmark_marker_hotel_off.png | Bin 0 -> 880 bytes .../ic_bookmark_marker_hotel_on.png | Bin 0 -> 920 bytes .../ic_bookmark_marker_hotel_off.png | Bin 0 -> 1388 bytes .../ic_bookmark_marker_hotel_on.png | Bin 0 -> 1308 bytes android/res/layout/fragment_color_grid.xml | 2 +- .../maps/bookmarks/data/BookmarkManager.java | 1 + 10 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 android/res/drawable-hdpi/ic_bookmark_marker_hotel_off.png create mode 100644 android/res/drawable-hdpi/ic_bookmark_marker_hotel_on.png create mode 100644 android/res/drawable-mdpi/ic_bookmark_marker_hotel_off.png create mode 100644 android/res/drawable-mdpi/ic_bookmark_marker_hotel_on.png create mode 100644 android/res/drawable-xhdpi/ic_bookmark_marker_hotel_off.png create mode 100644 android/res/drawable-xhdpi/ic_bookmark_marker_hotel_on.png create mode 100644 android/res/drawable-xxhdpi/ic_bookmark_marker_hotel_off.png create mode 100644 android/res/drawable-xxhdpi/ic_bookmark_marker_hotel_on.png diff --git a/android/res/drawable-hdpi/ic_bookmark_marker_hotel_off.png b/android/res/drawable-hdpi/ic_bookmark_marker_hotel_off.png new file mode 100644 index 0000000000000000000000000000000000000000..9e814a8c2b73cec0f1b6179476b505f1c1afe01c GIT binary patch literal 680 zcmV;Z0$2TsP)gww4?d`_K z#@^oET|_?DKI_4W1i^z^v6xZd90 z`uh6l=;-|X{QUj?&)DRnwabH=xon86Vt}Xh_xZ2B(rbsTUVWs<(%}95{-CnSlBdGa zXc;O1001O(QchC<0w7$D!`}1*E`#m=|NsC0|48Wn|Ns91GSvSCs{axH|10p#^#fo4 z00ERqL_t(|0hE=6)+-?lgj2V``cn6<3zheOwX0BP|C8@n1)UiZ_@LG9bbI~5px^6u z+Aa8j;b=TT#x2`%Y>P9Tj7LK-({erZogfs7FmQbIT+=qw*&OYKcw=GXd^UwIELUi) z#TV8Vu9on@X3n<4z>du~@W%eYkHW~2ANFtK@f3*$q7%N%*c?uwXe2xxHc$7R^QZOW zB+c@o$g?zwpZ4JM`^~2-_Bel8)$&eVm5+O{l~#9#4}H$Ld?7yz%@$|M-?=3em#h5X zdJzh1{@-&K*LwU-e&MEPtkM0KH_sM|tNhAUC~WU<5=Xeu=a&ZbJr+0ufU&Rj$)$l@ zYvqptS`$ZotE7=i4RIzdXk(!Ks-=-yIT&CYI!uKkkqsm&AglvjuC_~M1F0IsyU^3F zWwL=xd)I@$b|IGyP(Tsd%;l)ysI+ zx@Js0aOU=h&)@Dme%-TZpR7lH?bNN?k6xR-?pR#y61(I{N81lb0W?-hDo&V~tLSlN7_;UB+zU%umP zX6vdqAHHY@w}+Q6=w7&2(XaI`tLQzTXPird{DK*{+$t9wzyIc^SizzHcAI}Y9(Isi z=J}!cFT3b5d!U_!f%wa0?xhS2j1xRv978G?mtGHTy6qsqazQ9~=FFMX6wjRe`+keS zI~R+;b-A90gL_M+z1=ZSz9sQN^}6I}4c)HE6P#uo5j?fxs)CS7S2 z`|MTOgq7FR8|(Nb*__3s_$H)1*(6fl^1nx2C)4Pdy_@hfGfBsy$VTqO171f~d~I8k za^rCRTs!So&=>t zF>6nrE!%!mzVFO5hA@r!wsUPQ)%DNq+r4L3+}%6(3|%u0E;F$I{cc|Rq3-GHt(+_=mv%7yKe|$i}!@!8Sw!gp3OwZJ)_@KGw{QUWU4;k_Q z=Fs?9_xYpo$@Q5UEF76SS8QbhBAzZ1IIz4xO@wzw`o9hA*Z(An_x(J~m&5f*{-^!T z4NjNaow+@H1OfO*H?6j$F!Bal2%?Vtl#V*fyCTiP7frcx^z^G>MboFyt=akR{0OKWW AbN~PV literal 0 HcmV?d00001 diff --git a/android/res/drawable-mdpi/ic_bookmark_marker_hotel_off.png b/android/res/drawable-mdpi/ic_bookmark_marker_hotel_off.png new file mode 100644 index 0000000000000000000000000000000000000000..fc2164d6121510a6ec94536bbb9e987940252e38 GIT binary patch literal 473 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyr2#%6u0R?HR;^lf?%cWS*RS8c zef!?Mdkzi`=g*%9GM+zw{_*3-@87@w`t|GY-@m6$oqF)#!Mk_w{`~p#|Ns9RH*UOo z_3HQU-<_SEckkZ)@Zm#4L&KLZU;h04ck0T+>8pufBBe%98sPI{V*(wRvU+yI+?7HSoJ^ z@#XGWw>F2C%2Q`fS0&F3R^z|vc;sX5?_Y=Z6)q99+?X`&*>`cyeLcDiTZFgmuR9PY zB<)yevF~Yc!b1;P){yCDe}B39e_zKn%YF94=!6B;{>*ompZ%e0aB1)QX2A<-zr<#| zurp9;bS_h5)vVbZ_SB_wrC7J>^ynOkollP}n|eD=PA2n9%R|v)|Cu(}`aP^rI?f4- NAx~F7mvv4FO#n-A0B`^R literal 0 HcmV?d00001 diff --git a/android/res/drawable-mdpi/ic_bookmark_marker_hotel_on.png b/android/res/drawable-mdpi/ic_bookmark_marker_hotel_on.png new file mode 100644 index 0000000000000000000000000000000000000000..190e1ce2cedbfa7d65f94407669f373e241d346d GIT binary patch literal 479 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU3?z3ec*Fy#(g2?jS0F9x*(~i^E9F)z2_#+X zBwg#2-5R9a>m=QP>{{*61}V2X8IJ}a`~Uy{KvE{O52Vbk-XyB$;MqH0zWrFX{p{kc zr(0(4Ol@A_o;6(~uobBC!{=`oZ$900@bcsphf4c5hL+A(@M=7B?UAHgZAy^pU7*G4 zB|(0{49Z1I_uu?1)^zzlPkqn}#($ivnt{5}z^9BW)yhCEpFCY0Ln;`1uZAYII0&#@ zI5hLv-N!e7-#3^S=ltp~!{b{IW~ExMd;WXg>l#E)P@VMYRm6dBe zgkw%WiV1sK*v9RuIr|ioRdf+s;;v3vX6A%zU}cp*Xm5aXL`AD z_q9cre8lgal`!Y3`q295vC5RouGhPx-rjo3wX0x9)48Kf*`K1ic)PVTKDIM06ma_W zU{iSGzL+s7xE%j@OmA3JQ9wpb}j66kvdPgg&ebxsLQ E0LAm)6#xJL literal 0 HcmV?d00001 diff --git a/android/res/drawable-xhdpi/ic_bookmark_marker_hotel_off.png b/android/res/drawable-xhdpi/ic_bookmark_marker_hotel_off.png new file mode 100644 index 0000000000000000000000000000000000000000..f2b00f47e4e94f43d66136a4e057d54c59018937 GIT binary patch literal 880 zcmV-$1CRWPP)^z^>IzWx3E&CSi#)z#hO>$AeulBdFXleB7vt73qs@ACGl zy3lZou3mkl^Y;0mvdPHO;Qjvopt8#O`}~ZezV7k$dh_^g0000kbW%=J00SgScB;wV z^blFJ{r>_!xc~qE|NsC0|4ZTj|Ns91F53V92A>qz|Nk%lTZJD@F-iac0x?NMK~#7F zl+;zC>N*q#;DzgtOBII}hgxvvKdO6=HVK;ZJ?#y|meD(jWGbD>=JNSmHj_>z6ZB6C z#ZnoPa;aD#MU`p|K)umywL4u+>vr0$W}^_s=4}>t5 zh!W*Ge?iC;g!~Qla)Od*@DC!UAmRr$kfaov@&6m9WD_rFB1LJTkGD+8R_N+9WrRVp zV@h_yV98Jxo%sJfQ?id2bdaSSy7B)WQ{u%7y2w!;Jg7cX;`6j2|9|OqZ~#CA1VJz< z|II%uUjViOxC6{|`ww^tx`}*@ev$Yp^JC)Y+yzQW1d2x*hbqUq7mHMzmMho00tO?_ z39@2@te7E7F;78LQI}!cao>f*mB*#awa>-V)z{^l^}hnzW9&udQRP|y0000s3 z1|U~E6lAQ7JBXC_Yyc{g@@NKXly0A5=g;4V&)yw6cc*3c&eY}=?pf0{0$V?P{&w-^(@h62PhN2- zv~<2%Z13+se;z!0d+_X?MVn7G&)!+oyB=ui^EV%*-0Ofgu2~YF2lS^;NswPKgNSR+ zQjeZIaMYnXBrLih#D`2f6>J?7si>>jDM_ zCUH*}$B+ufC6})kHTYnAEJj4VV#*Q0(~*~X)^Gaq`J^uI{ETbMW8xlcUR3iw z)KuciRqu6~2Uq0ItBU1Mt1Z7T?N%VszWbg@^J$yAZ}Qoe|19di%aNB{{?62viouIIg4ohGO__LfrcCOS0;PG& zdur~yTE5PF)>*f?>QQg~wqKX8__1@ciIGgNe@~l=`eWnEH}~v~Shw#&qe{b+lYe7t z)RX7R?Em=n_ILTa^Y`oITd@APWO8B0{QDN1XMg;C{(k>|Z7I*+50+1S_V>uM*o)BTt-u zD$lN)vXPNrUUiLV+s5l$&Nnh!9a**15 zYUgwLc0x9@Ma|F*mL@welGJO6f8 U|Np}r4orFsp00i_>zopr0RIrqFaQ7m literal 0 HcmV?d00001 diff --git a/android/res/drawable-xxhdpi/ic_bookmark_marker_hotel_off.png b/android/res/drawable-xxhdpi/ic_bookmark_marker_hotel_off.png new file mode 100644 index 0000000000000000000000000000000000000000..e96d32aa67d7a615e865e591b1d660ec3416c4ea GIT binary patch literal 1388 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 ct;*Z%jEzZGCSmdKI;Vst0Q5_TtpET3 literal 0 HcmV?d00001 diff --git a/android/res/layout/fragment_color_grid.xml b/android/res/layout/fragment_color_grid.xml index 46308b5cca..7f5853db4c 100644 --- a/android/res/layout/fragment_color_grid.xml +++ b/android/res/layout/fragment_color_grid.xml @@ -5,4 +5,4 @@ android:layout_height="wrap_content" android:paddingTop="@dimen/margin_half" android:gravity="center" - android:numColumns="4"/> + android:numColumns="3"/> diff --git a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java index dced9ac59e..c237296e3d 100644 --- a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java +++ b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java @@ -25,6 +25,7 @@ public enum BookmarkManager ICONS.add(new Icon("placemark-brown", "placemark-brown", R.drawable.ic_bookmark_marker_brown_off, R.drawable.ic_bookmark_marker_brown_on)); ICONS.add(new Icon("placemark-green", "placemark-green", R.drawable.ic_bookmark_marker_green_off, R.drawable.ic_bookmark_marker_green_on)); ICONS.add(new Icon("placemark-orange", "placemark-orange", R.drawable.ic_bookmark_marker_orange_off, R.drawable.ic_bookmark_marker_orange_on)); + ICONS.add(new Icon("placemark-hotel", "placemark-hotel", R.drawable.ic_bookmark_marker_hotel_off, R.drawable.ic_bookmark_marker_hotel_on)); } public static Icon getIconByType(String type)