From dad70ecb59ad8ee4d0b0dad4983f4ae80804a693 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sat, 18 May 2013 02:06:27 +0200 Subject: [PATCH] New icons --- .../ax_1_navigation_next_item_light.png | Bin 0 -> 1721 bytes .../ax_1_navigation_previous_item_light.png | Bin 0 -> 1725 bytes .../drawable-hdpi/ax_2_action_about_light.png | Bin 0 -> 2257 bytes OsmAnd/res/drawable-hdpi/bicycle_dark.png | Bin 0 -> 2310 bytes OsmAnd/res/drawable-hdpi/bicycle_light.png | Bin 0 -> 2206 bytes OsmAnd/res/drawable-hdpi/car_dark.png | Bin 0 -> 1740 bytes OsmAnd/res/drawable-hdpi/car_light.png | Bin 0 -> 1621 bytes OsmAnd/res/drawable-hdpi/pedestrian_dark.png | Bin 0 -> 1658 bytes OsmAnd/res/drawable-hdpi/pedestrian_light.png | Bin 0 -> 1496 bytes .../ax_1_navigation_next_item_light.png | Bin 0 -> 1721 bytes .../ax_1_navigation_previous_item_light.png | Bin 0 -> 1725 bytes .../ax_2_action_about_light.png | Bin 0 -> 2257 bytes OsmAnd/res/layout/calculate_route.xml | 7 +++--- OsmAnd/res/layout/navigate_mode.xml | 21 ----------------- .../plus/activities/MapActivityActions.java | 4 ++++ .../net/osmand/plus/views/RouteInfoLayer.java | 22 ++++++++---------- 16 files changed, 18 insertions(+), 36 deletions(-) create mode 100644 OsmAnd/res/drawable-hdpi/ax_1_navigation_next_item_light.png create mode 100644 OsmAnd/res/drawable-hdpi/ax_1_navigation_previous_item_light.png create mode 100644 OsmAnd/res/drawable-hdpi/ax_2_action_about_light.png create mode 100644 OsmAnd/res/drawable-hdpi/bicycle_dark.png create mode 100644 OsmAnd/res/drawable-hdpi/bicycle_light.png create mode 100644 OsmAnd/res/drawable-hdpi/car_dark.png create mode 100644 OsmAnd/res/drawable-hdpi/car_light.png create mode 100755 OsmAnd/res/drawable-hdpi/pedestrian_dark.png create mode 100644 OsmAnd/res/drawable-hdpi/pedestrian_light.png create mode 100644 OsmAnd/res/drawable-large/ax_1_navigation_next_item_light.png create mode 100644 OsmAnd/res/drawable-large/ax_1_navigation_previous_item_light.png create mode 100644 OsmAnd/res/drawable-large/ax_2_action_about_light.png delete mode 100644 OsmAnd/res/layout/navigate_mode.xml diff --git a/OsmAnd/res/drawable-hdpi/ax_1_navigation_next_item_light.png b/OsmAnd/res/drawable-hdpi/ax_1_navigation_next_item_light.png new file mode 100644 index 0000000000000000000000000000000000000000..c36e050a396805e66faad8c6488b75ab2e32fbf1 GIT binary patch literal 1721 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 literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-hdpi/bicycle_light.png b/OsmAnd/res/drawable-hdpi/bicycle_light.png new file mode 100644 index 0000000000000000000000000000000000000000..db2b1afd25be29c1509eaf7212b7b45cb5b0c3bb GIT binary patch literal 2206 zcmV;P2x0e$P)9V_kX{nk(!$7F8fO+q}w{%@TRsxiWZRp3Q30Aa7r7=-# zr8WHn6h)(yHvUmdtbk&b#%{or+Gw!0;})aLy!!?R2h#*+o3>&iYPzt6*=6S*|L{I~ z`xw{-3T>0U$s}{nJ?GqW?meIP5i{e1JOn=AV^o1r1x6JZRbW(sQ3Xa7crQol{U}rz zhHXUjeIm+vp10{jxb%K2=8DDQ0*r2suc0S<&prN5* zmMwf@{1?EZCr_Tdv$eH#@QOGwGan|R1pwIiQPpvr$*$`j9|^tI`c-RM0k9W9A2Ywy z+uQr+uCA`yNM*SsC(h^dQ-lzn5aLtJyxJ(W!uS1WM;gABQg0bsKP07euWBA>YisNE zeSeSE`tOzvfAJz%XaL6y-Hgl0N0*hzh^XC~&R0sMhoezSH7cck2q0^2ZcG$K*{iNV zp-}iRfMph_8Nerp5q>U!B7iR?e4_QLD?mi6l0kroZm)-%%jHr^sZ9V50GMvTRf}%s zd!fKRaZmzqDt6=~&oB&^G&ME-3BX26;R8a5yDVNeUsVN)#bP^vkHrTJ;Cb`^`Y4Jz zy1TobD2nb1_t(Mty7syW&psL zq$3kiL2JFm_x-&9bS{@mH8(f!G&PVtmR}JCy1TobY&JVn2r?nIyoPOn51<1;qgmRel$y%S3(Wkl zK@b#jxm?Orp?d+ur!~J`z+mQ`#>~LXTcnhc6#yWFST3bJ1z@)UH3H~h=KHnQyv?-eQKK>(izKt_O_0MOjr{9+VEGo+ON2GC>hr-xxUD{(OE z0NiAze@my+yK}i*hMAwY%q|WNKdy5C4`G<#N+G3RJ7rM~LW_1koP>Y!E`+ zZg4*rm(Gsk{5%Z94gm9+`45FcVG=X%t(Vl4Qd5a&a~#BoXzkF@&{HifEq4S#a0tL5 zb0|R+MK_z9Sp?u4NyjFlTdLLSBkxckilRjT)>?S|M0B^5a-NiOv+KG?lv0ZUOfnli z=eq83A;f15{&ht3WICPxl}T&>aL3zw(hkcMe*oY%04{)g4ZqFS-WvfxO8JtM@>^2M z`Q~Qq&TOrb8KP7wjb-NTv1tG}t+l?%^SoaqdVqJtegnJFf-S4nY94^R0nJfLO;t*L zg_#$|ouuP9zh~yJ8v2F#e15tKv1J4ML@Zo9JkR@y@y7wH4cJ~PmBxy}!NJ7>aBy(35JChN@K}F;|6}L$if7KOjH3sDpT)7+_x&OO`=*xL zPHD`t!Q9ZdJ-D4#05$*Tt_3%-mC{R5mknBY;^}N%DeSp)m7zO%#lM zVW}-gS65d}DWw2>I(B*iKw82aN(x^pl_mo4EYL~-Uypx8v@Ah#uMz%iK&aJfpE0-Q z0XSQO=34THueGNz0`77YyGvkbLYMh z*G`GG583n1&dwo|Ku-gB)p49R>aZMV{qGY1Ld%5wB=)pv(+1M%^lTz(KhN)R3%#nf z?jWLeW?nipG&Cs)f+x>DKU6A5;@;tW`}w}VPY7{CrBazDr94xo53y-N3d3+cfH*On z1~A!V)sa@G`vEM86Q7iF-Z1zFOh^QP-$^N#Uc_G40(cF;H3syc5JKcFoNE9)aS;qx zTEc^f@+0WvY@8*A$4JK$mhccl5L z#|^LH4(mPuT^4A+>$*L{IMW&cC#=P7N~veemDPKcTCcTM047)wY~64Vx&Yw1?lERw zXMrYYt(8)0eZA^fDRr$<>KOprEbs{<^V=_TVHkdah_)x_PZLp*nU#qk9snP}#6+HW z&iDOWFYYJkNXaa$fhMC|YES$tlC2 z?$=tc34-AD5k2mjFC}dN0%JDg04UR>7aAHGUYIjy&Rg%sSD8|&G}aVmfhldIG1(A6 gK?spI!RDOtKS2$=v$8uL3jhEB07*qoM6N<$f@m@l%K!iX literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-hdpi/car_dark.png b/OsmAnd/res/drawable-hdpi/car_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..58bd3d9b2a7981412e43d934b02502faf9e68fc9 GIT binary patch literal 1740 zcmV;-1~d7IP)$&Z5m`dA9zdND84!_v zlD7c#1Ly&8PHR0pSKFMe14^j{BGO9oH2|*ysE(;(6u@~AIYqKdYkg-nJYqZ0*w{F~ zrlw|xi0l9`Z#G6PxJR;MWMrh{>eZ|N#F-e`ftHq*)ZM#x-viJNU{QRIkuV6LJ)KS; z?e6ZLh%zCP14^mq0GtG{W^Vio7YqVXZ*H|l`-0r|~b z2cSNV9+It|=UoUB3U$DB-FHOf5P+x37|V%Bm)VTh!UUC4%gyF*1>ls?J4Uk2^SmE| z1Ogo}Zi>*b`)cQn*0bB!+6_G=^ zT+X(>tx!s7l%^e{0G>%9f0HV?jF<#26eQW)+`NJ0Cy7L2LzzFg7Cac5Kowpp;q;;1A2(gLE9{IDpN*fuZs7@rG0?RY!6$$;AK`i^wtn zZ-kHrfMJr`wbn-pYn~(>$9W&X*C<_DGwhN)DI&j#$ZY@vQ&Us7$H&J9s;jH}P@3MH zNSO<`U(tf9s;cR$U7Wo~a=Yhwhl`&XN4`}`0l=Y<=?g_!lg>7twDn(5(S0R*btHalqvW5aUXy!2PvLR zlFI=s^F9B@bzOvnQ9rJW$Q6?1Lfu9HPZvKRc`Noo=Ev&Qs~1*PRec5EE#FYNgY5L= zf1hh#^9(SxP~6A5AAFhZ!DhEl55RO@Vd zItmSu=~QB5WTXT6+}w{A#q?SNLb}6M! z#Mu*3p_HmM)wm$?LjX4UTTdnFwAT8jIXK2_TFk4x7&khF!RWdevTVjkw%S@w*870x zc^62wh1gsrBHga*o{4+d6(f_$G`X&O##G;edIKfsUjleNK<-BXpFNTm zQvtJR^4*6o?Tt9*$K0EI1w6@Z)<}0^t@X`xI-LQ~2K!-GDGUN=OQ+MBDCB|v)29Z0 i{AWM*u;FojZu2kXI8Z*QmgSHD0000#9W zK~!ko)tXIgR8sP`d%B+P0<8cAvSbLG-`yJD8>*Yph*{e z7*h?b2#9W2LK;L88WN;2sU*yOr75Y9Xn~NFQi7|Ic7P7YMQ?F9oj6y6L@h z&;Q)>dCz&Gs!W%B->(MN0?k0Jh&->VwLp#CGAtrPs(KR`0=j`SuIr9Ym$#HEfbaVY zM5IMkHvn$|l?ji?0%t|!q^fqhu6t)z1Q-|?m^U^ywp~QF19K@4-Bs0&s;a7vl`B{N zGa~|YcXy}e&!7Jx&<-qOW@rRx&tx)3nwy))%O-&D`!50~fK|*6T?96|u6twJ0vKc7 z5Rpz`VUf&lTSpzXe^_U(0cw++qpB^Q=k=5+KKwXR`-V8IRDFRrBO-I?Ps&v`T+fX-0#5o6455!o3PoidqBQ+|kb@>gw~j|0DJ2EhZU=XtwS zb#KJ_DvNQd1_lNO=4G?lzrvD~s&;yww`qpK2Q_g#!kk7bD=S}}%-D}KFg7-}JtD*Q zi^%3#1P`E=XMf1rB8&Au4fwvl0Jt7j+oDXwZdL6HS(-a(UMUN7Lxkh*DAk7h`ubiPA0J;KB9hDH{%C4yx?YMIs_KrgL}xJ{ z7Gq2`@OMZ(@4K$+6cEy!;0ka-L=HAIH1sFP5hkSU$O6x$ z>`Q9OW5gD41#h~yw|AYYeg>=)k+{9pKm*XAs#|^EKc}kuJ@zSl<3^pAPN!FkNUMl!0$zyNH>j%TEr8X)lEC^J5n1E={s_Tj*Bt+@y+ zdqQ|Li!tUHuql|fD=I2p86O|7QPst&x)@k2B1?gHVn73os_N&S=N-g(&T7g0(q11^Uw9Z1$Z>^ZUOcdI=rr~?l$mVZ*Omps^*8#B_a}KE?>K@ zyE}oYv_vSV+X2ql!YCN;T9VjfLqo$4B675dQ2R>~@G)4jz!}GO7tV&|opd@~pM+5^ zm;0j7o>VIJY0}$;%`C>3kVs`SXy}Kcs z)*EA*6EeIUvv#S3CuLaI?(Sr@?ARLRj;eMe>-L^ z>P_sr?u|?)(*(3dB)f9a2+)?vWSWWrU$h4D>8btHAjGVm&W}B!k`PbmbDMtw);B3* T;+B?000000NkvXXu0mjfR=4cG literal 0 HcmV?d00001 diff --git a/OsmAnd/res/drawable-hdpi/pedestrian_dark.png b/OsmAnd/res/drawable-hdpi/pedestrian_dark.png new file mode 100755 index 0000000000000000000000000000000000000000..eb1a32bc1abc655a95c32931043d9b381a64f0e6 GIT binary patch literal 1658 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 --> + android:layout_gravity="center" android:layout_width="64dp" android:layout_height="64dp" android:layout_marginLeft="10dp" /> + android:layout_gravity="center" android:layout_width="64dp" android:layout_height="64dp" android:layout_marginLeft="10dp" /> + android:layout_width="64dp" android:layout_height="64dp" + android:layout_gravity="center" android:layout_marginLeft="10dp" /> - - - - - - - - - - - - diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java index 4ac9dfd280..0fe663fada 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java @@ -516,11 +516,15 @@ public class MapActivityActions implements DialogProvider { final TargetPointsHelper targets = getTargets(); View view = mapActivity.getLayoutInflater().inflate(R.layout.calculate_route, null); + boolean lc = mapActivity.getMyApplication().getSettings().isLightContent(); final CheckBox nonoptimal = (CheckBox) view.findViewById(R.id.OptimalCheckox); final ToggleButton[] buttons = new ToggleButton[ApplicationMode.values().length]; buttons[ApplicationMode.CAR.ordinal()] = (ToggleButton) view.findViewById(R.id.CarButton); + buttons[ApplicationMode.CAR.ordinal()].setButtonDrawable(lc ? R.drawable.car_dark : R.drawable.car_light ); buttons[ApplicationMode.BICYCLE.ordinal()] = (ToggleButton) view.findViewById(R.id.BicycleButton); + buttons[ApplicationMode.BICYCLE.ordinal()].setButtonDrawable(lc ? R.drawable.bicycle_dark : R.drawable.bicycle_light ); buttons[ApplicationMode.PEDESTRIAN.ordinal()] = (ToggleButton) view.findViewById(R.id.PedestrianButton); + buttons[ApplicationMode.PEDESTRIAN.ordinal()].setButtonDrawable(lc ? R.drawable.pedestrian_dark : R.drawable.pedestrian_light ); TextView tv = ((TextView) view.findViewById(R.id.TextView)); tv.setText(generateRouteDescription(fromOrCurrent, to)); diff --git a/OsmAnd/src/net/osmand/plus/views/RouteInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/RouteInfoLayer.java index 852078c5bb..8312ac48f3 100644 --- a/OsmAnd/src/net/osmand/plus/views/RouteInfoLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/RouteInfoLayer.java @@ -17,10 +17,9 @@ import android.util.DisplayMetrics; import android.view.Gravity; import android.view.View; import android.view.WindowManager; -import android.widget.Button; import android.widget.FrameLayout; -import android.widget.ImageButton; import android.widget.FrameLayout.LayoutParams; +import android.widget.ImageButton; import android.widget.LinearLayout; @@ -28,9 +27,9 @@ public class RouteInfoLayer extends OsmandMapLayer implements IRouteInformationL private OsmandMapTileView view; private final RoutingHelper routingHelper; - private Button next; - private Button prev; - private Button info; + private View next; + private View prev; + private View info; private int directionInfo = -1; private DisplayMetrics dm; @@ -58,20 +57,19 @@ public class RouteInfoLayer extends OsmandMapLayer implements IRouteInformationL DisplayMetrics dm = activity.getResources().getDisplayMetrics(); ll.setPadding(0, 0, (int) (dm.density * 15), (int) (dm.density * 50)); fl.addView(ll, new FrameLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, Gravity.BOTTOM | Gravity.CENTER)); - prev = new Button(activity); + prev = new ImageButton(activity); prev.setContentDescription(activity.getString(R.string.previous_button)); - prev.setCompoundDrawables(activity.getResources().getDrawable(R.drawable.a_1_navigation_previous_item_light), null, null, null); + prev.setBackground(activity.getResources().getDrawable(R.drawable.ax_1_navigation_previous_item_light)); ll.addView(prev); - info = new Button(activity); + info = new ImageButton(activity); info.setContentDescription(activity.getString(R.string.info_button)); info.setPadding((int) (dm.density * 8), 0, 0, 0); - info.setCompoundDrawables(activity.getResources().getDrawable(R.drawable.a_2_action_about_light), null, null, null); + info.setBackground(activity.getResources().getDrawable(R.drawable.ax_2_action_about_light)); ll.addView(info); - next = new Button(activity); + next = new ImageButton(activity); next.setContentDescription(activity.getString(R.string.next_button)); next.setPadding((int) (dm.density * 8), 0, 0, 0); - next.setBackground(activity.getResources().getDrawable(R.drawable.a_1_navigation_next_item_light)); - next.setCompoundDrawables(activity.getResources().getDrawable(R.drawable.a_1_navigation_next_item_light), null, null, null); + next.setBackground(activity.getResources().getDrawable(R.drawable.ax_1_navigation_next_item_light)); ll.addView(next); }