From 590402c02877d9a2c1f82fdd892c06888f267e40 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Wed, 23 Nov 2011 01:31:14 +0100 Subject: [PATCH] Revert "complete navi color consistency" This reverts commit 6a8dcedfacb2e44537962ae77467f302bb446375. --- OsmAnd/res/drawable/closed_poi.png | Bin 3080 -> 1742 bytes OsmAnd/res/drawable/opened_poi.png | Bin 1869 -> 2029 bytes .../activities/search/SearchPOIActivity.java | 6 +++--- .../net/osmand/plus/views/MapInfoLayer.java | 2 +- .../plus/views/PointNavigationLayer.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/drawable/closed_poi.png b/OsmAnd/res/drawable/closed_poi.png index 3c69be83109bc9abe2cde39910a5be8bc99cef2a..e1819ca1c1246444f8ec10158f586b92d5a685f7 100644 GIT binary patch delta 1727 zcmV;w20;0U7|solBYyw{b3#c}2nYxWdxUCo{H zbKv|%aJ~~n5`RPlA_8L!jIqr9#uyl5ptWAI6iUrPsq;|kXABSPM*}c8*a;yHLx`8a z`6h7ATV}=Evk#!PZk?4UO<|DiF*Cs!vh!`JOm+*K!{EVAs~dvi07PF0#Hh2 zAks8lvU#NGr>NI|dawWk18X6~TafYqgbUDW{k`Zj>`W8l0aC_H9m;$sjY%R>lo{s#K`I(@k!k3_G5sH0VoVXyF< z=lo(0rI6MdLp(^CV{E4k-+sG*0ILLmrW2hq#u>FLO)5Yh7>THhK;V^$@V-0{Gs zkWCMpTCvn=r%c|O+G-#=0O0#}1iHHkj6GdRa45VheF{}c(=f=h=@r%X{F zMVf#u%?Q||>JN)RER2l;04Swebx=ik6)nwc>jZ!exj$qn^WV!rY&4{lt>4?HP*veE z9ocI_{QY&t%R(s-~6?k0><1a^=4J!E&yW;S~pkQ z>^1+sDj-EsGiF`@_#4LTUAAanxVyq&pZV@M;7;Own4&(4Gyw|&#>`a`?Jf((%%+Y7 za9<_dWt5^e+`h_Sj9Cyc<^}+r6MyQ9E)s8r*+-+jHv|xiLJT6LrwOBB%p756MnUVj z9BrBS(BhQ4&grkT+0Q;i3?>HA)^{B{at825Q;)sO2uI= z0d_`a%oS*T3&uR26JO+gB5D<_3t$V_O`*_&ZW%~ONAr9a#{2=;Iq~$ghJP_X7JAw5 zC?qDlzS*`=I>p*7ijFatFg>l?5om^a7FxdmV`SyD@n6hb?}s7~0fo zu|BoFim9nzUCH^iQLR6R)_>cfwaBGRQR=u)o9x^*yEbaYxx!-**(ltH)?fH?^Q+U7 zlZ#O5GbojBG!*s+nL@EtQtCdGI)ll{TfW?)4UVT!s~!7~Y;b&tiHWNrnPpo{dm!bz zkh1e%+G1)TNj}E-_%AVuRW|vafRyh;%5{%;lWze@@(ISqqWfdj0Dk~rU|=JJI07l3 zc|_Z+vq;mk7#+P^CT+PJ-3KAWn-F5tL)z$GM4FyMy?&vpq?P=u!5RqhDug%$&L0cr ze;Gi&4(5@j-yluTqh4QJj-1u}vj>6m{owpCI6nX)k*fh8Ap2sNK&fj`>RTxF1BQpy zN@T1Yz&%Dr)`Ms#h&Z-^Xe$`o2F5l6&;Swu4H(maG4s&+cW8YTTK|cmp=7mP{{ycG V3g-*RtRyI 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 diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index aa4b0d706d..cd1e8dd8a2 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -834,7 +834,7 @@ public class SearchPOIActivity extends ListActivity implements SensorEventListen public DirectionDrawable(){ paintRouteDirection = new Paint(); paintRouteDirection.setStyle(Style.FILL_AND_STROKE); - paintRouteDirection.setColor(Color.rgb(255, 102, 0)); + paintRouteDirection.setColor(Color.rgb(100, 0, 255)); paintRouteDirection.setAntiAlias(true); int h = 15; @@ -855,11 +855,11 @@ public class SearchPOIActivity extends ListActivity implements SensorEventListen public void setOpenedColor(int opened){ if(opened == 0){ - paintRouteDirection.setColor(Color.rgb(0, 205, 0)); + paintRouteDirection.setColor(Color.rgb(100, 0, 255)); } else if(opened == -1){ paintRouteDirection.setColor(Color.rgb(150, 150, 150)); } else { - paintRouteDirection.setColor(Color.rgb(238, 0, 0)); + paintRouteDirection.setColor(Color.rgb(220, 100, 80)); } } diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java index ea2ff3eb09..35ca921438 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java @@ -126,7 +126,7 @@ public class MapInfoLayer implements OsmandMapLayer { paintMiniRoute = new Paint(); paintMiniRoute.setStyle(Style.STROKE); paintMiniRoute.setStrokeWidth(35 * scaleCoefficient); - paintMiniRoute.setColor(Color.rgb(255, 102, 0)); + paintMiniRoute.setColor(Color.BLUE); paintMiniRoute.setStrokeJoin(Join.ROUND); paintMiniRoute.setStrokeCap(Cap.ROUND); paintMiniRoute.setAntiAlias(true); diff --git a/OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java b/OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java index 933b480528..066ee157c8 100644 --- a/OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java @@ -34,7 +34,7 @@ public class PointNavigationLayer implements OsmandMapLayer { private void initUI() { point = new Paint(); - point.setColor(Color.rgb(255, 102, 0)); + point.setColor(Color.rgb(250, 80, 80)); point.setAntiAlias(true); point.setStyle(Style.FILL);