From f3979fef897f645e9df913dda44fdd1bee42cebb Mon Sep 17 00:00:00 2001
From: Alexey Pelykh <alexey.pelykh@gmail.com>
Date: Thu, 5 Feb 2015 14:56:46 +0200
Subject: [PATCH 01/26] Plugins

---
 .gitignore                                    |   3 ++
 .../res/color/switch_ex_button_text_dark.xml  |   6 ++++
 .../res/color/switch_ex_button_text_light.xml |   5 +++
 OsmAnd/res/color/switch_ex_text_color.xml     |  19 ------------
 OsmAnd/res/drawable-large/Thumbs.db           | Bin 7680 -> 0 bytes
 .../drawable/bg_plugin_logo_disabled_dark.xml |   7 +++++
 .../bg_plugin_logo_disabled_light.xml         |   7 +++++
 ...in_logo.xml => bg_plugin_logo_enabled.xml} |   0
 OsmAnd/res/drawable/get_button_background.xml |  15 +++++++++
 .../res/drawable/ic_plugin_options_dark.xml   |   6 ++--
 .../res/drawable/ic_plugin_options_light.xml  |   6 ++--
 ...ound.xml => switch_ex_background_dark.xml} |   4 +--
 .../drawable/switch_ex_background_light.xml   |  29 ++++++++++++++++++
 OsmAnd/res/layout/dash_plugin_item.xml        |   6 ++--
 OsmAnd/res/layout/plugin.xml                  |  15 +++++----
 OsmAnd/res/layout/plugins_list_item.xml       |  14 ++++-----
 OsmAnd/res/values/attrs.xml                   |   3 ++
 OsmAnd/res/values/colors.xml                  |   2 ++
 OsmAnd/res/values/styles.xml                  |   6 ++++
 .../plus/activities/PluginsActivity.java      |  19 ++++++++++--
 .../plus/dashboard/DashPluginsFragment.java   |  13 +-------
 21 files changed, 123 insertions(+), 62 deletions(-)
 create mode 100644 OsmAnd/res/color/switch_ex_button_text_dark.xml
 create mode 100644 OsmAnd/res/color/switch_ex_button_text_light.xml
 delete mode 100644 OsmAnd/res/color/switch_ex_text_color.xml
 delete mode 100644 OsmAnd/res/drawable-large/Thumbs.db
 create mode 100644 OsmAnd/res/drawable/bg_plugin_logo_disabled_dark.xml
 create mode 100644 OsmAnd/res/drawable/bg_plugin_logo_disabled_light.xml
 rename OsmAnd/res/drawable/{bg_plugin_logo.xml => bg_plugin_logo_enabled.xml} (100%)
 create mode 100644 OsmAnd/res/drawable/get_button_background.xml
 rename OsmAnd/res/drawable/{switch_ex_background.xml => switch_ex_background_dark.xml} (84%)
 create mode 100644 OsmAnd/res/drawable/switch_ex_background_light.xml

diff --git a/.gitignore b/.gitignore
index 4f90608b8a..5fe2a52529 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,5 +29,8 @@ out/
 # MacOSX
 .DS_Store
 
+# Windows
+Thumbs.db
+
 # Output files
 /build
diff --git a/OsmAnd/res/color/switch_ex_button_text_dark.xml b/OsmAnd/res/color/switch_ex_button_text_dark.xml
new file mode 100644
index 0000000000..2f3ae3f24b
--- /dev/null
+++ b/OsmAnd/res/color/switch_ex_button_text_dark.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_checked="false" android:color="#ffffff" />
+	<item android:state_checked="true" android:state_pressed="false" android:color="#77848c" />
+	<item android:state_checked="false" android:state_pressed="true" android:color="#ffffff" />
+</selector>
diff --git a/OsmAnd/res/color/switch_ex_button_text_light.xml b/OsmAnd/res/color/switch_ex_button_text_light.xml
new file mode 100644
index 0000000000..c9eea81473
--- /dev/null
+++ b/OsmAnd/res/color/switch_ex_button_text_light.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_checked="false" android:color="#ffffff" />
+	<item android:state_checked="true" android:color="#727272" />
+</selector>
diff --git a/OsmAnd/res/color/switch_ex_text_color.xml b/OsmAnd/res/color/switch_ex_text_color.xml
deleted file mode 100644
index fdba9c612f..0000000000
--- a/OsmAnd/res/color/switch_ex_text_color.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
-		android:state_checked="false"
-		android:state_pressed="false"
-		android:color="#ffffff"/>
-	<item
-		android:state_checked="false"
-		android:state_pressed="true"
-		android:color="#ffffff"/>
-	<item
-		android:state_checked="true"
-		android:state_pressed="false"
-		android:color="#ff8f00"/>
-	<item
-		android:state_checked="true"
-		android:state_pressed="true"
-		android:color="#ff8f00"/>
-</selector>
diff --git a/OsmAnd/res/drawable-large/Thumbs.db b/OsmAnd/res/drawable-large/Thumbs.db
deleted file mode 100644
index c3d48fe3570d53804d631317e00c7dd7e80dfdbe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7680
zcmeI0c|6qL{>KMpUkce}AC$%z``BU#S&AaE8>283M#&OoOSbG;vxmNvZ7dPlvNuRV
zNOmPVA?A1HTiwTf+{eB5@qIjgzklxUanI-RoX`23b3W&NKIeTt=lz-w;qCEH*=1Z)
zkbg+35DLg4kp@EfcjaUtPvXyX3<4ns8PfG3kx2Ym2!Vj?f75@^3><*5lKe;F2yo(2
z0LkZ60BQgYfEGXppa(DjNNxX{{(sDXG2{j~a1efo7Q_vlJs@|0hyQwF11skDO#E$c
z_!qZ-vRO~}At#VgfchrZpN$X@S%@6O2I2rg0PG<O;8ziVfxtmt0pbYC>;V5Noq~{)
zk@lhAWB6C?{;?cNTGSx@wr>w|G7xEqJUB>}6~VRCpSICpg#Xt5-)xh{@Uz!{|0@ov
zb${9a_bvZg?eAy*tM>oCSCY?2^GEW@Uw!`>L0cvO2mz4e0A>ISfaKB>05$+SfCIn@
z-~w<1cmTYBlK?&dKR^H=2oM4Y14IB&fG9u=K-z0gf%9pA1mFw+29N~60a5@2KpG$e
zkOjyA<N*o*MF0|@1W*R308{~LfU^K~fCc~s&;)1!&H=OmIsje3d4L{3A7B751Y7`I
z1Q-E~0spCcBFRT2-!uMNk1|s)Y*NY6bHgthYBSJskxChKbu>wjcom>eO$rXnqFKS<
zMCNI%tpO?R<5>h3N3N+GfXOV2q5EM6f(T8GuBQ5BZ|mjs&Ks<{Z0$iqfl`lq1AFb+
z>}arTG{KRaw!!(w?c)_93q%eBo!o6xO+D>}OI3un?D7_0-Q+3q4UK0C)QoWuKFgm(
zp>&R5i-jvu(sNYw?uST!G}5|!*)dUi9K9Z|iZPvwc#te<qgiiOe)%D*xN)9Nte_St
z^TSk1Sm9jzM1${q*HldNBpo~LQ)<27AR4RYTXxS@AFNKUf0Uo);EZKBbM(NF(Z=vG
zd@4dKf~{z2$ypZD#cFc(YH=t7_xsZ_I)uT&+)TBA(o7ZK0=MzHe3*58AyP>xAi+ZI
z0dMs7`4E&aN^fp5nosTSZ8SQ!xnpIb;gY1ytIN-A8clCZzA{;vY`g+0>GP<lLK%6B
zd9Qz8opOFxXtcDwJXTy=%Q;Q7`dX%RtUKajXcE14*VN0@)KuOvyz5|y+T9;!US38O
zs%i-d35D^Z7mD?gVg8b8jcoh4or%t<i(dZYbzVfXT94W25{v3$`5P03FK@3bP0!Oh
zdtfm6TvGO}52K@_!?mM%6gfV2h1Z8BRd2~VK@ZC@-E8Bg<Bb6U1X-pK2)BNwGG~~D
z(UmJ#PPHE@*31SE6YOV(2B0frul!&7Y%L|qc|6p=eED)A9*++-d1fjbQ5J5P&cVgw
zIn}-OW%!u@Dzwmd=i6fSV?;bIA%b1<J$`_#`(AoRw)X~hZO%gJ_P2Mg2s^`pEPdzW
zyepsqu0*h$O!?DeDfDG?^ORH>r?^z4S235oTl%YH8Tj{XR2Vg5ahsdr^S%+B4%PSh
z+3sZdzEoK~Zlw4z81RSn&eFBMbfc1zlBL%{RCNJOgy6VGo~7<goZ%4MA9_CYFkX{K
zXvD&|Z>BLPRq8~0->iKyrt}Lv{4!eQGVhtG$q|<G^uiO<H!*y}l5FU6N1d*JzIyfQ
zW<*wn;GqGzcU9|$l{NyA7KUjW##OG2Ry{lQ&71Qmr~6dfh=9=ADFgBZNBt;XCH&i)
z!Db5>L4k$y7xv99ES~MBD7@BF^<MqNTQ(N?r^#;<71u6wR=Ess7D_VOK4uX$EKHM^
ze#*4kdX$cBVM?W)mSR0;@vKcz^Xnn&o)l^Aq2b}MzGuh$zOSmw%F1p%7*7xRo)gWC
z<cY-kd^i-&7`sP7g@{yk|E#H%P~kKPbzO)R(nb!}J&<tH(K|VVIm?-#l~P)H@H(p<
ze*c!BjrY^ZgwxaZ9Ta@3er8vEDIzQFS}0}F?ey1D#e|vG1usx^<@6{-Eu+LxJEBhA
zk+DY6S1TNQxkONYDq)|`U!v}eQ0`1ah;?&t^IAGR%xAj8;M!PbAC3ri#m91Uaj^<G
z;IRR*_2MmZa>y(_Jhp68z$iwptn?neg_rE@&N;!1leqD2t*$Hy3S5ofZuuoV$KIpI
z+Lx?orh8U)H|C$ENMCd8_}&r3qvCUUd9u+a-m|pU!75LpOQuoMvL?%`90RO|-;rT*
z{QPl!-J=RSf_Q2PV-}qbr++OlPj6^hUaOOmz(6>fVd)Vv5T;4r+w{3TirfFjtI|@K
z$D3=WH?SVPB54r`x+72(WOkY!{@C6lok915J+FqtcEz<b@pB`H-46ax9A$ci>0;bg
zEN-Dm5t(g)*U#P*I3DBX;zH-~g*U&}Vg2|Y)(ux(C+f}PJwL_uYUAK%<&*UVHU(~>
zq=!aEMv5jCq@7JnOblyZIB+mn?KCq#ckDZoL15su@-SLNeKnxkV4O?8gN}5aWYQ~8
zOG`~fbjT)SRS}j?#Sx9Jyb;+<Wxku>UB931Gmo%D*mYoeFBQqv&c!jHd|^j;tq`PM
zLh<u#kLPfm!P(1-a#rPb4`5Ix9IjI{pQ%iq*E>^@PsIn<-f%CkB%%Z@1;!SGpD&Nd
zkm(B5gG%(bL4Nl_IT!Wvn|AiH%0b4HFLy8R9rGQubL_RXjGzu7yl)HkX&VUppfYM5
z<@oxY2usq)&CXzvI*zPdJ?JU_2jhgV4e%TFAMV{-Rw01e1^ab%?PUEwJ9&MQ&eO2o
zd6HXawC)3v4aH}_a~)5^@xtrg#V(QLm{O{#R6RMqeljb1Lca)mqH3$#_0J~K3by#j
zUMW~DTqYB}5J!W;!7IWSLZe}|g_{D~1r+7e1L@Khj+5NfqsR|+C-g|2cBE#E*tKHK
z-z6Sz!PYpe$Cme#WnFqFtH<ZB(@N+`GI*leu+p10egS6A=elwa#>pohUvA)2px56k
zVnOY%leZY?Ip4ROCMZ%_2evs;geqcn3Nunkg|gF0f&PJFXM=#Hm(3LJEt8kpm#L!E
zQFR-Wo15Dr{zY(cm$?TzY*`L7PHGrvdG$(cv4s%Us?1fM()P{o!`-GO{23N1@s^3D
zKt>}xGWgH+tC<2e_gDRbEISgr?4ydI0(UM^VvL}eT#9+vuKfZk=OjZ>sa}#qzs)E)
zp5FGs=_{q1oVjW`)-$>j31niPiv#&rsjj5jFQPt&hWg#>qI9qCPH>;^<2?{>YYAgg
zi;X$I&M&z>BcCN<4X1lKvVNe&=NEdH#VhDM>w42yp7I^X7kRjE9~Hfp-iZ%QOq_Iz
z;VsV-ICJNN-t`1^^8?N<jC7%_%BTn9%)Z%m9)aVWZDgj3W>HZ67I?u!w2Wy%IO~Ul
z&X2+2FJq_DU4orE*8JsOMt{HAfmNaizNyK+G1ohYX{Fg*T3Y&y&R)5%$GOV6$CUF)
z*#|p!^z)H;<Y0lpV5p35GMV;V)Du<z;;0Uuqt<ka^ISVU%GG49aQE%z5ISkom(xci
z&2Vb5U(f<ivY&Nzb#WEBc^iIgnugQzQBE!59KGFG2_ts4IkXxzH4PsqB`tV7Y)aow
z`ti}3Bqt|NI=oR{o;V9xnG>lv9$Rof6{E~9G$2DLLr}a)M^xOTIEu7&Qk{D+es>(=
z_IlsovGAVzbbC|)(svs>VZG%^X~^&2dBOg<<bAy-{5IY@EoJC8n}m_gPvX+L47u%g
zr(Mf<R^{vmCMw?#4=10u7(eUllyjf8@qU2;wxzNED;-QRwz~QlnrLZZVPRx$UfXP~
zXxP6$UMIsn84=q^3!BxPh_wrR4kFGW=P+T57$w8rdN5$VaYb!%Gqoc|hfk+FZQoR*
zaC~!HH`K6E<d`ItyKkP_^M?*+oX#DN5eNi{AxtIfWf$nZvmg1Ym{?b>Gvhn%7iiEQ
z#4B$^`?-3^(c+_79f+?#3EG9gN7OnW@I^j8Ni9i}7D9}jKh%o;JGGRjBW0HLjtKFH
za@#S!8$}Y*5M3=p%~B29`=tCoPrvn})Gz(0NS%Gn85b`8zt)dqzxAUo_C)uI(1`vX
zTWJovCP%gn9!j*PFx?~DmgeKsG^RRCWp|8Ng@eoKB9e8?9o9a)h;$JB`sjrNT+p61
zzA4fkzLN4f6#iCv#%~t(Zl|Em?e_k*2;xAmv2NVIZt3IT(+e3$E7!!IlJS>zBtBpG
z>?(wAdw2qk*-)Cg5ppRQ6{6ML7o6Oz)XX;37(&Eezy4hdAA5X+VE^gV2==71_iCMa
zg=5j$^qXe`1I9zoZPbPue0OeT8{WUYGEsExZDtV=8PDeC9KE)`ns2+zzB82iK6R_;
z<^zZ8QtKDm+S)9xlw8ese4ANvLY*ez&c<BS-uJcKy&t<3qT`B$5)1hupdWh4C@2eo
zj4Jfs-!2lpkom(TvSEm&JN#lO8^umS?__~tMjhs0Z;K=mm)@6HEKRk9Et5}jQZn)s
z8fGB#!M<}hNsY))88CJi$}wJF!oqy=(AvbL3bQ;~wbT~DzO+8uy)>)WJiHTLePgoN
zt|heSmH&QUqwkJecyOZ6%4L2JuB-LClFShSe-srN?R*=*B=7cd0XHSU_<}6+%-C)a
zCBxF`_KB5@@@6OSV9ZVq!vzLu@4zf?1wImF5fKq725QX%C|{~JRR>X1+!kK_Lr)Xc
z>I_iJc|C$bvooFXRV9_#<i`{^9?B={g|2<UyN<mB`f@0Uim6^YB&hYQh*MtN)AK99
zx&;xwx;QABu~_f3bzaRCh`fRQNpg-KP4_4wElwcdR~wLUTnFTPOO94Vv3AVK5(X<V
z+a4Mg=)$H^Igg2{X+ac8|N55}7V5<NN4qm}uI~aFwd6_v4#=d{s}l4a{31gQqEpj_
zx5X%6C}L4vosTl@w3Kd;ve(|`qVu<pwa!4wkJ=i&mPLgznxNYwjT(Hm1{75@ZKyvD
z#i0Y3QN$Ld1hOj&H5I^X<zv-1;?sS#<6pOivkWDOU#cuS@FpHMFq+SN$x8(P77mw+
zRD3os`tNP_TdO#99CNiD+sexsF16Z-7N%16As!yw7QsbsGGdxA3)M=uzKS6|=ORrN
zXl(xgYet;2tU+kGiRH#beNj!P9SY*w-}j*m?FIcrwVbZ%kL<sxQFq10hG<Ri>d$Ir
zu6?|UE@304d{=NnEL*&#Be)QRk7-V1;tb_jY1MJ_(y6PXt6@reS(1B|R%uKK3pNK;
zV^xJgB`)|@gkRh}EQmyVW%38`PsXUMB-@uzS_75lyu83y3-Pa9hi8IdGhMlj6J>s}
z+I}PDn7XqRHL>3ORTSH<!>t0Y8OnEzt9w<mF6^D78k6PCr&ClxP6|V(t-hiI(Ql#`
zIa1FgOAg5SKTgw`TzGUQnW^s4AOWu}3==g-&Fkv!Zg`)F^q6_z?BrC|MOo%DT$+ma
zRL^7DL!6~T@TOt47c^dLgmuO<=+uf;jXDIGnVT1hxv6ivBGmIF15)LI@GXfqkb_x?
zJ<gUY@AT~K4)2t!<xdT#zI3xgHUE4X_SoWJ4^2;0b!S^X-BB9eo&lgGcT5C4JO|E!
z%HFDx%1+8y)x|N(2*U-(_$U-RErP@NrEMNn&-!QjyE`kBZ>eP~)%`z8vV>Y*o1o8T
zsT-O3ObEH}T^RrY%eB}9%3fqHBPUl}SBEr!LU}5HL`HICr5QjOt#p*nZQM#ni0;?-
zV78Oau!Ou*%38KGLo~=&7~)WGuqg^S0rwckW75}MTn5|mowI_{bzWcIW8mK;V#qJL
zxIBBBIDj0T$r%V~RY~<JQ%`^FOb!3zNfVSibiqC_S}vuKbiZ81SsiCgJdNI9bhZIW
z6IKTOta_TQbbk6ypgf;k%8Q;*P<7BPLg<IGB*KKh^&evFThFEGn>n^XNrLZJZ)+SG
z48IFUUH}nF7tTFuQ~$>E$9xW<AY$3fY|krv{r+n$c4j8tnR-eI&KI4*7&$D$E*wU=
za6LZ!JUcTVy}6UKEfnUSLh33ff($w8@beM4LX3hjN5E)gmN`ZpnwhQim44k5(|^dx
zL1%?r=Mv|ZOM&NUcG+`N;3_+{zyN$@SSXTQ$k=Kwo~h^zu_GDlD286*)~=2=%%iu`
z`Iwtc>}{`f8vFxc_ZXPu$O$5=8*u<mYE|Kqla*bxXI@@w(9_ZiG3nDHGOZ6nzX<y0
zQVi$(a%FmGAC-BZ*V<>T=O+0{66QHJ+9M8DV8Yt9_VR87(Xqp>k7LW-7c|s0sAduy
zQ?`wh9Q;EJU=Q?9)tKKsmvNo&RD3L_8^nwf5BEh<D~ILv{#@<GQ?j0O`YK{04z4qM
zAc{CXLd%(RFGi>u5Eqzd_u#l}+mj4;==^89PCUotn?ASB7`}b$=h_b|yfM`R7Fp|c
zHSnKo)7j{3gMbs7TPW=m7<rHZJ{R1Z-SVi8T=I&6TkjFa-c(uV-SyenEBv)O7L~eV
za}3J<@87?lE5XMau+wrO=~MV^vC|_GcQT}}MUTF)L$&Y4)Z|4)amz2sHOyAlNk;Z~
zSdYo>X3>>iIE_DJS@U8)UoW{{X!mHYY6`{VQi^_Hb-!P=ePl0#)M<6kd*-62V@yje
zi!@gvmw28Xg4md`pk27I|6_M!r?<B^U>j^~yH0I$y=mP`U%q&%vhlXvKT3Dm#3a#L
zc7{qmNK4wWKjO!+i~+I&f<((~1ua|ZhEe>oPttOxf_t-49FG}#V04u0%izOM5bS2>
z`!WWfq=+z>PNT8LFBJG_ckLYg!Wel^J@^)wcB+s6mYdlkZ&%=HTta8AWp9k*c7lu<
z`y1MWjrq4<{OMN$ezXKKMSM5Kyv<ZWS`rMin;@qzjKOGl-@l!-JZUAcwvh~irpwBA
zHZd6N{cO*1p>qowD&6Gzl<L$1bBG$FxfxGd`@L#%Syvi9bZc(F79)nAKsXy|WnpF2
zz_!vMTYUE|zj7zTa~7fJ8;l1`9{IPGb{UVvAjI{%^y9?5v%Q|;%^>7xnMdA(f<itv
z;mL`PvyKn-S6>;mlOJ;T!d4!gFho&EZ6C(P#o6WO=WiHPNoXl?2nl0<NSr%txGi=}
zk%2*&!YLueB;0|lQJ3Ms%R}S*o5sD}Tm^LBX1gMXBZ~6P6X8fKrrh=%afM-K!Mi-T
zUx!$KDnXmOBf~{PQc_Lqc6oK{SEs|pvLbPu92~Z$)F}af@najgws5A_-b2pbLc4y9
z$VB;+HjG9oEscfwP$=({=f&@mQmY0d1;0PX{i&_4-7_X0jk~QO%fG5Y`i}e;B<4RC
Mp8qZVKbe950UH;O_W%F@

diff --git a/OsmAnd/res/drawable/bg_plugin_logo_disabled_dark.xml b/OsmAnd/res/drawable/bg_plugin_logo_disabled_dark.xml
new file mode 100644
index 0000000000..2fe47ba973
--- /dev/null
+++ b/OsmAnd/res/drawable/bg_plugin_logo_disabled_dark.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+	<solid
+		android:color="#525e66" />
+	<corners
+		android:radius="3dp" />
+</shape>
diff --git a/OsmAnd/res/drawable/bg_plugin_logo_disabled_light.xml b/OsmAnd/res/drawable/bg_plugin_logo_disabled_light.xml
new file mode 100644
index 0000000000..5db5edda16
--- /dev/null
+++ b/OsmAnd/res/drawable/bg_plugin_logo_disabled_light.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+	<solid
+		android:color="#cccccc" />
+	<corners
+		android:radius="3dp" />
+</shape>
diff --git a/OsmAnd/res/drawable/bg_plugin_logo.xml b/OsmAnd/res/drawable/bg_plugin_logo_enabled.xml
similarity index 100%
rename from OsmAnd/res/drawable/bg_plugin_logo.xml
rename to OsmAnd/res/drawable/bg_plugin_logo_enabled.xml
diff --git a/OsmAnd/res/drawable/get_button_background.xml b/OsmAnd/res/drawable/get_button_background.xml
new file mode 100644
index 0000000000..0108b26e23
--- /dev/null
+++ b/OsmAnd/res/drawable/get_button_background.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_pressed="false">
+		<shape android:shape="rectangle">
+			<corners android:radius="2dp" />
+			<solid android:color="#4caf50" />
+		</shape>
+	</item>
+	<item android:state_pressed="true">
+		<shape android:shape="rectangle">
+			<corners android:radius="2dp" />
+			<solid android:color="#66bb6a" />
+		</shape>
+	</item>
+</selector>
diff --git a/OsmAnd/res/drawable/ic_plugin_options_dark.xml b/OsmAnd/res/drawable/ic_plugin_options_dark.xml
index 0d038d3b4a..fe9d4f25d2 100644
--- a/OsmAnd/res/drawable/ic_plugin_options_dark.xml
+++ b/OsmAnd/res/drawable/ic_plugin_options_dark.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
-		android:top="6dp"
-		android:right="2dp">
+	<item>
 		<bitmap
 			android:src="@drawable/ic_overflow_menu_dark"
-			android:gravity="top|end" />
+			android:gravity="center" />
 	</item>
 </layer-list>
diff --git a/OsmAnd/res/drawable/ic_plugin_options_light.xml b/OsmAnd/res/drawable/ic_plugin_options_light.xml
index 44e717630a..3da3249d32 100644
--- a/OsmAnd/res/drawable/ic_plugin_options_light.xml
+++ b/OsmAnd/res/drawable/ic_plugin_options_light.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
-		android:top="6dp"
-		android:right="2dp">
+	<item>
 		<bitmap
 			android:src="@drawable/ic_overflow_menu_light"
-			android:gravity="top|end" />
+			android:gravity="center" />
 	</item>
 </layer-list>
diff --git a/OsmAnd/res/drawable/switch_ex_background.xml b/OsmAnd/res/drawable/switch_ex_background_dark.xml
similarity index 84%
rename from OsmAnd/res/drawable/switch_ex_background.xml
rename to OsmAnd/res/drawable/switch_ex_background_dark.xml
index 0e0733261a..3964927081 100644
--- a/OsmAnd/res/drawable/switch_ex_background.xml
+++ b/OsmAnd/res/drawable/switch_ex_background_dark.xml
@@ -4,21 +4,19 @@
 		<shape android:shape="rectangle">
 			<corners android:radius="2dp" />
 			<solid android:color="#ff8f00" />
-			<stroke android:width="1.5dp" android:color="#ff8f00" />
 		</shape>
 	</item>
 	<item android:state_checked="false" android:state_pressed="true">
 		<shape android:shape="rectangle">
 			<corners android:radius="2dp" />
 			<solid android:color="#ffb24c" />
-			<stroke android:width="1.5dp" android:color="#ffb24c" />
 		</shape>
 	</item>
 	<item android:state_checked="true" android:state_pressed="false">
 		<shape android:shape="rectangle">
 			<corners android:radius="2dp" />
 			<solid android:color="@null" />
-			<stroke android:width="1.5dp" android:color="#ff8f00" />
+			<stroke android:width="1.5dp" android:color="#77848c" />
 		</shape>
 	</item>
 	<item android:state_checked="true" android:state_pressed="true">
diff --git a/OsmAnd/res/drawable/switch_ex_background_light.xml b/OsmAnd/res/drawable/switch_ex_background_light.xml
new file mode 100644
index 0000000000..4c1034023e
--- /dev/null
+++ b/OsmAnd/res/drawable/switch_ex_background_light.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_checked="false" android:state_pressed="false">
+		<shape android:shape="rectangle">
+			<corners android:radius="2dp" />
+			<solid android:color="#ff8f00" />
+		</shape>
+	</item>
+	<item android:state_checked="false" android:state_pressed="true">
+		<shape android:shape="rectangle">
+			<corners android:radius="2dp" />
+			<solid android:color="#ffb24c" />
+		</shape>
+	</item>
+	<item android:state_checked="true" android:state_pressed="false">
+		<shape android:shape="rectangle">
+			<corners android:radius="2dp" />
+			<solid android:color="@null" />
+			<stroke android:width="1.5dp" android:color="#727272" />
+		</shape>
+	</item>
+	<item android:state_checked="true" android:state_pressed="true">
+		<shape android:shape="rectangle">
+			<corners android:radius="2dp" />
+			<solid android:color="#66ff8f00" />
+			<stroke android:width="1.5dp" android:color="#ff8f00" />
+		</shape>
+	</item>
+</selector>
diff --git a/OsmAnd/res/layout/dash_plugin_item.xml b/OsmAnd/res/layout/dash_plugin_item.xml
index 24058a989a..a3470e2b21 100644
--- a/OsmAnd/res/layout/dash_plugin_item.xml
+++ b/OsmAnd/res/layout/dash_plugin_item.xml
@@ -22,7 +22,7 @@
 			android:layout_width="32dp"
 			android:layout_height="32dp"
 			android:layout_margin="11dp"
-			android:background="@drawable/bg_plugin_logo"
+			android:background="@drawable/bg_plugin_logo_enabled"
 			android:scaleType="center"
 			tools:src="@drawable/ic_extension_dark"/>
 
@@ -52,7 +52,7 @@
 			android:layout_marginStart="6dp"
 			android:layout_marginRight="16dp"
 			android:layout_marginEnd="16dp"
-			android:background="@drawable/switch_ex_background"
+			android:background="?attr/switch_ex_background"
 			android:minHeight="0dp"
 			android:minWidth="0dp"
 			android:paddingTop="8dp"
@@ -60,7 +60,7 @@
 			android:paddingLeft="9.5dp"
 			android:paddingRight="9.5dp"
 			osmand:textAllCapsCompat="true"
-			android:textColor="@color/switch_ex_text_color"
+			android:textColor="?attr/switch_ex_text_color"
 			android:textOff="@string/enable_plugin"
 			android:textOn="@string/disable_plugin"
 			android:textSize="12sp"
diff --git a/OsmAnd/res/layout/plugin.xml b/OsmAnd/res/layout/plugin.xml
index 9d806bac2c..6da9611e0d 100644
--- a/OsmAnd/res/layout/plugin.xml
+++ b/OsmAnd/res/layout/plugin.xml
@@ -4,8 +4,7 @@
 	xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	android:layout_marginTop="?attr/actionBarSize">
+	android:layout_height="match_parent">
 
 	<LinearLayout
 		android:layout_width="match_parent"
@@ -16,7 +15,9 @@
 		<ImageView
 			android:layout_width="match_parent"
 			android:layout_height="144dp"
-			android:visibility="gone"/>
+			android:background="@drawable/bg_plugin_logo_enabled"
+			android:scaleType="center"
+			android:src="@drawable/ic_extension_dark"/>
 
 		<FrameLayout
 			android:layout_width="match_parent"
@@ -45,20 +46,18 @@
 
 			<net.osmand.plus.widgets.SwitchEx
 				android:id="@+id/plugin_enable_disable"
-				android:layout_width="wrap_content"
+				android:layout_width="139dp"
 				android:layout_height="wrap_content"
 				android:layout_gravity="center_vertical|end"
 				android:layout_marginBottom="16dp"
 				android:layout_marginTop="16dp"
-				android:background="@drawable/switch_ex_background"
-				android:minHeight="0dp"
-				android:minWidth="0dp"
+				android:background="?attr/switch_ex_background"
 				android:paddingBottom="8dp"
 				android:paddingLeft="9.5dp"
 				android:paddingRight="9.5dp"
 				android:paddingTop="8dp"
 				osmand:textAllCapsCompat="true"
-				android:textColor="@color/switch_ex_text_color"
+				android:textColor="?attr/switch_ex_text_color"
 				android:textOff="@string/enable_plugin"
 				android:textOn="@string/disable_plugin"
 				android:textSize="12sp"
diff --git a/OsmAnd/res/layout/plugins_list_item.xml b/OsmAnd/res/layout/plugins_list_item.xml
index cf368f2fbd..5b71d4b8b1 100644
--- a/OsmAnd/res/layout/plugins_list_item.xml
+++ b/OsmAnd/res/layout/plugins_list_item.xml
@@ -14,12 +14,12 @@
 		android:layout_height="match_parent"
 		android:orientation="horizontal">
 
-		<ImageView
+		<ImageButton
 			android:id="@+id/plugin_logo"
 			android:layout_width="64dp"
 			android:layout_height="64dp"
 			android:layout_margin="8dp"
-			android:background="@drawable/bg_plugin_logo"
+			android:background="@drawable/bg_plugin_logo_enabled"
 			android:scaleType="center"
 			tools:src="@drawable/ic_extension_dark"/>
 
@@ -29,8 +29,8 @@
 			android:layout_marginBottom="8dp"
 			android:layout_marginLeft="6dp"
 			android:layout_marginStart="6dp"
-			android:layout_marginRight="16dp"
-			android:layout_marginEnd="16dp"
+			android:layout_marginRight="36dp"
+			android:layout_marginEnd="36dp"
 			android:layout_marginTop="8dp"
 			android:layout_weight="1"
 			android:orientation="vertical">
@@ -40,8 +40,6 @@
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginBottom="4dp"
-				android:layout_marginRight="50dp"
-				android:layout_marginEnd="50dp"
 				android:ellipsize="end"
 				android:lines="1"
 				android:maxLines="1"
@@ -68,12 +66,13 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="top|end"
-		android:orientation="horizontal">
+		android:orientation="vertical">
 
 		<ImageView
 			android:id="@+id/plugin_is_enabled"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:layout_gravity="center_horizontal"
 			android:layout_marginTop="6dp"
 			android:src="?attr/ic_action_check"
 			android:visibility="invisible"
@@ -83,6 +82,7 @@
 			android:id="@+id/plugin_options"
 			android:layout_width="36dp"
 			android:layout_height="36dp"
+			android:layout_marginTop="6dp"
 			android:background="?attr/ic_plugin_options"/>
 	</LinearLayout>
 </FrameLayout>
diff --git a/OsmAnd/res/values/attrs.xml b/OsmAnd/res/values/attrs.xml
index fd3cbb783a..925e7940a8 100644
--- a/OsmAnd/res/values/attrs.xml
+++ b/OsmAnd/res/values/attrs.xml
@@ -23,6 +23,9 @@
 		<attr name="ic_action_marker2" format="reference" />
 		<attr name="search_background" format="reference" />
 		<attr name="ic_action_settings" format="reference" />
+		<attr name="switch_ex_background" format="reference" />
+		<attr name="switch_ex_text_color" format="color|reference" />
+		<attr name="bg_plugin_logo_disabled" format="reference" />
     </declare-styleable>
 
     <declare-styleable name="PagerSlidingTabStrip">
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index 9e7d0e14b0..c36424128a 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -101,4 +101,6 @@
 
 	<color name="card_bg_color_light">#ffffff</color>
 	<color name="card_bg_color_dark">#333b40</color>
+
+	<color name="get_button_text">#ffffff</color>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index cad2190d54..1194cfef17 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -158,6 +158,9 @@
         <item name="actionModeStyle">@style/WhiteActionMode</item>
         <item name="android:actionMenuTextColor">@color/color_white</item>
         <item name="actionMenuTextColor">@color/color_white</item>
+		<item name="switch_ex_background">@drawable/switch_ex_background_light</item>
+		<item name="switch_ex_text_color">@color/switch_ex_button_text_light</item>
+		<item name="bg_plugin_logo_disabled">@drawable/bg_plugin_logo_disabled_light</item>
     </style>
 
     <style name="OsmandDarkTheme" parent="Theme.AppCompat">
@@ -188,6 +191,9 @@
 		<item name="ic_action_marker2">@drawable/ic_action_marker2_dark</item>
 		<item name="search_background">@color/color_white</item>
 		<item name="ic_action_settings">@drawable/ic_action_settings_dark</item>
+		<item name="switch_ex_background">@drawable/switch_ex_background_dark</item>
+		<item name="switch_ex_text_color">@color/switch_ex_button_text_dark</item>
+		<item name="bg_plugin_logo_disabled">@drawable/bg_plugin_logo_disabled_dark</item>
     </style>
 
     <style name="OsmandLightDarkActionBarTheme" parent="Theme.AppCompat.Light.DarkActionBar">
diff --git a/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java b/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
index 91b90ac77a..70f5087abf 100644
--- a/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
@@ -6,6 +6,7 @@ import net.osmand.plus.R;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.res.TypedArray;
 import android.os.Bundle;
 import android.support.v7.widget.PopupMenu;
 import android.view.MenuItem;
@@ -13,7 +14,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
-import android.widget.ImageView;
+import android.widget.ImageButton;
 import android.widget.TextView;
 
 public class PluginsActivity extends OsmandListActivity {
@@ -80,8 +81,22 @@ public class PluginsActivity extends OsmandListActivity {
 
 			view.setTag(plugin);
 
-			ImageView pluginLogo = (ImageView)view.findViewById(R.id.plugin_logo);
+			ImageButton pluginLogo = (ImageButton)view.findViewById(R.id.plugin_logo);
 			pluginLogo.setImageResource(plugin.getLogoResourceId());
+			if (plugin.isActive()) {
+				pluginLogo.setBackgroundResource(R.drawable.bg_plugin_logo_enabled);
+			} else {
+				TypedArray attributes =  getTheme().obtainStyledAttributes(
+						new int[] {R.attr.bg_plugin_logo_disabled});
+				pluginLogo.setBackgroundDrawable(attributes.getDrawable(0));
+				attributes.recycle();
+			}
+			pluginLogo.setOnClickListener(new View.OnClickListener() {
+				@Override
+				public void onClick(View v) {
+					enableDisablePlugin(plugin, !plugin.isActive());
+				}
+			});
 
 			TextView pluginName = (TextView)view.findViewById(R.id.plugin_name);
 			pluginName.setText(plugin.getName());
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
index 2ac1dfcbe5..08df3dc3d8 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
@@ -6,7 +6,6 @@ import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.PluginActivity;
 import net.osmand.plus.development.OsmandDevelopmentPlugin;
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -34,16 +33,6 @@ public class DashPluginsFragment extends DashBaseFragment {
 		}
 	};
 
-	private final View.OnClickListener pluginSettingsListener = new View.OnClickListener() {
-		@Override
-		public void onClick(View view) {
-			OsmandPlugin plugin = (OsmandPlugin)view.getTag();
-
-			Class<? extends Activity> settingsActivity = plugin.getSettingsActivity();
-			startActivity(new Intent(getActivity(), settingsActivity));
-		}
-	};
-
 	private final View.OnClickListener pluginDetailsListener = new View.OnClickListener() {
 		@Override
 		public void onClick(View view) {
@@ -80,7 +69,7 @@ public class DashPluginsFragment extends DashBaseFragment {
 			if (pluginsContainer.getChildCount() > 2) {
 				break;
 			}
-			if (plugin instanceof  OsmandDevelopmentPlugin) {
+			if (plugin instanceof OsmandDevelopmentPlugin) {
 				continue;
 			}
 			if (enabledPlugins.contains(plugin)) {

From 5b271edb5bd394103c79c30b905a56fd50e4101d Mon Sep 17 00:00:00 2001
From: Leif Larsson <Leif.Larsson@gmail.com>
Date: Thu, 5 Feb 2015 10:36:49 +0100
Subject: [PATCH 02/26] Translated using Weblate (Swedish)

Currently translated at 99.5% (1612 of 1620 strings)
---
 OsmAnd/res/values-sv/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index c0989856a3..704667770f 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -1737,7 +1737,7 @@
 	<string name="coordinates">Koordinater</string>
 	<string name="map_update">Det finns %1$s uppdatering(ar)</string>
 	<string name="error_avoid_specific_road">Hittar ingen förbifart</string>
-    <string name="dismiss">Avvisa</string>
+    <string name="dismiss">Avböj</string>
     <string name="everything_up_to_date">Alla filer är uppdaterade</string>
     <string name="use_opengl_render">Använd OpenGL-rendering</string>
     <string name="use_opengl_render_descr">Använd hårdvaruaccelererad OpenGL-rendering (fungerar kanske inte på vissa enheter)</string>

From b4ce36cf92c6825d88f7a13dab57346f15523437 Mon Sep 17 00:00:00 2001
From: Alexey Pelykh <alexey.pelykh@gmail.com>
Date: Thu, 5 Feb 2015 18:26:42 +0200
Subject: [PATCH 03/26] Fixes

---
 .../res/drawable/ic_plugin_options_dark.xml   |  6 +-
 .../res/drawable/ic_plugin_options_light.xml  |  6 +-
 OsmAnd/res/layout/dash_plugin_item.xml        |  6 +-
 OsmAnd/res/layout/plugins_list_item.xml       | 12 ++--
 OsmAnd/src/net/osmand/AndroidUtils.java       | 15 +++++
 .../plus/activities/PluginsActivity.java      |  2 +-
 .../plus/dashboard/DashPluginsFragment.java   | 62 +++++++++++++------
 7 files changed, 76 insertions(+), 33 deletions(-)

diff --git a/OsmAnd/res/drawable/ic_plugin_options_dark.xml b/OsmAnd/res/drawable/ic_plugin_options_dark.xml
index fe9d4f25d2..0d038d3b4a 100644
--- a/OsmAnd/res/drawable/ic_plugin_options_dark.xml
+++ b/OsmAnd/res/drawable/ic_plugin_options_dark.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
+	<item
+		android:top="6dp"
+		android:right="2dp">
 		<bitmap
 			android:src="@drawable/ic_overflow_menu_dark"
-			android:gravity="center" />
+			android:gravity="top|end" />
 	</item>
 </layer-list>
diff --git a/OsmAnd/res/drawable/ic_plugin_options_light.xml b/OsmAnd/res/drawable/ic_plugin_options_light.xml
index 3da3249d32..44e717630a 100644
--- a/OsmAnd/res/drawable/ic_plugin_options_light.xml
+++ b/OsmAnd/res/drawable/ic_plugin_options_light.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-	<item>
+	<item
+		android:top="6dp"
+		android:right="2dp">
 		<bitmap
 			android:src="@drawable/ic_overflow_menu_light"
-			android:gravity="center" />
+			android:gravity="top|end" />
 	</item>
 </layer-list>
diff --git a/OsmAnd/res/layout/dash_plugin_item.xml b/OsmAnd/res/layout/dash_plugin_item.xml
index a3470e2b21..07decdaa22 100644
--- a/OsmAnd/res/layout/dash_plugin_item.xml
+++ b/OsmAnd/res/layout/dash_plugin_item.xml
@@ -3,6 +3,7 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/dash_plugin_item"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
@@ -17,7 +18,7 @@
 		android:layout_height="54dp"
 		android:orientation="horizontal">
 
-		<ImageView
+		<ImageButton
 			android:id="@+id/plugin_logo"
 			android:layout_width="32dp"
 			android:layout_height="32dp"
@@ -43,7 +44,7 @@
 
 		<net.osmand.plus.widgets.SwitchEx
 			android:id="@+id/check_item"
-			android:layout_width="wrap_content"
+			android:layout_width="90dp"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center_vertical"
 			android:layout_marginTop="6dp"
@@ -54,7 +55,6 @@
 			android:layout_marginEnd="16dp"
 			android:background="?attr/switch_ex_background"
 			android:minHeight="0dp"
-			android:minWidth="0dp"
 			android:paddingTop="8dp"
 			android:paddingBottom="8dp"
 			android:paddingLeft="9.5dp"
diff --git a/OsmAnd/res/layout/plugins_list_item.xml b/OsmAnd/res/layout/plugins_list_item.xml
index 5b71d4b8b1..4a5178e93e 100644
--- a/OsmAnd/res/layout/plugins_list_item.xml
+++ b/OsmAnd/res/layout/plugins_list_item.xml
@@ -62,17 +62,16 @@
 		</LinearLayout>
 	</LinearLayout>
 
-	<LinearLayout
+	<FrameLayout
 		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_gravity="top|end"
-		android:orientation="vertical">
+		android:layout_height="match_parent"
+		android:layout_gravity="top|end">
 
 		<ImageView
 			android:id="@+id/plugin_is_enabled"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal"
+			android:layout_gravity="center_horizontal|top"
 			android:layout_marginTop="6dp"
 			android:src="?attr/ic_action_check"
 			android:visibility="invisible"
@@ -83,6 +82,7 @@
 			android:layout_width="36dp"
 			android:layout_height="36dp"
 			android:layout_marginTop="6dp"
+			android:layout_gravity="center_horizontal|bottom"
 			android:background="?attr/ic_plugin_options"/>
-	</LinearLayout>
+	</FrameLayout>
 </FrameLayout>
diff --git a/OsmAnd/src/net/osmand/AndroidUtils.java b/OsmAnd/src/net/osmand/AndroidUtils.java
index 10003bb637..cbae5e3012 100644
--- a/OsmAnd/src/net/osmand/AndroidUtils.java
+++ b/OsmAnd/src/net/osmand/AndroidUtils.java
@@ -7,6 +7,7 @@ import android.content.Context;
 import android.content.res.Configuration;
 import android.text.format.DateFormat;
 import android.view.View;
+import android.view.ViewParent;
 import android.view.inputmethod.InputMethodManager;
 
 public class AndroidUtils {
@@ -49,4 +50,18 @@ public class AndroidUtils {
 	public static String formatTime(Context ctx, long time) {
 		return DateFormat.getTimeFormat(ctx).format(new Date(time));
 	}
+
+	public static View findParentViewById(View view, int id) {
+		ViewParent viewParent = view.getParent();
+
+		while (viewParent != null && viewParent instanceof View) {
+			View parentView = (View)viewParent;
+			if (parentView.getId() == id)
+				return parentView;
+
+			viewParent = parentView.getParent();
+		}
+
+		return null;
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java b/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
index 70f5087abf..732027489e 100644
--- a/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
@@ -86,7 +86,7 @@ public class PluginsActivity extends OsmandListActivity {
 			if (plugin.isActive()) {
 				pluginLogo.setBackgroundResource(R.drawable.bg_plugin_logo_enabled);
 			} else {
-				TypedArray attributes =  getTheme().obtainStyledAttributes(
+				TypedArray attributes = getTheme().obtainStyledAttributes(
 						new int[] {R.attr.bg_plugin_logo_disabled});
 				pluginLogo.setBackgroundDrawable(attributes.getDrawable(0));
 				attributes.recycle();
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
index 08df3dc3d8..c39a76135c 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
@@ -2,18 +2,20 @@ package net.osmand.plus.dashboard;
 
 import java.util.List;
 
+import net.osmand.AndroidUtils;
 import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.PluginActivity;
 import net.osmand.plus.development.OsmandDevelopmentPlugin;
 import android.content.Intent;
+import android.content.res.TypedArray;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CompoundButton;
-import android.widget.ImageView;
+import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -25,11 +27,25 @@ public class DashPluginsFragment extends DashBaseFragment {
 			new CompoundButton.OnCheckedChangeListener() {
 		@Override
 		public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-			OsmandPlugin plugin = (OsmandPlugin)buttonView.getTag();
+			View pluginView = AndroidUtils.findParentViewById(buttonView, R.id.dash_plugin_item);
+			OsmandPlugin plugin = (OsmandPlugin)pluginView.getTag();
 			if (plugin.isActive() == isChecked) {
 				return;
 			}
-			OsmandPlugin.enablePlugin(getMyApplication(), plugin, isChecked);
+			if (OsmandPlugin.enablePlugin(getMyApplication(), plugin, isChecked)) {
+				updatePluginState(pluginView);
+			}
+		}
+	};
+
+	private final View.OnClickListener toggleEnableDisableListener = new View.OnClickListener() {
+		@Override
+		public void onClick(View view) {
+			View pluginView = AndroidUtils.findParentViewById(view, R.id.dash_plugin_item);
+			OsmandPlugin plugin = (OsmandPlugin)pluginView.getTag();
+			if (OsmandPlugin.enablePlugin(getMyApplication(), plugin, !plugin.isActive())) {
+				updatePluginState(pluginView);
+			}
 		}
 	};
 
@@ -94,41 +110,49 @@ public class DashPluginsFragment extends DashBaseFragment {
 
 		for (int pluginIndex = 0; pluginIndex < pluginsContainer.getChildCount(); pluginIndex++) {
 			View pluginView = pluginsContainer.getChildAt(pluginIndex);
-			OsmandPlugin plugin = (OsmandPlugin)pluginView.getTag();
-			boolean isEnabled = plugin.isActive();
 
-			CompoundButton enableDisableButton = (CompoundButton) pluginView.findViewById(
-					R.id.check_item);
-			enableDisableButton.setChecked(isEnabled);
+			updatePluginState(pluginView);
+		}
+	}
+
+	private void updatePluginState(View pluginView) {
+		OsmandPlugin plugin = (OsmandPlugin)pluginView.getTag();
+		boolean isEnabled = plugin.isActive();
+
+		CompoundButton enableDisableButton = (CompoundButton)pluginView.findViewById(
+				R.id.check_item);
+		enableDisableButton.setChecked(isEnabled);
+
+		ImageButton logoView = (ImageButton)pluginView.findViewById(R.id.plugin_logo);
+		if (plugin.isActive()) {
+			logoView.setBackgroundResource(R.drawable.bg_plugin_logo_enabled);
+		} else {
+			TypedArray attributes = getActivity().getTheme().obtainStyledAttributes(
+					new int[] {R.attr.bg_plugin_logo_disabled});
+			logoView.setBackgroundDrawable(attributes.getDrawable(0));
+			attributes.recycle();
 		}
 	}
 
 	private void inflatePluginView(LayoutInflater inflater, ViewGroup container,
 								   OsmandPlugin plugin) {
-
 		View view = inflater.inflate(R.layout.dash_plugin_item, container, false);
 		view.setTag(plugin);
 
-		// To discuss: too much confusing and not consistent
-//		boolean hasSettings = (plugin.getSettingsActivity() != null);
-//		if (isEnabled && hasSettings) {
-//			view.setOnClickListener(pluginSettingsListener);
-//		} else {
-//		view.setOnClickListener(pluginDetailsListener);
-//		}
 		view.setOnClickListener(pluginDetailsListener);
 
 		TextView nameView = (TextView)view.findViewById(R.id.plugin_name);
 		nameView.setText(plugin.getName());
 
-		ImageView logoView = (ImageView)view.findViewById(R.id.plugin_logo);
+		ImageButton logoView = (ImageButton)view.findViewById(R.id.plugin_logo);
+		logoView.setOnClickListener(toggleEnableDisableListener);
 		logoView.setImageResource(plugin.getLogoResourceId());
 
 		CompoundButton enableDisableButton = (CompoundButton)view.findViewById(R.id.check_item);
-		enableDisableButton.setTag(plugin);
-		enableDisableButton.setChecked(plugin.isActive());
 		enableDisableButton.setOnCheckedChangeListener(enableDisableListener);
 
+		updatePluginState(view);
+
 		container.addView(view);
 	}
 }

From 15cf60c8dc4a5ab669750f36340b25859df53db2 Mon Sep 17 00:00:00 2001
From: Alexey Pelykh <alexey.pelykh@gmail.com>
Date: Thu, 5 Feb 2015 18:58:41 +0200
Subject: [PATCH 04/26] Fixes

---
 OsmAnd/res/layout/plugin.xml  | 34 +++++++++++++++++++++++++++++++---
 OsmAnd/res/values/attrs.xml   |  3 +++
 OsmAnd/res/values/colors.xml  |  6 ++++++
 OsmAnd/res/values/strings.xml |  1 +
 OsmAnd/res/values/styles.xml  |  6 ++++++
 5 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/layout/plugin.xml b/OsmAnd/res/layout/plugin.xml
index 6da9611e0d..85b18837b8 100644
--- a/OsmAnd/res/layout/plugin.xml
+++ b/OsmAnd/res/layout/plugin.xml
@@ -15,15 +15,17 @@
 		<ImageView
 			android:layout_width="match_parent"
 			android:layout_height="144dp"
-			android:background="@drawable/bg_plugin_logo_enabled"
+			android:background="#ff8f00"
 			android:scaleType="center"
 			android:src="@drawable/ic_extension_dark"/>
 
 		<FrameLayout
+			android:id="@+id/plugin_header"
 			android:layout_width="match_parent"
 			android:layout_height="66dp"
-			android:layout_marginLeft="16dp"
-			android:layout_marginRight="16dp">
+			android:paddingLeft="16dp"
+			android:paddingRight="16dp"
+			android:background="?attr/plugin_details_header_bg">
 
 			<net.osmand.plus.widgets.ButtonEx
 				android:id="@+id/plugin_settings"
@@ -64,6 +66,32 @@
 				osmand:typeface="@string/font_roboto_medium"/>
 		</FrameLayout>
 
+		<LinearLayout
+			android:id="@+id/plugin_header2"
+			android:layout_width="match_parent"
+			android:layout_height="66dp"
+			android:gravity="center_vertical"
+			android:paddingLeft="16dp"
+			android:paddingRight="16dp"
+			android:orientation="horizontal"
+			android:background="?attr/plugin_details_header2_bg"
+			android:visibility="gone"
+			tools:visibility="visible">
+
+			<ImageView
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:src="?attr/ic_world_globe"/>
+
+			<net.osmand.plus.widgets.TextViewEx
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:paddingLeft="16dp"
+				android:paddingRight="16dp"
+				android:text="@string/plugin_install_needs_network"
+				osmand:typeface="@string/font_roboto_regular"/>
+		</LinearLayout>
+
 		<net.osmand.plus.widgets.TextViewEx
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
diff --git a/OsmAnd/res/values/attrs.xml b/OsmAnd/res/values/attrs.xml
index 925e7940a8..22bda9d145 100644
--- a/OsmAnd/res/values/attrs.xml
+++ b/OsmAnd/res/values/attrs.xml
@@ -26,6 +26,9 @@
 		<attr name="switch_ex_background" format="reference" />
 		<attr name="switch_ex_text_color" format="color|reference" />
 		<attr name="bg_plugin_logo_disabled" format="reference" />
+		<attr name="plugin_details_header_bg" format="color|reference" />
+		<attr name="plugin_details_header2_bg" format="color|reference" />
+		<attr name="ic_world_globe" format="reference" />
     </declare-styleable>
 
     <declare-styleable name="PagerSlidingTabStrip">
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index c36424128a..33fd1cf392 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -103,4 +103,10 @@
 	<color name="card_bg_color_dark">#333b40</color>
 
 	<color name="get_button_text">#ffffff</color>
+
+	<color name="plugin_details_header_bg_light">#ffffff</color>
+	<color name="plugin_details_header_bg_dark">#333b40</color>
+
+	<color name="plugin_details_header2_bg_light">#dbdbdb</color>
+	<color name="plugin_details_header2_bg_dark">#ffffff</color>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 9e12894a29..4680e9986a 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -2089,4 +2089,5 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="disable_plugin">Disable</string>
 	<string name="plugin_description_title">Description</string>
 	<string name="plugin_settings_button_caption">Settings</string>
+	<string name="plugin_install_needs_network">You need an Internet connection to install this plugin.</string>
 </resources>
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 1194cfef17..51f75d6dd1 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -161,6 +161,9 @@
 		<item name="switch_ex_background">@drawable/switch_ex_background_light</item>
 		<item name="switch_ex_text_color">@color/switch_ex_button_text_light</item>
 		<item name="bg_plugin_logo_disabled">@drawable/bg_plugin_logo_disabled_light</item>
+		<item name="plugin_details_header_bg">@color/plugin_details_header_bg_light</item>
+		<item name="plugin_details_header2_bg">@color/plugin_details_header2_bg_light</item>
+		<item name="ic_world_globe">@drawable/ic_world_globe_light</item>
     </style>
 
     <style name="OsmandDarkTheme" parent="Theme.AppCompat">
@@ -194,6 +197,9 @@
 		<item name="switch_ex_background">@drawable/switch_ex_background_dark</item>
 		<item name="switch_ex_text_color">@color/switch_ex_button_text_dark</item>
 		<item name="bg_plugin_logo_disabled">@drawable/bg_plugin_logo_disabled_dark</item>
+		<item name="plugin_details_header_bg">@color/plugin_details_header_bg_dark</item>
+		<item name="plugin_details_header2_bg">@color/plugin_details_header2_bg_dark</item>
+		<item name="ic_world_globe">@drawable/ic_world_globe_dark</item>
     </style>
 
     <style name="OsmandLightDarkActionBarTheme" parent="Theme.AppCompat.Light.DarkActionBar">

From 086033df45fbfe3f21b6da9e098770f22348b6ca Mon Sep 17 00:00:00 2001
From: ace shadow <acelists@atlas.sk>
Date: Thu, 5 Feb 2015 18:30:12 +0100
Subject: [PATCH 05/26] Translated using Weblate (Slovak)

Currently translated at 100.0% (1621 of 1621 strings)
---
 OsmAnd/res/values-sk/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index 38a8191b8b..37bfb11a66 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -2056,4 +2056,5 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
 <string name="edit_group">Upraviť skupinu</string>
     <string name="plugin_description_title">Popis</string>
 	<string name="plugin_settings_button_caption">Nastavenia</string>
+<string name="plugin_install_needs_network">Pre nainštalovanie tohto doplnku potrebujete pripojenie na Internet.</string>
 </resources>

From 025dfe9205144b6efadc7e1e0e76f8ee00da09dc Mon Sep 17 00:00:00 2001
From: jan madsen <jsm@janz.dk>
Date: Thu, 5 Feb 2015 18:40:49 +0100
Subject: [PATCH 06/26] Translated using Weblate (Danish)

Currently translated at 100.0% (1621 of 1621 strings)
---
 OsmAnd/res/values-da/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml
index ce9f7e7ff9..be3d565ed9 100644
--- a/OsmAnd/res/values-da/strings.xml
+++ b/OsmAnd/res/values-da/strings.xml
@@ -1905,4 +1905,5 @@
 <string name="plugin_description_title">Beskrivelse</string>
 	<string name="plugin_settings_button_caption">Indstillinger</string>
 <string name="edit_group">Rediger gruppe</string>
-    </resources>
+    <string name="plugin_install_needs_network">Der behøves en internetforbindelse for at installere udvidelsen.</string>
+</resources>

From 3c360d3b947b1cd4839a128a35a5fe6eecab91f3 Mon Sep 17 00:00:00 2001
From: stephan 75 <stephan.r@web.de>
Date: Thu, 5 Feb 2015 19:30:24 +0100
Subject: [PATCH 07/26] Translated using Weblate (German)

Currently translated at 100.0% (1621 of 1621 strings)
---
 OsmAnd/res/values-de/strings.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index ef5441eae8..9a34098f97 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
 	<string name="traffic_warning_speed_limit">Geschwindigkeitsbegrenzung</string>
 	<string name="traffic_warning_border_control">Grenzkontrolle</string>
@@ -2051,4 +2051,6 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="disable_plugin">Deaktivieren</string>
     <string name="plugin_description_title">Beschreibung</string>
 	<string name="plugin_settings_button_caption">Einstellungen</string>
-</resources>
+<string name="plugin_install_needs_network">Die Installation dieses Plugins benötigt eine Internet-Verbindung.</string>
+<string name="edit_group">Gruppe bearbeiten</string>
+    </resources>

From 787305dec5516a041abe1ba65bcec6859a8aa7fd Mon Sep 17 00:00:00 2001
From: Thomas Tonino <ttonino@home.nl>
Date: Thu, 5 Feb 2015 20:37:55 +0100
Subject: [PATCH 08/26] Translated using Weblate (Dutch)

Currently translated at 100.0% (1621 of 1621 strings)
---
 OsmAnd/res/values-nl/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml
index d877294d06..9607723031 100644
--- a/OsmAnd/res/values-nl/strings.xml
+++ b/OsmAnd/res/values-nl/strings.xml
@@ -2072,4 +2072,5 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
 <string name="plugin_description_title">Omschrijving</string>
 	<string name="plugin_settings_button_caption">Instellingen</string>
 <string name="edit_group">Bewerk groep</string>
-    </resources>
+    <string name="plugin_install_needs_network">Om deze plugin te installeren is een internetverbinding nodig.</string>
+</resources>

From cce2e284b41587162ed9dea64825d67167ad8dbd Mon Sep 17 00:00:00 2001
From: Viktar Palstsiuk <vipals@gmail.com>
Date: Thu, 5 Feb 2015 21:10:56 +0100
Subject: [PATCH 09/26] Translated using Weblate (Belarusian)

Currently translated at 100.0% (1621 of 1621 strings)
---
 OsmAnd/res/values-be/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index d7fc94fc0f..67c2e08bb1 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -2015,4 +2015,5 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="plugin_settings_button_caption">Налады</string>
 <string name="edit_group">Правіць групу</string>
     <string name="osmo">OsMo</string>
-	</resources>
+	<string name="plugin_install_needs_network">Неабходна падключэнне да Інтэрнэту, каб усталяваць гэты модуль.</string>
+</resources>

From 55d650ca1f029a427093b064006343f1706d22b2 Mon Sep 17 00:00:00 2001
From: Nicolas Palix <nicolas.palix@gmail.com>
Date: Thu, 5 Feb 2015 18:52:43 +0100
Subject: [PATCH 10/26] Translated using Weblate (French)

Currently translated at 100.0% (1621 of 1621 strings)
---
 OsmAnd/res/values-fr/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 9f69c59be3..ad5b462177 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -1923,4 +1923,5 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
 <string name="plugin_description_title">Description</string>
 	<string name="plugin_settings_button_caption">Paramètres</string>
 <string name="edit_group">Modifier le groupe</string>
-    </resources>
+    <string name="plugin_install_needs_network">Vous nécessitez une connexion Internet pour installer ce greffon.</string>
+</resources>

From 4317eda4b1a462e75a278f3ebb2909f6c8b855ce Mon Sep 17 00:00:00 2001
From: Mirco Zorzo <mircozorzo@inwind.it>
Date: Thu, 5 Feb 2015 23:59:05 +0100
Subject: [PATCH 11/26] Translated using Weblate (Italian)

Currently translated at 100.0% (1621 of 1621 strings)
---
 OsmAnd/res/values-it/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml
index aa15831c71..8333ccf2ff 100644
--- a/OsmAnd/res/values-it/strings.xml
+++ b/OsmAnd/res/values-it/strings.xml
@@ -2072,4 +2072,5 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
 <string name="plugin_description_title">Descrizione</string>
 	<string name="plugin_settings_button_caption">Impostazioni</string>
 <string name="edit_group">Modifica il gruppo</string>
-    </resources>
+    <string name="plugin_install_needs_network">È necessario la connessione a internet per installare questo componente aggiuntivo.</string>
+</resources>

From 8c6506daf406526299dc877d89361f6b0b3b553c Mon Sep 17 00:00:00 2001
From: Roberto GEB <robertogeb@gmail.com>
Date: Fri, 6 Feb 2015 00:50:45 +0100
Subject: [PATCH 12/26] Translated using Weblate (Spanish)

Currently translated at 100.0% (1621 of 1621 strings)
---
 OsmAnd/res/values-es/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 8b2a03af5b..902ba782cd 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -1914,4 +1914,5 @@
 <string name="plugin_description_title">Descripción</string>
 	<string name="plugin_settings_button_caption">Opciones</string>
 <string name="edit_group">Editar grupo</string>
-    </resources>
+    <string name="plugin_install_needs_network">Necesitas una conexión a Internet para instalar este plugin.</string>
+</resources>

From b9eaa019864e6c22d3a710529d5738977a0bec8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B6=8C=20=EC=A1=B0?= <chobkwon@gmail.com>
Date: Fri, 6 Feb 2015 03:23:28 +0100
Subject: [PATCH 13/26] Translated using Weblate (Korean)

Currently translated at 100.0% (1621 of 1621 strings)
---
 OsmAnd/res/values-ko/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-ko/strings.xml b/OsmAnd/res/values-ko/strings.xml
index e9f4d77694..4ddb49f8cb 100644
--- a/OsmAnd/res/values-ko/strings.xml
+++ b/OsmAnd/res/values-ko/strings.xml
@@ -2135,4 +2135,5 @@
 <string name="plugin_description_title">설명</string>
 	<string name="plugin_settings_button_caption">설정</string>
 <string name="edit_group">그룹 편집</string>
-    </resources>
+    <string name="plugin_install_needs_network">이 플러그인을 설치 하려면 인터넷에 연결을 해야 합니다.</string>
+</resources>

From 994a9495c822c255c3d1d0965218de09f16816dd Mon Sep 17 00:00:00 2001
From: Evgenii Martynenko <deathstallker@yandex.ru>
Date: Fri, 6 Feb 2015 06:19:39 +0100
Subject: [PATCH 14/26] Translated using Weblate (Russian)

Currently translated at 100.0% (1621 of 1621 strings)
---
 OsmAnd/res/values-ru/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 6f0f69cebf..c3b28f80a6 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1878,4 +1878,5 @@
     <string name="plugin_description_title">Описание</string>
 	<string name="plugin_settings_button_caption">Настройки</string>
 <string name="edit_group">Редактировать группу</string>
-    </resources>
+    <string name="plugin_install_needs_network">Вам необходимо интернет соединение для установки этого плагина.</string>
+</resources>

From 882961b088b3a43f3386b45b3d2a45f2f1aae549 Mon Sep 17 00:00:00 2001
From: josep constanti <jconstanti@ovi.com>
Date: Fri, 6 Feb 2015 08:13:09 +0100
Subject: [PATCH 15/26] Translated using Weblate (Catalan)

Currently translated at 100.0% (1621 of 1621 strings)
---
 OsmAnd/res/values-ca/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index 3102ed128d..a209e3a540 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -1889,4 +1889,5 @@
 <string name="plugin_description_title">Descripció</string>
 	<string name="plugin_settings_button_caption">Configuració</string>
 <string name="edit_group">Edició del grup</string>
-    </resources>
+    <string name="plugin_install_needs_network">Us cal una connexió a internet per instal·lar aquest connector.</string>
+</resources>

From d3fa67f2aaeb359a266fda423fd9f9a706a1cd3b Mon Sep 17 00:00:00 2001
From: Alexey Pelykh <alexey.pelykh@gmail.com>
Date: Fri, 6 Feb 2015 13:01:54 +0200
Subject: [PATCH 16/26] Plugins

---
 .../res/color/switch_ex_button_text_dark.xml  |   4 +-
 .../ic_action_settings_disabled_dark.png      | Bin 0 -> 1637 bytes
 .../ic_action_settings_disabled_light.png     | Bin 0 -> 1633 bytes
 ...ng => ic_action_settings_enabled_dark.png} | Bin
 ...g => ic_action_settings_enabled_light.png} | Bin
 .../ic_action_settings_disabled_dark.png      | Bin 0 -> 1422 bytes
 .../ic_action_settings_disabled_light.png     | Bin 0 -> 1413 bytes
 ...ng => ic_action_settings_enabled_dark.png} | Bin
 ...g => ic_action_settings_enabled_light.png} | Bin
 .../ic_action_settings_disabled_dark.png      | Bin 0 -> 1857 bytes
 .../ic_action_settings_disabled_light.png     | Bin 0 -> 1843 bytes
 ...ng => ic_action_settings_enabled_dark.png} | Bin
 ...g => ic_action_settings_enabled_light.png} | Bin
 .../ic_action_settings_disabled_dark.png      | Bin 0 -> 2343 bytes
 .../ic_action_settings_disabled_light.png     | Bin 0 -> 2339 bytes
 ...ng => ic_action_settings_enabled_dark.png} | Bin
 ...g => ic_action_settings_enabled_light.png} | Bin
 OsmAnd/res/drawable/extension_stub.xml        |  14 ++
 .../res/drawable/ic_action_settings_dark.xml  |   7 +
 .../res/drawable/ic_action_settings_light.xml |   7 +
 .../drawable/switch_ex_background_dark.xml    |   8 +-
 .../drawable/switch_ex_background_light.xml   |   8 +-
 OsmAnd/res/layout/dash_plugin_item.xml        |  66 +++++---
 .../expandable_list_item_category_btn.xml     |   2 +-
 OsmAnd/res/layout/plugin.xml                  |  95 +++++++----
 OsmAnd/res/layout/plugins.xml                 |   1 -
 OsmAnd/res/layout/plugins_list_item.xml       | 155 +++++++++---------
 OsmAnd/res/values/attrs.xml                   |   3 +-
 OsmAnd/res/values/colors.xml                  |   4 +-
 OsmAnd/res/values/strings.xml                 |   7 +-
 OsmAnd/res/values/styles.xml                  |   6 +-
 OsmAnd/src/net/osmand/plus/OsmandPlugin.java  |  18 +-
 .../activities/FavoritesTreeFragment.java     |   5 +-
 .../plus/activities/MapActivityActions.java   |   4 +-
 .../plus/activities/PluginActivity.java       |  84 +++++++---
 .../plus/activities/PluginsActivity.java      |   4 +-
 .../plus/activities/SelectedGPXFragment.java  |   4 +-
 .../plus/dashboard/DashPluginsFragment.java   |  51 ++++--
 .../osmand/plus/dialogs/ConfigureMapMenu.java |   3 +-
 .../osmand/plus/osmo/OsMoGroupsActivity.java  |   8 +-
 40 files changed, 369 insertions(+), 199 deletions(-)
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_action_settings_disabled_dark.png
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_action_settings_disabled_light.png
 rename OsmAnd/res/drawable-hdpi/{ic_action_settings_dark.png => ic_action_settings_enabled_dark.png} (100%)
 rename OsmAnd/res/drawable-hdpi/{ic_action_settings_light.png => ic_action_settings_enabled_light.png} (100%)
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_action_settings_disabled_dark.png
 create mode 100644 OsmAnd/res/drawable-mdpi/ic_action_settings_disabled_light.png
 rename OsmAnd/res/drawable-mdpi/{ic_action_settings_dark.png => ic_action_settings_enabled_dark.png} (100%)
 rename OsmAnd/res/drawable-mdpi/{ic_action_settings_light.png => ic_action_settings_enabled_light.png} (100%)
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_settings_disabled_dark.png
 create mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_settings_disabled_light.png
 rename OsmAnd/res/drawable-xhdpi/{ic_action_settings_dark.png => ic_action_settings_enabled_dark.png} (100%)
 rename OsmAnd/res/drawable-xhdpi/{ic_action_settings_light.png => ic_action_settings_enabled_light.png} (100%)
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_settings_disabled_dark.png
 create mode 100644 OsmAnd/res/drawable-xxhdpi/ic_action_settings_disabled_light.png
 rename OsmAnd/res/drawable-xxhdpi/{ic_action_settings_dark.png => ic_action_settings_enabled_dark.png} (100%)
 rename OsmAnd/res/drawable-xxhdpi/{ic_action_settings_light.png => ic_action_settings_enabled_light.png} (100%)
 create mode 100644 OsmAnd/res/drawable/extension_stub.xml
 create mode 100644 OsmAnd/res/drawable/ic_action_settings_dark.xml
 create mode 100644 OsmAnd/res/drawable/ic_action_settings_light.xml

diff --git a/OsmAnd/res/color/switch_ex_button_text_dark.xml b/OsmAnd/res/color/switch_ex_button_text_dark.xml
index 2f3ae3f24b..a34b099635 100644
--- a/OsmAnd/res/color/switch_ex_button_text_dark.xml
+++ b/OsmAnd/res/color/switch_ex_button_text_dark.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_checked="false" android:color="#ffffff" />
-	<item android:state_checked="true" android:state_pressed="false" android:color="#77848c" />
+	<item android:state_checked="false" android:state_pressed="false" android:color="#77848c" />
 	<item android:state_checked="false" android:state_pressed="true" android:color="#ffffff" />
+	<item android:state_checked="true" android:color="#ffffff" />
 </selector>
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_settings_disabled_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_settings_disabled_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..13bf1d76a98daad1087b38c5175fb602f06429d6
GIT binary patch
literal 1637
zcmaJ>c~BE)6i;;kIlZtbqr-MZp~_~DoEr%kl3=0+xuIjVY_gkVfn>w(LV~q+peco-
zwYH39v=+vyNUNP5LTxP-k5Saxp%t%aEtc`XB8-)3>9mdA0I~kzbZ2(I?|t9<z4v?9
zHe_e5h>nPl5Q#+5MuRR_SQ7*9v{2!DQ`FonEc1AMF`vg+c{jmQA`QuyDZuC;Y*a2q
zkku7us8o??s+Z0$=8H|MRTjn}CIUKQkHaOPMWWPnkBhLBQ9NL#Y_wAijvP4(0yL=x
zi)1Fm<kC`h+OUD8@-}4UTQ-zga1u;U15!OI!GMF}3BcnhcXBF^8XUK)683>(7zD;u
z_%by(L8{o44QLsb0%T%2WI<3VpuokbOs>EcDF7zOFrtJp1VV6?Ork<CVDbS4Z!Bq5
z<?1pgeF>5pwDY`61;cK)TkMvI8P*1)IF7>z24ff`Xh2-GlP5folUo?HprbeoOS^cQ
zaRLF0gqf-2)u6z1A_RxaWO{7a$xS9oNEz%QTres|V22|R*SI#v=TiUCc&av+U+tpc
zT#92VS&L8)>%t&d$ld=t3MdL}RBKpTC<;-oV=R>p%E=pbYEZZllQgN4%1F{|mdhbb
zE|)?$BE=ybCoxD)p_I&GmQq$T8MN~>ybhOW6qy;B8l7H)qI#)DE?4R_SO$jZWikYl
z1hGaZ#}iHq74%IDz9+Hz|HZ1bEJg4Po6j)i!7j+QGd#oD85f|{j#nK>E~1?z<K~_Z
zlxZSr9mUdB6q(5~4q!abD*7oL5XvgUl@tQuQaJ)Clu|jQl%ZD0ETOC<N@Ao!DhDU=
z<P-Uu=u_cDh{F}6qarZeB9Ti-h)~KU5Q<VlO05J15i-hx;xelgQ=lL$P=o`m^F%8J
zkA(gVY#$GXAUqx|$|=kfD-6zepUwMSB%0zj>NNQt-%#@^LsL%dX<Kf1j?|sjdp35~
zI=i8DXY$>eMT6p;S=;jSr88nPn(Bf2J=oGMU|ddXWP+pgIs4%5>w7evJu@^1yTj}e
zI|d#d4^OKbxxraoX|cDvr{6wu=ZMYE4G&yj=G=OEz_+TZyW@09a{U+CBXzsWI)422
zg_2nBwK0E9WB;zi-d}B7s}^bTc=T+>^7k)jx1SoDjzh_>KUgu+2`Ki5y;pwYTxe4B
zl_baKd+NrPBtN^Rw6XoIKL#I0-JR0a8s4<6<lS2}Eu(&0cFf9TZf$?$*pfN1A;ZNV
zOn>c~7v6{UwHr^WUF%ikc|hL1_Io@VnAsF@Z@w?AV0#Q(>-**<>`H1wdMHTWTGv+9
zu;{{ZG~%6@i-;lYeo6d+nuPvmdPE7{3Q(zOJGOLjPs-t_?NYyfM*>$jcV}zpA-1-V
zt}d*NHX$8Tist^%xPIxy(#ZZO&(OJ3SM(<c+tlMXd%N6m8%NuCuibaYTWgiwNBx(u
zpGq6!B3AYtdi2|hY;khmn0Q*qE!tPM|58Ipd$^kHIT@{y75Ou_j3^fjJ8O}ww|(js
zZ0A5uuU57uX<x#8BI{!)aWk}F*0RXOnh-<ly_V%ycZu4(6_>s${n@}JuAY%%%saog
zGdliol&K~uX3pifk{7Y|i&g%lZgZi%qQ3AdwyWVlW!oE_HHx%N52p2m!R;yke7UwN
z-N$=hiNOZv`l2`Gy_|5jwUgAoTHslA3{W54`{9{6Z~oPLS<><KP(j(ok7ByQ3hMkV
zDdqzw`sVE~>x~_FG(6h1dG_deT5~V{;pI=SZuxU|--5qSlpYQD%`6d>4sp7^Uk<hf
Pe*8v#mhO{`lG=X(N`_%&

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_action_settings_disabled_light.png b/OsmAnd/res/drawable-hdpi/ic_action_settings_disabled_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..cabfca27b454f182163039414f2ccc0b3b5e54cb
GIT binary patch
literal 1633
zcmaJ>c~BEq7+*yYP+>q66|39zn4oU<NH)m^BE|$vW(uZ|mN-)>o9qjTkZedcBv7g~
zsAy}&ajd2F0ByyN^*%v69FC$@6rI5l7;#jlI$FeOr+840ZaA!eIPT2ud*6HC@B4n=
zwd)KSi^fGxiG(0%oL;BR6xNx+H#|)E-hnDBg=I3IYT~mvEAM0608+D@8Nhl6lLs;Z
z!xk6*4w4}#WR=}$;!WuvDJ`5s%mj7BeuqmyLr`*x-^Ez+0S}u&p53WJ9-nSNU^}Zq
zvZ-`D-K7CGyRO6yvPv?HmXdr6%_1rD;bgy3FyH_@1N$8XPLI;BLI&(Ag?;cCL*M}w
zK3|0lk}{<mU=8O6FeR3u7Mzg6a#~DKGC3`u2a|$~;R=kzQJhv%5+zQ;Lk}W&bF)@u
zrZ#QJmmsMS8_&Cx80Pc&#6F3bbLU|MP16`oVkC(Q8mOn($uoY`>6tNXK?^(<x823t
zIVT*n$e1}VuR;W-gCRIv>FI9_J3T{*5>kfw85c%~am?We#x<br;WNSiG~TK0F&4W3
zmI*wZ*KHB%VVyAy7IOD~M?pn_jdHQuE)<0+&~g^912}oTR)q*RV%E+or4-AW%`zEE
z%4AZM#-%h$(=3U~00AhASqiLXcG%9l@LF1;mZxbXYHg~TAX24jnM|QolM6{am7;J`
zGK|$bJv`&IfMMTu!S@iBd@ok1aRY|u+(wQo814dtjpI3wjdQ^o%|O**QMTR5az0OD
zuuOwdYk}Kd1lTk;=YR+DthB#_0}iYdtpGSmOJz7JS4d^3f+DP_Spuvq!IG?8Dno|w
z>|6O8>{H=Hh{H8ZN6C=1MIw{1D5H=`P=WwLO05h)846eknzBksIe}mTMJ(7lZ?)3!
zk<g#P?VG_6gg2uFoWeZ0g~5sY;zm0Jjr8cXYNNlir!rk<{5bCX2i}dkwxSNh=EO<e
z3umoD!pr94=Q<<4j!~}(gq|4{n|dr_mo7}YR3{EBkUzLMF+kTD<jXYOyO6MbancV{
za@+n|acAt<gTBXfh9o*9`bBQ-(|XD4x~DrT<OgihA5VNgPvxlSsE4nR`$L*?4gCd^
zpM^)Yw>Vb*nrpgy;m^L=p!|yMtmqQ-JY#xCqIG_&UA?-c)OjSdu5qcsakN(|$}7!o
z@7bihn`Xf3+X`!@mFlY+%BJB^Z`szF?d&JF6ZTh)I=LX^(aqVFVO6g>L-T8DM3+W*
zZo499yinE7`}WA_#EC!k#MaKP)1+2k-<kYuDq9%HF~v{r8NDtg;z;7(z1M2bMv7eP
z13xdK_HLN|tSS3YWc^oBhLO#ymPfe*bD9#G^^@8H;PQ*uu8QKaig4SA3Wa)wD0yq+
zn&ytILuc0J?D7^p8UGoy{j`3)il15}6D3D=oyvnZ>K<IUy1sQx=xVCFJa#`gWlKWh
zc%$Ui+!%FUllSt?2|KIjT=tK-t~?BTcP<*6bWQxry=Axd{4lrXUN7PD1dLBg&&@nP
zzPf7Jj*ONh*R}_rPTz!|;B`GnW$4M3<$D{-i+o|*;`^7}?~I<_6?3w&gSh%K`glRY
zvBIRdkxQc{+{nRa)wRvpj@6i2B16kX7nf%(j{Dr#pE&Nfu0P^eK-6vOyWN$l!~b48
zwSm~O`(@jjCo5Oig8R08jj(pYt%TeQv0r+tH+ODXd)y-JYkLR|E|J7nPyA=Yo#zqX
zRJIe|Jr60-*_KxNWlnQMf6p<vZ^}`tuBdyR!u#ko)7KEu8Iud`SzcOVYH7V0{ORjc
LGqeX5<_7))XX;<?

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/ic_action_settings_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_settings_enabled_dark.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/ic_action_settings_dark.png
rename to OsmAnd/res/drawable-hdpi/ic_action_settings_enabled_dark.png
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_settings_light.png b/OsmAnd/res/drawable-hdpi/ic_action_settings_enabled_light.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/ic_action_settings_light.png
rename to OsmAnd/res/drawable-hdpi/ic_action_settings_enabled_light.png
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_settings_disabled_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_settings_disabled_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a6042b1e48d2789334df27803eaa995ce030f23
GIT binary patch
literal 1422
zcmaJ>eM}o=7%%9Yfib3TbHdn;0~I%}ch`?=@7B8Y6FLFAg02{2y!PJG0=+w~2Q8Q|
zG8~&`OXgf~5ThteG%T~I$z)CiKO#(~TY&iyh`7MAn8`kp4L3!63l#SU*(LA2@AKaC
zd!FC(b+0&!@=}u0k`xL>iX-3Zg8RDIy8k}-9uFJ;g4-jq%`F!TJ~_-vKw;tp4?rA2
zwhXuc%hgs50E0qt&&z=lx9lz~V7x+5$;Nb)k)R0C3WZ^7L}a}cKt?>EEWjJlE1!Ld
zA_2~b?$j0%g`x%c1Nn6lD6T6i@zzy%X%5}`Bw~m#&_EE#ED{M;@*yT-MCa@>@Ep6w
zQDja<t}vqWq}+v0#3D!l(JCp-OOP5wM=MD!rK5GZhziO$p~qDOM$n8_%@8VN;X$D{
ziSscot9`*2l#HlfmPH1~!{M+ptX2wA8BWqPjT0(drNW>F7OLfCHiGe?thfa$2zjM|
zC<g={iCJVlLbYr}A=CK~f?{FeqG3L?kSLfkJi>}NsU+}VFc#OGc1U)C|7k3#9V)36
z0qz1Jp<437dib*9V3@nRJBlenHq6sf02YO<v<lwpAmC+()ri6`N-n@L8ZF0pJQRhg
zC`yCTgoegwnp0sEAc5BF(Ey)^i`!WWZzF6p1((TcGm)fCW2P-8JE5{$b);2mqwR65
zgAd6p?*(z+0qA=HtG_Fju}FZG1*t?3D&t+?^b4{O@(UtjvCLH+$=Mm;IUyW+B37pP
zsI5Q>)Bw&d2|;8o&rDzm4g~ONX+0n?T0;?-POqUby_WQ09yRcBB&XtZ8VX&&b9dx#
zzE9x|j6;mmVOSOIRa0sXWA&68BS`>L>SF=MYJr!ewLXnXN1`~Sh{syzj#i3a!TyXL
z7Y73hi=zd2I8PEBoQpFf8igXE&0#f_M1CDU|5T2ZUA_Ej&xSGX_Xjou)4LPh-Q9=G
zHDB%SaIdl@*@~a_u$dj%>94kAC#Sdgj&&T#_mI@bw%W^wm;E%`)y{u+YwGi%!Q3}*
zkH}Ng^`l#wK<O8<y$L__+Ks>4!~Ve!Mw1Gnql(LyHr;#T{6np##)Dms$p@dQ9qg%b
zt~e1*xZzBE$(b`8Y+BZT^tS~4-pZ=foVD*X@9%y5NNe9@!^ZdAEmiJjUz^>~pGF#w
zCF1J5&DS~`wf)1I>nmnHDcQc!P=5O2*QbU}1;v>wtE0(RvbTM|?%~tB`VI{D5!kuq
zU4%tFel2mxd_0A!?)0bMELBcK|NW<hsp{mXdkZd{x%y{KYHQn`$>%cCCVo75sc2uu
ze)G@u-{ds6<@--Hy!A`_YBaj3`fS$ohBZJ;7(19ZoZs%uJgjTmadO}f`wQhakFH;7
zm}<P;Td-aIsZ=-f*ea8LDEQIaKU^ne^P}s}z2C9#?4F9fmPli1=Nn_MM+Y**)RElT
z@-0<i@zCJ(xT*hJ*R8&uwbBlJ&4FFBA7037NKjbn3PAFP`i|Hi(qSvI9yh<Z`#(60
B1Tp{s

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_action_settings_disabled_light.png b/OsmAnd/res/drawable-mdpi/ic_action_settings_disabled_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6755c6741a8e8f93f60a25c7516a11b3cea6a07
GIT binary patch
literal 1413
zcmaJ>eM}o=7{AiN_z=?R1U53c+)zQe-d%gW_D%{dy>>t>W6))dbJ6SFTev{)+Ur3J
zBO46Vj(s>aaSJns&7ek{5tsOdnFJd%6HHhZ6XG8_8s{I=MCW3*KbFk5KyiO8yX5YD
zpZ9%!&+~h}?r2B*uF~S|#R!6wwzlw{aIMU~g$3|?E#bTamu<Q?sCTJhJt1fSaZ73l
zpsf+18*~Ce8jSq_8W6-dE(d~o(EmIqsu8o0)iEa{QHVy6hNfgx5PN}+hCsKhII+Lx
zzQs^ka$@^ze$pTHfF8MJNCRC%?E!J9S7arusS#~Ra?n5o=mMII^eJ&J>BLs;a&VtL
zCNOkWMelWDYovny4%DM+0JWJJTqG$PwX<f*#@JbVJ!*k6K{^NviIXg6vvQ;bU4Jm>
zO_Rc0C+}PL1tlleqw7(QAQFj$Ibk)cS~o$lEK86U!eYUp1|A<&bRmf=@trvfJcx^$
z9Mxr2L9-TxklL?1G01c+gh<ry-!QDi*AoR(MkIwOL77P+63NE3svXxm!T&TKs2vXs
zMgh?Y;%dJp!g_>v=D;v_4|kMRglxFonhc8~^zo|L9|4Nq$~!T5W0quzqivED3NZ|B
zVHg@`Nt(r3R<hs>pny#b(I6a>a&{hs_mW<gA-%kt_qr*{OE<F~w~w^=css@0ysR&W
zZB^pBpok#nTZX>Zv7U!wIgbVeUDX1r+L!BsjviH4<2`B=^>|jRj@Isz6-iCR>#}89
zi<$?TJOCu0rbf`!Jah5`IFKN0V;z9RS(+hnyMtzMhm8v3Au9+=lw^_YG=r_<rTg-?
z)~E0U#u3fY;RFjSS{bW^3l7GLQxt$H4GRDlY(S(~TbQ=kDU5&=iEQiK*Gjn~*q_<$
z#$Z5UW3+$*=ShQuV|!m_5yWu1m3Ie{KZow#yVqpI4UZX57)p-E{=Knx_{LL6tZ_1!
zXCl(m?*04E)>NMfZMixfHp!+s-%{Ql^ipB^>gY0(njTHonM#B!e{4!$a4nVs!kBr_
zwK(x{YRlUbQ!%nC)phE(!+F$mhF#}p>IyQAeKACfVUytjtl4nDkJB||{h3YaMaLt9
zMd{h4sl1gQ^w3Gq1;k_*FJ3DsE4@7utWKRqZXT>Hc;$;H0%bey=4Wm#*SCxnT(Q%o
z*E_1G#_X;ak9Ze%q`EV0-jb2zlatHs4J)skH@C$O7F{<E6t}&4c>JGHqiOE^(XUo0
z(*bkk<kO$NaH=Rh_r_b5TXn;1VflCY=d{bNvea$lCf`@iqZNl*Tt%tfNUYFw%R^nB
z{$M2d_^}}$`uRew{~Y^w&B^4Rg3M3+_r?!<Y8QSVv)-9_>Ct%&Z9M+$n=@1LV3ldJ
zVU{zg<6jq7EgOG~zU%s?JoT#~mVarXtm4bOk3381UoxrT&z^bbY%r~KTwGv}dH>u>
hZQu6V@Jt>$kF+U!%PJP;yR$#WR&P81N%PA`{sXqY+gktt

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-mdpi/ic_action_settings_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_settings_enabled_dark.png
similarity index 100%
rename from OsmAnd/res/drawable-mdpi/ic_action_settings_dark.png
rename to OsmAnd/res/drawable-mdpi/ic_action_settings_enabled_dark.png
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_settings_light.png b/OsmAnd/res/drawable-mdpi/ic_action_settings_enabled_light.png
similarity index 100%
rename from OsmAnd/res/drawable-mdpi/ic_action_settings_light.png
rename to OsmAnd/res/drawable-mdpi/ic_action_settings_enabled_light.png
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_settings_disabled_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_settings_disabled_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..cd46e798cf32005d9841404cebce9a79b7aa97ab
GIT binary patch
literal 1857
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

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_settings_disabled_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_settings_disabled_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..9de95984628f6f25212f5125508c6ee7fb2f023f
GIT binary patch
literal 1843
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
Y!4Cn4*2TeFKJop=GIZJ6{V4|5zZP!0y#N3J

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_settings_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_settings_enabled_dark.png
similarity index 100%
rename from OsmAnd/res/drawable-xhdpi/ic_action_settings_dark.png
rename to OsmAnd/res/drawable-xhdpi/ic_action_settings_enabled_dark.png
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_settings_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_settings_enabled_light.png
similarity index 100%
rename from OsmAnd/res/drawable-xhdpi/ic_action_settings_light.png
rename to OsmAnd/res/drawable-xhdpi/ic_action_settings_enabled_light.png
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_settings_disabled_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_settings_disabled_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..e23d624a217bfd4f958de5efac09fa888a98cc44
GIT binary patch
literal 2343
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
KUY+;W)c*nHDZYsS

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_settings_disabled_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_settings_disabled_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..e92be991d9036caf90f30fa567ab17641ce4ca6c
GIT binary patch
literal 2339
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
HEy?^J%8{Zt

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_settings_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_settings_enabled_dark.png
similarity index 100%
rename from OsmAnd/res/drawable-xxhdpi/ic_action_settings_dark.png
rename to OsmAnd/res/drawable-xxhdpi/ic_action_settings_enabled_dark.png
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_settings_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_settings_enabled_light.png
similarity index 100%
rename from OsmAnd/res/drawable-xxhdpi/ic_action_settings_light.png
rename to OsmAnd/res/drawable-xxhdpi/ic_action_settings_enabled_light.png
diff --git a/OsmAnd/res/drawable/extension_stub.xml b/OsmAnd/res/drawable/extension_stub.xml
new file mode 100644
index 0000000000..00571fbcd3
--- /dev/null
+++ b/OsmAnd/res/drawable/extension_stub.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape>
+			<size
+				android:width="360dp"
+				android:height="144dp"/>
+			<solid android:color="#ff8f00"/>
+		</shape>
+	</item>
+	<item>
+		<bitmap android:src="@drawable/ic_extension_dark" android:gravity="center" />
+	</item>
+</layer-list>
diff --git a/OsmAnd/res/drawable/ic_action_settings_dark.xml b/OsmAnd/res/drawable/ic_action_settings_dark.xml
new file mode 100644
index 0000000000..79a8eb74e3
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_settings_dark.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_enabled="true"
+		  android:drawable="@drawable/ic_action_settings_enabled_dark" />
+	<item android:state_enabled="false"
+		  android:drawable="@drawable/ic_action_settings_disabled_dark" />
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/ic_action_settings_light.xml b/OsmAnd/res/drawable/ic_action_settings_light.xml
new file mode 100644
index 0000000000..fd9d2e7490
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_settings_light.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+	<item android:state_enabled="true"
+		  android:drawable="@drawable/ic_action_settings_enabled_light" />
+	<item android:state_enabled="false"
+		  android:drawable="@drawable/ic_action_settings_disabled_light" />
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/switch_ex_background_dark.xml b/OsmAnd/res/drawable/switch_ex_background_dark.xml
index 3964927081..2bec09473c 100644
--- a/OsmAnd/res/drawable/switch_ex_background_dark.xml
+++ b/OsmAnd/res/drawable/switch_ex_background_dark.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_checked="false" android:state_pressed="false">
+	<item android:state_checked="true" android:state_pressed="false">
 		<shape android:shape="rectangle">
 			<corners android:radius="2dp" />
 			<solid android:color="#ff8f00" />
 		</shape>
 	</item>
-	<item android:state_checked="false" android:state_pressed="true">
+	<item android:state_checked="true" android:state_pressed="true">
 		<shape android:shape="rectangle">
 			<corners android:radius="2dp" />
 			<solid android:color="#ffb24c" />
 		</shape>
 	</item>
-	<item android:state_checked="true" android:state_pressed="false">
+	<item android:state_checked="false" android:state_pressed="false">
 		<shape android:shape="rectangle">
 			<corners android:radius="2dp" />
 			<solid android:color="@null" />
 			<stroke android:width="1.5dp" android:color="#77848c" />
 		</shape>
 	</item>
-	<item android:state_checked="true" android:state_pressed="true">
+	<item android:state_checked="false" android:state_pressed="true">
 		<shape android:shape="rectangle">
 			<corners android:radius="2dp" />
 			<solid android:color="#66ff8f00" />
diff --git a/OsmAnd/res/drawable/switch_ex_background_light.xml b/OsmAnd/res/drawable/switch_ex_background_light.xml
index 4c1034023e..305f40e734 100644
--- a/OsmAnd/res/drawable/switch_ex_background_light.xml
+++ b/OsmAnd/res/drawable/switch_ex_background_light.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-	<item android:state_checked="false" android:state_pressed="false">
+	<item android:state_checked="true" android:state_pressed="false">
 		<shape android:shape="rectangle">
 			<corners android:radius="2dp" />
 			<solid android:color="#ff8f00" />
 		</shape>
 	</item>
-	<item android:state_checked="false" android:state_pressed="true">
+	<item android:state_checked="true" android:state_pressed="true">
 		<shape android:shape="rectangle">
 			<corners android:radius="2dp" />
 			<solid android:color="#ffb24c" />
 		</shape>
 	</item>
-	<item android:state_checked="true" android:state_pressed="false">
+	<item android:state_checked="false" android:state_pressed="false">
 		<shape android:shape="rectangle">
 			<corners android:radius="2dp" />
 			<solid android:color="@null" />
 			<stroke android:width="1.5dp" android:color="#727272" />
 		</shape>
 	</item>
-	<item android:state_checked="true" android:state_pressed="true">
+	<item android:state_checked="false" android:state_pressed="true">
 		<shape android:shape="rectangle">
 			<corners android:radius="2dp" />
 			<solid android:color="#66ff8f00" />
diff --git a/OsmAnd/res/layout/dash_plugin_item.xml b/OsmAnd/res/layout/dash_plugin_item.xml
index 07decdaa22..301feb58f0 100644
--- a/OsmAnd/res/layout/dash_plugin_item.xml
+++ b/OsmAnd/res/layout/dash_plugin_item.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
+	android:id="@+id/dash_plugin_item"
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:osmand="http://schemas.android.com/apk/res-auto"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:id="@+id/dash_plugin_item"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:orientation="vertical">
@@ -42,28 +42,56 @@
 			osmand:typeface="@string/font_roboto_regular"
 			tools:text="@string/lorem_ipsum"/>
 
-		<net.osmand.plus.widgets.SwitchEx
-			android:id="@+id/check_item"
+		<FrameLayout
 			android:layout_width="90dp"
 			android:layout_height="wrap_content"
 			android:layout_gravity="center_vertical"
-			android:layout_marginTop="6dp"
 			android:layout_marginBottom="6dp"
-			android:layout_marginLeft="6dp"
-			android:layout_marginStart="6dp"
-			android:layout_marginRight="16dp"
 			android:layout_marginEnd="16dp"
-			android:background="?attr/switch_ex_background"
-			android:minHeight="0dp"
-			android:paddingTop="8dp"
-			android:paddingBottom="8dp"
-			android:paddingLeft="9.5dp"
-			android:paddingRight="9.5dp"
-			osmand:textAllCapsCompat="true"
-			android:textColor="?attr/switch_ex_text_color"
-			android:textOff="@string/enable_plugin"
-			android:textOn="@string/disable_plugin"
-			android:textSize="12sp"
-			osmand:typeface="@string/font_roboto_medium"/>
+			android:layout_marginLeft="6dp"
+			android:layout_marginRight="16dp"
+			android:layout_marginStart="6dp"
+			android:layout_marginTop="6dp">
+
+			<net.osmand.plus.widgets.SwitchEx
+				android:id="@+id/plugin_enable_disable"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:background="?attr/switch_ex_background"
+				android:minHeight="0dp"
+				android:paddingBottom="8dp"
+				android:paddingLeft="9.5dp"
+				android:paddingRight="9.5dp"
+				android:paddingTop="8dp"
+				android:textColor="?attr/switch_ex_text_color"
+				android:textOff="@string/enable_plugin"
+				android:textOn="@string/disable_plugin"
+				android:textSize="12sp"
+				android:lines="1"
+				android:maxLines="1"
+				android:ellipsize="end"
+				osmand:textAllCapsCompat="true"
+				osmand:typeface="@string/font_roboto_medium"/>
+
+			<net.osmand.plus.widgets.ButtonEx
+				android:id="@+id/get_plugin"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:background="@drawable/get_button_background"
+				android:minHeight="0dp"
+				android:paddingBottom="8dp"
+				android:paddingLeft="9.5dp"
+				android:paddingRight="9.5dp"
+				android:paddingTop="8dp"
+				android:textColor="@color/get_button_text"
+				android:text="@string/get_plugin"
+				android:textSize="12sp"
+				android:lines="1"
+				android:maxLines="1"
+				android:ellipsize="end"
+				osmand:textAllCapsCompat="true"
+				osmand:typeface="@string/font_roboto_medium"/>
+		</FrameLayout>
+
 	</LinearLayout>
 </LinearLayout>
diff --git a/OsmAnd/res/layout/expandable_list_item_category_btn.xml b/OsmAnd/res/layout/expandable_list_item_category_btn.xml
index 4eb673ba56..343423d46f 100644
--- a/OsmAnd/res/layout/expandable_list_item_category_btn.xml
+++ b/OsmAnd/res/layout/expandable_list_item_category_btn.xml
@@ -35,7 +35,7 @@
             android:id="@+id/check_item"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:src="@drawable/ic_action_settings_dark"
+            android:src="@drawable/ic_action_settings_enabled_dark"
             android:focusable="false"
             android:gravity="center_vertical" />
 
diff --git a/OsmAnd/res/layout/plugin.xml b/OsmAnd/res/layout/plugin.xml
index 85b18837b8..4325d4f845 100644
--- a/OsmAnd/res/layout/plugin.xml
+++ b/OsmAnd/res/layout/plugin.xml
@@ -13,68 +13,100 @@
 		tools:context=".activities.PluginActivity">
 
 		<ImageView
-			android:layout_width="match_parent"
-			android:layout_height="144dp"
-			android:background="#ff8f00"
-			android:scaleType="center"
-			android:src="@drawable/ic_extension_dark"/>
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:maxHeight="144dp"
+			android:maxWidth="360dp"
+			android:scaleType="centerInside"
+			android:layout_gravity="center_horizontal"
+			android:src="@drawable/extension_stub"/>
 
 		<FrameLayout
 			android:id="@+id/plugin_header"
 			android:layout_width="match_parent"
 			android:layout_height="66dp"
+			android:background="?attr/plugin_details_header_bg"
 			android:paddingLeft="16dp"
-			android:paddingRight="16dp"
-			android:background="?attr/plugin_details_header_bg">
+			android:paddingRight="16dp">
 
 			<net.osmand.plus.widgets.ButtonEx
 				android:id="@+id/plugin_settings"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
+				android:layout_gravity="center_vertical|start"
 				android:layout_marginBottom="9dp"
 				android:layout_marginTop="9dp"
-				android:layout_gravity="center_vertical|start"
-				android:textSize="12sp"
-				osmand:textAllCapsCompat="true"
-				android:textColor="?android:textColorPrimary"
 				android:background="@null"
 				android:drawableLeft="?attr/ic_action_settings"
-				android:drawableStart="?attr/ic_action_settings"
 				android:drawablePadding="10dp"
+				android:drawableStart="?attr/ic_action_settings"
 				android:paddingLeft="0dp"
 				android:paddingRight="16dp"
 				android:text="@string/plugin_settings_button_caption"
+				android:textColor="?android:textColorPrimary"
+				android:textSize="12sp"
+				android:lines="1"
+				android:maxLines="1"
+				android:ellipsize="end"
+				osmand:textAllCapsCompat="true"
 				osmand:typeface="@string/font_roboto_medium"/>
 
-			<net.osmand.plus.widgets.SwitchEx
-				android:id="@+id/plugin_enable_disable"
+			<FrameLayout
 				android:layout_width="139dp"
 				android:layout_height="wrap_content"
 				android:layout_gravity="center_vertical|end"
 				android:layout_marginBottom="16dp"
-				android:layout_marginTop="16dp"
-				android:background="?attr/switch_ex_background"
-				android:paddingBottom="8dp"
-				android:paddingLeft="9.5dp"
-				android:paddingRight="9.5dp"
-				android:paddingTop="8dp"
-				osmand:textAllCapsCompat="true"
-				android:textColor="?attr/switch_ex_text_color"
-				android:textOff="@string/enable_plugin"
-				android:textOn="@string/disable_plugin"
-				android:textSize="12sp"
-				osmand:typeface="@string/font_roboto_medium"/>
+				android:layout_marginTop="16dp">
+
+				<net.osmand.plus.widgets.SwitchEx
+					android:id="@+id/plugin_enable_disable"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="?attr/switch_ex_background"
+					android:paddingBottom="8dp"
+					android:paddingLeft="9.5dp"
+					android:paddingRight="9.5dp"
+					android:paddingTop="8dp"
+					android:textColor="?attr/switch_ex_text_color"
+					android:textOff="@string/enable_plugin"
+					android:textOn="@string/disable_plugin"
+					android:textSize="12sp"
+					android:lines="1"
+					android:maxLines="1"
+					android:ellipsize="end"
+					osmand:textAllCapsCompat="true"
+					osmand:typeface="@string/font_roboto_medium"/>
+
+				<net.osmand.plus.widgets.ButtonEx
+					android:id="@+id/plugin_get"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:background="@drawable/get_button_background"
+					android:paddingBottom="8dp"
+					android:paddingLeft="9.5dp"
+					android:paddingRight="9.5dp"
+					android:paddingTop="8dp"
+					android:textColor="@color/get_button_text"
+					android:text="@string/get_plugin"
+					android:textSize="12sp"
+					android:visibility="gone"
+					android:lines="1"
+					android:maxLines="1"
+					android:ellipsize="end"
+					osmand:textAllCapsCompat="true"
+					osmand:typeface="@string/font_roboto_medium"/>
+			</FrameLayout>
 		</FrameLayout>
 
 		<LinearLayout
-			android:id="@+id/plugin_header2"
+			android:id="@+id/plugin_install_header"
 			android:layout_width="match_parent"
 			android:layout_height="66dp"
+			android:background="?attr/plugin_details_install_header_bg"
 			android:gravity="center_vertical"
+			android:orientation="horizontal"
 			android:paddingLeft="16dp"
 			android:paddingRight="16dp"
-			android:orientation="horizontal"
-			android:background="?attr/plugin_details_header2_bg"
 			android:visibility="gone"
 			tools:visibility="visible">
 
@@ -88,6 +120,7 @@
 				android:layout_height="wrap_content"
 				android:paddingLeft="16dp"
 				android:paddingRight="16dp"
+				android:textColor="?attr/plugin_description_header_text_color"
 				android:text="@string/plugin_install_needs_network"
 				osmand:typeface="@string/font_roboto_regular"/>
 		</LinearLayout>
@@ -99,6 +132,8 @@
 			android:layout_marginRight="16dp"
 			android:layout_marginTop="16dp"
 			android:text="@string/plugin_description_title"
+			android:textSize="14sp"
+			android:textColor="?attr/plugin_description_header_text_color"
 			osmand:textAllCapsCompat="true"
 			osmand:typeface="@string/font_roboto_medium"/>
 
@@ -109,6 +144,8 @@
 			android:layout_marginLeft="16dp"
 			android:layout_marginRight="16dp"
 			android:layout_marginTop="14dp"
+			android:textSize="16sp"
+			android:textColor="?android:textColorPrimary"
 			osmand:typeface="@string/font_roboto_regular"
 			tools:text="@string/lorem_ipsum"/>
 
diff --git a/OsmAnd/res/layout/plugins.xml b/OsmAnd/res/layout/plugins.xml
index 2b08094c38..6b50b3d467 100644
--- a/OsmAnd/res/layout/plugins.xml
+++ b/OsmAnd/res/layout/plugins.xml
@@ -10,7 +10,6 @@
 		android:id="@android:id/list"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_margin="6dp"
 		android:layout_weight="1"
 		android:divider="@null"
 		android:dividerHeight="4dp"
diff --git a/OsmAnd/res/layout/plugins_list_item.xml b/OsmAnd/res/layout/plugins_list_item.xml
index 4a5178e93e..0b9f043331 100644
--- a/OsmAnd/res/layout/plugins_list_item.xml
+++ b/OsmAnd/res/layout/plugins_list_item.xml
@@ -1,88 +1,95 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
 	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="84dp"
-	android:background="?attr/card_bg"
-	android:descendantFocusability="blocksDescendants"
-	android:padding="2dp">
-
-	<LinearLayout
-		android:layout_width="match_parent"
-		android:layout_height="match_parent"
-		android:orientation="horizontal">
-
-		<ImageButton
-			android:id="@+id/plugin_logo"
-			android:layout_width="64dp"
-			android:layout_height="64dp"
-			android:layout_margin="8dp"
-			android:background="@drawable/bg_plugin_logo_enabled"
-			android:scaleType="center"
-			tools:src="@drawable/ic_extension_dark"/>
-
-		<LinearLayout
-			android:layout_width="0dp"
-			android:layout_height="match_parent"
-			android:layout_marginBottom="8dp"
-			android:layout_marginLeft="6dp"
-			android:layout_marginStart="6dp"
-			android:layout_marginRight="36dp"
-			android:layout_marginEnd="36dp"
-			android:layout_marginTop="8dp"
-			android:layout_weight="1"
-			android:orientation="vertical">
-
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/plugin_name"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginBottom="4dp"
-				android:ellipsize="end"
-				android:lines="1"
-				android:maxLines="1"
-				android:textColor="?android:textColorPrimary"
-				android:textSize="19sp"
-				osmand:typeface="@string/font_roboto_medium"
-				tools:text="@string/lorem_ipsum" />
-
-			<net.osmand.plus.widgets.TextViewEx
-				android:id="@+id/plugin_description"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:ellipsize="end"
-				android:lines="2"
-				android:maxLines="2"
-				android:textColor="?android:textColorSecondary"
-				android:textSize="14sp"
-				osmand:typeface="@string/font_roboto_regular"
-				tools:text="@string/lorem_ipsum" />
-		</LinearLayout>
-	</LinearLayout>
+	android:paddingLeft="6dp"
+	android:paddingRight="6dp">
 
 	<FrameLayout
-		android:layout_width="wrap_content"
+		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:layout_gravity="top|end">
+		android:background="?attr/card_bg"
+		android:descendantFocusability="blocksDescendants"
+		android:padding="2dp">
 
-		<ImageView
-			android:id="@+id/plugin_is_enabled"
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:orientation="horizontal">
+
+			<ImageButton
+				android:id="@+id/plugin_logo"
+				android:layout_width="64dp"
+				android:layout_height="64dp"
+				android:layout_margin="8dp"
+				android:background="@drawable/bg_plugin_logo_enabled"
+				android:scaleType="center"
+				tools:src="@drawable/ic_extension_dark"/>
+
+			<LinearLayout
+				android:layout_width="0dp"
+				android:layout_height="match_parent"
+				android:layout_marginBottom="8dp"
+				android:layout_marginEnd="36dp"
+				android:layout_marginLeft="6dp"
+				android:layout_marginRight="36dp"
+				android:layout_marginStart="6dp"
+				android:layout_marginTop="8dp"
+				android:layout_weight="1"
+				android:orientation="vertical">
+
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/plugin_name"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginBottom="4dp"
+					android:ellipsize="end"
+					android:lines="1"
+					android:maxLines="1"
+					android:textColor="?android:textColorPrimary"
+					android:textSize="19sp"
+					osmand:typeface="@string/font_roboto_medium"
+					tools:text="@string/lorem_ipsum"/>
+
+				<net.osmand.plus.widgets.TextViewEx
+					android:id="@+id/plugin_description"
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:ellipsize="end"
+					android:lines="2"
+					android:maxLines="2"
+					android:textColor="?android:textColorSecondary"
+					android:textSize="14sp"
+					osmand:typeface="@string/font_roboto_regular"
+					tools:text="@string/lorem_ipsum"/>
+			</LinearLayout>
+		</LinearLayout>
+
+		<FrameLayout
 			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center_horizontal|top"
-			android:layout_marginTop="6dp"
-			android:src="?attr/ic_action_check"
-			android:visibility="invisible"
-			tools:visibility="visible"/>
+			android:layout_height="match_parent"
+			android:layout_gravity="top|end">
 
-		<ImageButton
-			android:id="@+id/plugin_options"
-			android:layout_width="36dp"
-			android:layout_height="36dp"
-			android:layout_marginTop="6dp"
-			android:layout_gravity="center_horizontal|bottom"
-			android:background="?attr/ic_plugin_options"/>
+			<ImageView
+				android:id="@+id/plugin_is_enabled"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal|top"
+				android:layout_marginTop="6dp"
+				android:src="?attr/ic_action_check"
+				android:visibility="invisible"
+				tools:visibility="visible"/>
+
+			<ImageButton
+				android:id="@+id/plugin_options"
+				android:layout_width="36dp"
+				android:layout_height="36dp"
+				android:layout_gravity="center_horizontal|bottom"
+				android:layout_marginTop="6dp"
+				android:background="?attr/ic_plugin_options"/>
+		</FrameLayout>
 	</FrameLayout>
 </FrameLayout>
diff --git a/OsmAnd/res/values/attrs.xml b/OsmAnd/res/values/attrs.xml
index 22bda9d145..631128dba2 100644
--- a/OsmAnd/res/values/attrs.xml
+++ b/OsmAnd/res/values/attrs.xml
@@ -27,8 +27,9 @@
 		<attr name="switch_ex_text_color" format="color|reference" />
 		<attr name="bg_plugin_logo_disabled" format="reference" />
 		<attr name="plugin_details_header_bg" format="color|reference" />
-		<attr name="plugin_details_header2_bg" format="color|reference" />
+		<attr name="plugin_details_install_header_bg" format="color|reference" />
 		<attr name="ic_world_globe" format="reference" />
+		<attr name="plugin_description_header_text_color" format="color|reference" />
     </declare-styleable>
 
     <declare-styleable name="PagerSlidingTabStrip">
diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml
index 33fd1cf392..fcd50798a3 100644
--- a/OsmAnd/res/values/colors.xml
+++ b/OsmAnd/res/values/colors.xml
@@ -107,6 +107,6 @@
 	<color name="plugin_details_header_bg_light">#ffffff</color>
 	<color name="plugin_details_header_bg_dark">#333b40</color>
 
-	<color name="plugin_details_header2_bg_light">#dbdbdb</color>
-	<color name="plugin_details_header2_bg_dark">#ffffff</color>
+	<color name="plugin_details_install_header_bg_light">#dbdbdb</color>
+	<color name="plugin_details_install_header_bg_dark">#2d3438</color>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 4680e9986a..05d2d2c2c2 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -2085,9 +2085,12 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
 	<string name="av_camera_pic_size_descr">Select internal camera Picture Size</string>
     <string name="navigation_intent_invalid">Invalid format: %s</string>
     <string name="hide_all_waypoints">Remove all</string>
-	<string name="enable_plugin">Enable</string>
-	<string name="disable_plugin">Disable</string>
+	<string name="enable_plugin">Disabled</string>
+	<string name="disable_plugin">Enabled</string>
+	<string name="enable_plugin2">Enable</string>
+	<string name="disable_plugin2">Disable</string>
 	<string name="plugin_description_title">Description</string>
 	<string name="plugin_settings_button_caption">Settings</string>
 	<string name="plugin_install_needs_network">You need an Internet connection to install this plugin.</string>
+	<string name="get_plugin">Get</string>
 </resources>
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 51f75d6dd1..4072ee9e66 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -162,8 +162,9 @@
 		<item name="switch_ex_text_color">@color/switch_ex_button_text_light</item>
 		<item name="bg_plugin_logo_disabled">@drawable/bg_plugin_logo_disabled_light</item>
 		<item name="plugin_details_header_bg">@color/plugin_details_header_bg_light</item>
-		<item name="plugin_details_header2_bg">@color/plugin_details_header2_bg_light</item>
+		<item name="plugin_details_install_header_bg">@color/plugin_details_install_header_bg_light</item>
 		<item name="ic_world_globe">@drawable/ic_world_globe_light</item>
+		<item name="plugin_description_header_text_color">#727272</item>
     </style>
 
     <style name="OsmandDarkTheme" parent="Theme.AppCompat">
@@ -198,8 +199,9 @@
 		<item name="switch_ex_text_color">@color/switch_ex_button_text_dark</item>
 		<item name="bg_plugin_logo_disabled">@drawable/bg_plugin_logo_disabled_dark</item>
 		<item name="plugin_details_header_bg">@color/plugin_details_header_bg_dark</item>
-		<item name="plugin_details_header2_bg">@color/plugin_details_header2_bg_dark</item>
+		<item name="plugin_details_install_header_bg">@color/plugin_details_install_header_bg_dark</item>
 		<item name="ic_world_globe">@drawable/ic_world_globe_dark</item>
+		<item name="plugin_description_header_text_color">#70818c</item>
     </style>
 
     <style name="OsmandLightDarkActionBarTheme" parent="Theme.AppCompat.Light.DarkActionBar">
diff --git a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java
index 0e5ff5a3b7..e1fc3ea560 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandPlugin.java
@@ -73,13 +73,17 @@ public abstract class OsmandPlugin {
 		return active;
 	}
 	
-	public boolean couldBeActivated() {
+	public boolean needsInstallation() {
 		return installURL != null;
 	}
 	
 	public void setInstallURL(String installURL) {
 		this.installURL = installURL;
 	}
+
+	public String getInstallURL() {
+		return installURL;
+	}
 	
 	public void disable(OsmandApplication app) {};
 	
@@ -208,7 +212,7 @@ public abstract class OsmandPlugin {
 		return allPlugins;
 	}
 	
-	public static Iterable<OsmandPlugin> getEnabledPlugins(){
+	public static List<OsmandPlugin> getEnabledPlugins(){
 		ArrayList<OsmandPlugin> lst = new ArrayList<OsmandPlugin>(allPlugins.size());
 		for(OsmandPlugin p : allPlugins) {
 			if(p.isActive()) {
@@ -217,6 +221,16 @@ public abstract class OsmandPlugin {
 		}
 		return lst;
 	}
+
+	public static List<OsmandPlugin> getNotEnabledPlugins(){
+		ArrayList<OsmandPlugin> lst = new ArrayList<OsmandPlugin>(allPlugins.size());
+		for(OsmandPlugin p : allPlugins) {
+			if(!p.isActive()) {
+				lst.add(p);
+			}
+		}
+		return lst;
+	}
 	
 	@SuppressWarnings("unchecked")
 	public static <T extends OsmandPlugin> T getEnabledPlugin(Class<T> clz) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
index 2806848b75..097dae5d45 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
@@ -28,7 +28,6 @@ import net.osmand.plus.FavouritesDbHelper.FavoriteGroup;
 import net.osmand.plus.GPXUtilities;
 import net.osmand.plus.GPXUtilities.GPXFile;
 import net.osmand.plus.OsmAndFormatter;
-import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
@@ -731,8 +730,8 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 				final ImageView ch = (ImageView) row.findViewById(R.id.check_item);
 				ch.setVisibility(View.VISIBLE);
 				ch.setImageDrawable(getActivity().getResources().getDrawable(
-						getMyApplication().getSettings().isLightContent() ? R.drawable.ic_action_settings_light
-								: R.drawable.ic_action_settings_dark));
+						getMyApplication().getSettings().isLightContent() ? R.drawable.ic_action_settings_enabled_light
+								: R.drawable.ic_action_settings_enabled_dark));
 				ch.setOnClickListener(new View.OnClickListener() {
 					@Override
 					public void onClick(View v) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
index caf1e57034..e27a04a252 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
@@ -31,10 +31,8 @@ import net.osmand.plus.OsmandPlugin;
 import net.osmand.plus.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
-import net.osmand.plus.Version;
 import net.osmand.plus.activities.actions.OsmAndDialogs;
 import net.osmand.plus.activities.actions.ShareLocation;
-import net.osmand.plus.activities.actions.StartGPSStatus;
 import net.osmand.plus.activities.search.SearchActivity;
 import net.osmand.plus.development.OsmandDevelopmentPlugin;
 import net.osmand.plus.dialogs.ConfigureMapMenu;
@@ -889,7 +887,7 @@ public class MapActivityActions implements DialogProvider {
 			}).reg();
 
 		optionsMenuHelper.item(R.string.settings_activity)
-		.icons(R.drawable.ic_action_settings_dark, R.drawable.ic_action_settings_light)
+		.icons(R.drawable.ic_action_settings_enabled_dark, R.drawable.ic_action_settings_enabled_light)
 		.listen(new OnContextMenuClick() {
 			@Override
 			public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/PluginActivity.java b/OsmAnd/src/net/osmand/plus/activities/PluginActivity.java
index aa66515714..47ba9afd5b 100644
--- a/OsmAnd/src/net/osmand/plus/activities/PluginActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/PluginActivity.java
@@ -2,6 +2,7 @@ package net.osmand.plus.activities;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.MenuItem;
@@ -58,46 +59,48 @@ public class PluginActivity extends OsmandActionBarActivity {
 		TextView descriptionView = (TextView)findViewById(R.id.plugin_description);
 		descriptionView.setText(plugin.getDescription());
 
-		final Class<? extends Activity> settingsActivity = plugin.getSettingsActivity();
-		final Button settingsButton = (Button)findViewById(R.id.plugin_settings);
-		if (settingsActivity == null) {
-			settingsButton.setVisibility(View.GONE);
-		} else {
-			settingsButton.setEnabled(plugin.isActive());
-			settingsButton.setVisibility(View.VISIBLE);
-			settingsButton.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View view) {
-					startActivity(new Intent(PluginActivity.this, settingsActivity));
-				}
-			});
-		}
+		Button settingsButton = (Button)findViewById(R.id.plugin_settings);
+		settingsButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				startActivity(new Intent(PluginActivity.this, plugin.getSettingsActivity()));
+			}
+		});
 
 		CompoundButton enableDisableButton = (CompoundButton)findViewById(
 				R.id.plugin_enable_disable);
-		enableDisableButton.setChecked(plugin.isActive());
 		enableDisableButton.setOnCheckedChangeListener(
 				new CompoundButton.OnCheckedChangeListener() {
-			@Override
-			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-				if (plugin.isActive() == isChecked) {
-					return;
-				}
+					@Override
+					public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+						if (plugin.isActive() == isChecked) {
+							return;
+						}
 
-				boolean ok = OsmandPlugin.enablePlugin((OsmandApplication)getApplication(), plugin,
-						isChecked);
-				settingsButton.setEnabled(isChecked && ok);
+						boolean ok = OsmandPlugin.enablePlugin((OsmandApplication)getApplication(),
+								plugin, isChecked);
+						if (!ok) {
+							return;
+						}
+						updateState();
+					}
+				});
+		Button getButton = (Button)findViewById(R.id.plugin_get);
+		getButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(plugin.getInstallURL())));
 			}
 		});
+
+		updateState();
 	}
 
 	@Override
 	protected void onResume() {
 		super.onResume();
 
-		CompoundButton enableDisableButton = (CompoundButton)findViewById(
-				R.id.plugin_enable_disable);
-		enableDisableButton.setChecked(plugin.isActive());
+		updateState();
 	}
 
 	@Override
@@ -111,4 +114,33 @@ public class PluginActivity extends OsmandActionBarActivity {
 		}
 		return false;
 	}
+
+	private void updateState() {
+		CompoundButton enableDisableButton = (CompoundButton)findViewById(
+				R.id.plugin_enable_disable);
+		Button getButton = (Button)findViewById(R.id.plugin_get);
+		Button settingsButton = (Button)findViewById(R.id.plugin_settings);
+		View installHeader = findViewById(R.id.plugin_install_header);
+
+		if (plugin.needsInstallation()) {
+			getButton.setVisibility(View.VISIBLE);
+			enableDisableButton.setVisibility(View.GONE);
+			settingsButton.setVisibility(View.GONE);
+			installHeader.setVisibility(View.VISIBLE);
+		} else {
+			getButton.setVisibility(View.GONE);
+			enableDisableButton.setVisibility(View.VISIBLE);
+			enableDisableButton.setChecked(plugin.isActive());
+
+			final Class<? extends Activity> settingsActivity = plugin.getSettingsActivity();
+			if (settingsActivity == null) {
+				settingsButton.setVisibility(View.GONE);
+			} else {
+				settingsButton.setEnabled(plugin.isActive());
+				settingsButton.setVisibility(View.VISIBLE);
+			}
+
+			installHeader.setVisibility(View.GONE);
+		}
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java b/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
index 732027489e..d455b38cea 100644
--- a/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
@@ -128,8 +128,8 @@ public class PluginsActivity extends OsmandListActivity {
 		final PopupMenu optionsMenu = new PopupMenu(this, v);
 
 		MenuItem enableDisableItem = optionsMenu.getMenu().add(plugin.isActive()
-				? R.string.disable_plugin
-				: R.string.enable_plugin);
+				? R.string.disable_plugin2
+				: R.string.enable_plugin2);
 		enableDisableItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 			@Override
 			public boolean onMenuItemClick(MenuItem item) {
diff --git a/OsmAnd/src/net/osmand/plus/activities/SelectedGPXFragment.java b/OsmAnd/src/net/osmand/plus/activities/SelectedGPXFragment.java
index 10d48b7e8c..7c3cef8928 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SelectedGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SelectedGPXFragment.java
@@ -533,8 +533,8 @@ public class SelectedGPXFragment extends OsmandExpandableListFragment {
 			} else if(model.getType() == GpxDisplayItemType.TRACK_SEGMENT) {
 				ch.setVisibility(View.VISIBLE);
 				ch.setImageDrawable(getMyActivity().getResources().getDrawable(
-						app.getSettings().isLightContent() ? R.drawable.ic_action_settings_light
-								: R.drawable.ic_action_settings_dark));
+						app.getSettings().isLightContent() ? R.drawable.ic_action_settings_enabled_light
+								: R.drawable.ic_action_settings_enabled_dark));
 				ch.setOnClickListener(new View.OnClickListener() {
 					@Override
 					public void onClick(View v) {
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
index c39a76135c..7a83c2932d 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashPluginsFragment.java
@@ -1,5 +1,8 @@
 package net.osmand.plus.dashboard;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedList;
 import java.util.List;
 
 import net.osmand.AndroidUtils;
@@ -9,11 +12,13 @@ import net.osmand.plus.activities.PluginActivity;
 import net.osmand.plus.development.OsmandDevelopmentPlugin;
 import android.content.Intent;
 import android.content.res.TypedArray;
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
@@ -29,7 +34,7 @@ public class DashPluginsFragment extends DashBaseFragment {
 		public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 			View pluginView = AndroidUtils.findParentViewById(buttonView, R.id.dash_plugin_item);
 			OsmandPlugin plugin = (OsmandPlugin)pluginView.getTag();
-			if (plugin.isActive() == isChecked) {
+			if (plugin.isActive() == isChecked || plugin.needsInstallation()) {
 				return;
 			}
 			if (OsmandPlugin.enablePlugin(getMyApplication(), plugin, isChecked)) {
@@ -49,6 +54,15 @@ public class DashPluginsFragment extends DashBaseFragment {
 		}
 	};
 
+	private final View.OnClickListener getListener = new View.OnClickListener() {
+		@Override
+		public void onClick(View view) {
+			View pluginView = AndroidUtils.findParentViewById(view, R.id.dash_plugin_item);
+			OsmandPlugin plugin = (OsmandPlugin)pluginView.getTag();
+			startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(plugin.getInstallURL())));
+		}
+	};
+
 	private final View.OnClickListener pluginDetailsListener = new View.OnClickListener() {
 		@Override
 		public void onClick(View view) {
@@ -73,24 +87,23 @@ public class DashPluginsFragment extends DashBaseFragment {
 		});
 
 		LinearLayout pluginsContainer = (LinearLayout) contentView.findViewById(R.id.plugins);
-		List<OsmandPlugin> enabledPlugins = OsmandPlugin.getAvailablePlugins();
-		for(OsmandPlugin plugin : enabledPlugins) {
-			if (plugin instanceof  OsmandDevelopmentPlugin) {
+		List<OsmandPlugin> notActivePlugins = OsmandPlugin.getNotEnabledPlugins();
+		Collections.shuffle(notActivePlugins);
+		for(OsmandPlugin plugin : notActivePlugins) {
+			if (plugin instanceof OsmandDevelopmentPlugin) {
 				continue;
 			}
 
 			inflatePluginView(inflater, pluginsContainer, plugin);
+			break;
 		}
-		for(OsmandPlugin plugin : OsmandPlugin.getAvailablePlugins()) {
-			if (pluginsContainer.getChildCount() > 2) {
+		for(OsmandPlugin plugin : OsmandPlugin.getEnabledPlugins()) {
+			if (pluginsContainer.getChildCount() >= 5) {
 				break;
 			}
 			if (plugin instanceof OsmandDevelopmentPlugin) {
 				continue;
 			}
-			if (enabledPlugins.contains(plugin)) {
-				continue;
-			}
 
 			inflatePluginView(inflater, pluginsContainer, plugin);
 		}
@@ -117,11 +130,17 @@ public class DashPluginsFragment extends DashBaseFragment {
 
 	private void updatePluginState(View pluginView) {
 		OsmandPlugin plugin = (OsmandPlugin)pluginView.getTag();
-		boolean isEnabled = plugin.isActive();
-
 		CompoundButton enableDisableButton = (CompoundButton)pluginView.findViewById(
-				R.id.check_item);
-		enableDisableButton.setChecked(isEnabled);
+				R.id.plugin_enable_disable);
+		Button getButton = (Button)pluginView.findViewById(R.id.get_plugin);
+		if (plugin.needsInstallation()) {
+			getButton.setVisibility(View.VISIBLE);
+			enableDisableButton.setVisibility(View.GONE);
+		} else {
+			getButton.setVisibility(View.GONE);
+			enableDisableButton.setVisibility(View.VISIBLE);
+			enableDisableButton.setChecked(plugin.isActive());
+		}
 
 		ImageButton logoView = (ImageButton)pluginView.findViewById(R.id.plugin_logo);
 		if (plugin.isActive()) {
@@ -148,9 +167,13 @@ public class DashPluginsFragment extends DashBaseFragment {
 		logoView.setOnClickListener(toggleEnableDisableListener);
 		logoView.setImageResource(plugin.getLogoResourceId());
 
-		CompoundButton enableDisableButton = (CompoundButton)view.findViewById(R.id.check_item);
+		CompoundButton enableDisableButton =
+				(CompoundButton)view.findViewById(R.id.plugin_enable_disable);
 		enableDisableButton.setOnCheckedChangeListener(enableDisableListener);
 
+		Button getButton = (Button)view.findViewById(R.id.get_plugin);
+		getButton.setOnClickListener(getListener);
+
 		updatePluginState(view);
 
 		container.addView(view);
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
index c1513370a6..e518230efc 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/ConfigureMapMenu.java
@@ -29,7 +29,6 @@ import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnMultiChoiceClickListener;
-import android.preference.PreferenceGroup;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.Toast;
@@ -65,7 +64,7 @@ public class ConfigureMapMenu {
 
 		createLayersItems(adapter, ma);
 		if (!advanced){
-			adapter.item(R.string.btn_advanced_mode).icons(R.drawable.ic_action_settings_dark, R.drawable.ic_action_settings_light)
+			adapter.item(R.string.btn_advanced_mode).icons(R.drawable.ic_action_settings_enabled_dark, R.drawable.ic_action_settings_enabled_light)
 					.selected(advanced ? 1 : 0)
 					.listen(new OnContextMenuClick() {
 						@Override
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
index 5eb002e93e..681b8e78f0 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoGroupsActivity.java
@@ -438,7 +438,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 						device != null && device.getLastLocation() != null ? MenuItemCompat.SHOW_AS_ACTION_NEVER : MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 				///
 				if (device != null) {
-					createMenuItem(menu, SETTINGS_DEV_ID, R.string.settings, R.drawable.ic_action_settings_light, R.drawable.ic_action_settings_dark,
+					createMenuItem(menu, SETTINGS_DEV_ID, R.string.settings, R.drawable.ic_action_settings_enabled_light, R.drawable.ic_action_settings_enabled_dark,
 							// there is a bug in Android 4.2 layout
 							device.getLastLocation() != null ? MenuItemCompat.SHOW_AS_ACTION_NEVER : MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 				}
@@ -963,7 +963,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 				R.drawable.ic_action_plus_dark, R.drawable.ic_action_plus_dark,
 				MenuItemCompat.SHOW_AS_ACTION_IF_ROOM | MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
 		createMenuItem(menu, SETTINGS_ID, R.string.settings, 
-				R.drawable.ic_action_settings_dark, R.drawable.ic_action_settings_dark,
+				R.drawable.ic_action_settings_enabled_dark, R.drawable.ic_action_settings_enabled_dark,
 				MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 		return super.onCreateOptionsMenu(menu);
 	}
@@ -1162,9 +1162,9 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
 				v.setVisibility(View.GONE);
 			} else {
 				if (getMyApplication().getSettings().isLightContent()){
-					v.setImageResource(R.drawable.ic_action_settings_light);
+					v.setImageResource(R.drawable.ic_action_settings_enabled_light);
 				} else {
-					v.setImageResource(R.drawable.ic_action_settings_dark);
+					v.setImageResource(R.drawable.ic_action_settings_enabled_dark);
 				}
 				v.setVisibility(View.VISIBLE);
 				v.setOnClickListener(new View.OnClickListener() {

From 99fd596b6502fc1a40047223f1068f9946d27898 Mon Sep 17 00:00:00 2001
From: Viktar Palstsiuk <vipals@gmail.com>
Date: Thu, 5 Feb 2015 21:11:33 +0100
Subject: [PATCH 17/26] Translated using Weblate (Belarusian)

Currently translated at 100.0% (1621 of 1621 strings)
---
 OsmAnd/res/values-be/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index 67c2e08bb1..b59bc39ae0 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -2015,5 +2015,5 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 	<string name="plugin_settings_button_caption">Налады</string>
 <string name="edit_group">Правіць групу</string>
     <string name="osmo">OsMo</string>
-	<string name="plugin_install_needs_network">Неабходна падключэнне да Інтэрнэту, каб усталяваць гэты модуль.</string>
+	<string name="plugin_install_needs_network">Неабходна падключэньне да Інтэрнэту, каб усталяваць гэты модуль.</string>
 </resources>

From 44916ef9ad967475e32846d30145594e3e550ff1 Mon Sep 17 00:00:00 2001
From: Ldm Public <ldmpub@gmail.com>
Date: Thu, 5 Feb 2015 21:49:23 +0100
Subject: [PATCH 18/26] Translated using Weblate (French)

Currently translated at 100.0% (1621 of 1621 strings)
---
 OsmAnd/res/values-fr/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index ad5b462177..31e3fcc6c9 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -1923,5 +1923,5 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
 <string name="plugin_description_title">Description</string>
 	<string name="plugin_settings_button_caption">Paramètres</string>
 <string name="edit_group">Modifier le groupe</string>
-    <string name="plugin_install_needs_network">Vous nécessitez une connexion Internet pour installer ce greffon.</string>
+    <string name="plugin_install_needs_network">Vous devez être connectés à Internet pour installer ce greffon.</string>
 </resources>

From 04946c2825986d13c043858a7d9681a59179c566 Mon Sep 17 00:00:00 2001
From: stephan 75 <stephan.r@web.de>
Date: Thu, 5 Feb 2015 19:31:52 +0100
Subject: [PATCH 19/26] Translated using Weblate (German)

Currently translated at 100.0% (1621 of 1621 strings)
---
 OsmAnd/res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml
index 9a34098f97..0c8db2bf11 100644
--- a/OsmAnd/res/values-de/strings.xml
+++ b/OsmAnd/res/values-de/strings.xml
@@ -2040,7 +2040,7 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
     <string name="osm_editing_manage">Verwalten</string>
     <string name="recents">VERLAUF</string>
     <string name="navigation_over_track">Navigation über Strecke starten?</string>
-    <string name="avoid_roads_msg">Sie können die Route ändern, indem Sie die Straßen auswählen, die vermieden werden sollen</string>
+    <string name="avoid_roads_msg">Durch Setzen einer Straßensperrung kann eine alternative Route berechnet werden:</string>
     <string name="enable_proxy_title">HTTP-Proxy aktivieren</string>
     <string name="enable_proxy_descr">HTTP-Proxy für alle Netzwerkanfragen einrichten</string>
     <string name="proxy_host_title">Proxy-Host</string>

From 7f915fcc38e737a46fc38abb6ef28d4949af04ca Mon Sep 17 00:00:00 2001
From: Jur Kis <atvejis@gmail.com>
Date: Fri, 6 Feb 2015 07:30:12 +0100
Subject: [PATCH 20/26] Translated using Weblate (Lithuanian)

Currently translated at 100.0% (1621 of 1621 strings)
---
 OsmAnd/res/values-lt/strings.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-lt/strings.xml b/OsmAnd/res/values-lt/strings.xml
index 0d85923b57..bd7b6b6802 100644
--- a/OsmAnd/res/values-lt/strings.xml
+++ b/OsmAnd/res/values-lt/strings.xml
@@ -1764,7 +1764,7 @@
     <string name="rendering_attr_coloredBuildings_name">Spalvoti pastatai</string>
     <string name="rendering_attr_alpineHiking_name">Kalnų žygiai (SAC)</string>
     <string name="rendering_attr_osmcTraces_name">Padengimas žygių simboliais</string>
-    <string name="hide_all_waypoints">Pašalinti visus</string>
+    <string name="hide_all_waypoints">Pašalinti viską</string>
 <string name="av_camera_pic_size">Nuotraukos dydis</string>
 	<string name="av_camera_pic_size_descr">Pasirinkti vidinės kameros nuotraukos dydį</string>
     <string name="announce_nearby_favorites">Pranešti apie artimiausias įsimintas vietas</string>
@@ -1911,4 +1911,5 @@
 <string name="plugin_description_title">Aprašymas</string>
 	<string name="plugin_settings_button_caption">Nustatymai</string>
 <string name="edit_group">Redaguoti grupę</string>
-    </resources>
+    <string name="plugin_install_needs_network">Prisijunkite prie interneto, jei norite įdiegti šį priedą.</string>
+</resources>

From 2dedb19f20083b22a4e378f848c82b355d87c677 Mon Sep 17 00:00:00 2001
From: 8c6311e901274f6baef2068792c8ab <ft-002@safe-mail.net>
Date: Fri, 6 Feb 2015 11:34:57 +0100
Subject: [PATCH 21/26] =?UTF-8?q?Translated=20using=20Weblate=20(Norwegian?=
 =?UTF-8?q?=20Bokm=C3=A5l)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 70.3% (1141 of 1621 strings)
---
 OsmAnd/res/values-nb/strings.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml
index a215758c0e..8bbbcb025e 100644
--- a/OsmAnd/res/values-nb/strings.xml
+++ b/OsmAnd/res/values-nb/strings.xml
@@ -492,7 +492,7 @@
 	<string name="search_nothing_found">Ingenting funnet</string>
 	<string name="searching">Søker…</string>
 	<string name="searching_address">Søker adresse…</string>
-	<string name="hint_search_online">Husnummer, gate, by</string>
+	<string name="hint_search_online">Nettbasert søk: Husnummer, gate, by</string>
 	<string name="search_offline_address">Offline-søk</string>
 	<string name="search_online_address">Nettbasert søk</string>
 	<string name="max_level_download_tile">Maks. nettbasert zoom</string>
@@ -1192,4 +1192,10 @@
 	<string name="speak_pedestrian">Meld om fotgjengeroverganger</string>
     <string name="rendering_value__name">Standard</string>
 	<string name="rendering_attr_streetLighting_name">Gatebelysning</string>
+    <string name="edit_group">Rediger gruppe</string>
+    <string name="parking_place">Parkeringsplass</string>
+    <string name="points">Punkter</string>
+    <string name="tracks">Spor</string>
+    <string name="my_location">Min posisjon</string>
+    <string name="gps_status">GPS-status</string>
     </resources>

From 9ee1e2b9456e374d79f7bcc9947ef3c468ededd0 Mon Sep 17 00:00:00 2001
From: Tarcisio Oliveira <tarcisio@ymail.com>
Date: Fri, 6 Feb 2015 02:42:06 +0100
Subject: [PATCH 22/26] Translated using Weblate (Portuguese)

Currently translated at 91.7% (1488 of 1621 strings)
---
 OsmAnd/res/values-pt/strings.xml | 58 ++++++++++++++++++++++++++++++--
 1 file changed, 56 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index ee62841051..59a185495c 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources><string name="amenity_type_administrative">Administrativo</string>
   <string name="amenity_type_barrier">Barreira</string>
   <string name="amenity_type_education">Educação</string>
@@ -1824,4 +1824,58 @@ Afeganistão , Albânia, Argélia , Andorra, Angola , Anguilla, Antígua e Barbu
     <string name="int_hour">h</string>
     <string name="duration">Duração</string>
     <string name="distance">Distância</string>
-    </resources>
+    <string name="gps_status">Status do GPS</string>
+    <string name="proxy_pref_title">Proxy</string>
+    <string name="settings_privacy">Privacidade</string>
+    <string name="points">Pontos</string>
+    <string name="my_location">Meus locais</string>
+    <string name="recents">RECENTES</string>
+	<string name="avoid_roads_msg">Você pode inciar rotas alternativas selecionando estradas a serem evitadas</string>
+    <string name="rendering_value__name">Padrão</string>
+	<string name="speak_pedestrian">Anunciar faixas de pedestre</string>
+    <string name="rendering_attr_roadStyle_name">Estilo de estrada</string>
+    <string name="rendering_value_default_name">Padrão</string>
+    <string name="rendering_value_orange_name">Laranja</string>
+    <string name="rendering_value_germanRoadAtlas_name">Atlas de rodovias alemãs</string>
+	<string name="traffic_warning_railways">Cruzamento de ferrovia</string>
+	<string name="traffic_warning_pedestrian">Cruzamento de faixa de pedestre</string>
+	<string name="show_railway_warnings">Exibir cruzamento de ferrovia</string>
+	<string name="show_pedestrian_warnings">Exibir faixas de pedestre</string>
+    <string name="rendering_value_americanRoadAtlas_name">Atlas de rodovias americanas</string>
+    <string name="routing_attr_no_new_routing_name">Regras de roteamento No v1.9</string>
+    <string name="remove_the_tag">REMOVA A TAG</string>
+    <string name="routing_attr_no_new_routing_description">Não use as regras de roteamento introduzidas na versão 1.9</string>
+    <string name="dash_download_msg_none">Deseja baixar mapas offline?</string>
+    <string name="dash_download_msg">Você baixou %1$s mapas</string>
+    <string name="dash_download_new_one">Baixe um novo mapa</string>
+    <string name="map_locale">Idioma do mapa</string>
+    <string name="navigate_point_zone">Zona</string>
+    <string name="download_tab_downloads">Todos os Downloads</string>
+    <string name="download_tab_updates">Atualizações</string>
+    <string name="download_tab_local">Local</string>
+	<string name="no_internet_connection">Download não é possível, por favor, verifique sua conexão com a internet.</string>
+    <string name="everything_up_to_date">Todos os arquivos foram atualizados</string>
+    <string name="use_opengl_render">Use o renderizador OpenGL</string>
+    <string name="home_button">Inicio</string>
+    <string name="osmo_use_https">Use HTTPS</string>
+	<string name="advanced_settings">Avançado</string>
+	<string name="map_update">Atualizações disponives para %1$s mapas</string>
+	<string name="search_for">Procurar por</string>
+	<string name="show_map">EXIBIR MAPA</string>
+	<string name="show_all">EXIBIR TODOS</string>
+	<string name="coordinates">Coordenadas</string>
+	<string name="rendering_attr_subwayMode_name">Rodas de metrô</string>
+    <string name="lock_screen_request_explanation">%1$s precisa dessa permissão para desligar a tela para economizar energia.</string>
+    <string name="wake_on_voice_never">Nunca</string>
+    <string name="select_impassable_road">Selecione o mapa…</string>
+    <string name="impassable_road">Evitar estradas…</string>
+    <string name="rendering_attr_trainLightrailRoutes_name">Rota de trem</string>
+    <string name="rendering_attr_tramRoutes_name">Rota de bonde</string>
+    <string name="rendering_attr_shareTaxiRoutes_name">Compartilhar rota de taxi</string>
+    <string name="rendering_attr_busRoutes_name">Rotas de onibus</string>
+    <string name="rendering_category_hide">Esconder</string>
+    <string name="rendering_category_routes">Rotas</string>
+    <string name="rendering_category_details">Detalhes</string>
+    <string name="map_widget_appearance_rem">Elementos restantes</string>
+    <string name="plugin_install_needs_network">Você precisa de uma conexão com a internet para instalar este plugin.</string>
+</resources>

From c598f522fa240fe389ddb8d1e7b3fcde667140da Mon Sep 17 00:00:00 2001
From: Marco Antonio <marcoantoniofrias@gmail.com>
Date: Fri, 6 Feb 2015 08:25:11 +0100
Subject: [PATCH 23/26] Translated using Weblate (Spanish)

Currently translated at 100.0% (1621 of 1621 strings)
---
 OsmAnd/res/values-es/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-es/strings.xml b/OsmAnd/res/values-es/strings.xml
index 902ba782cd..41ed5901b4 100644
--- a/OsmAnd/res/values-es/strings.xml
+++ b/OsmAnd/res/values-es/strings.xml
@@ -548,8 +548,8 @@
   <string name="search_nothing_found">No se encontró nada</string>
   <string name="searching">Buscando…</string>
   <string name="searching_address">Buscando dirección…</string>
-  <string name="search_osm_nominatim">Buscar dirección usando OSM Nominatim</string>
-  <string name="hint_search_online">Busqueda online: Número de casa, calle, ciudad</string>
+  <string name="search_osm_nominatim">Buscar en línea usando OSM Nominatim</string>
+  <string name="hint_search_online">Búsqueda en línea: Número de casa, calle, ciudad</string>
   <string name="search_offline_address">Búsqueda sin conexión</string>
   <string name="search_online_address">Búsqueda en línea</string>
   <string name="max_level_download_tile">Máx. acercamiento con conexión</string>

From 0f5198bdd5b143c2cb0b8f99512efd8bd9892aa4 Mon Sep 17 00:00:00 2001
From: Leif Larsson <Leif.Larsson@gmail.com>
Date: Thu, 5 Feb 2015 21:47:45 +0100
Subject: [PATCH 24/26] Translated using Weblate (Swedish)

Currently translated at 99.5% (1613 of 1621 strings)
---
 OsmAnd/res/values-sv/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml
index 704667770f..d84e03a74e 100644
--- a/OsmAnd/res/values-sv/strings.xml
+++ b/OsmAnd/res/values-sv/strings.xml
@@ -1797,4 +1797,5 @@
 <string name="plugin_settings_button_caption">Inställningar</string>
 <string name="plugin_description_title">Beskrivning</string>
 	<string name="edit_group">Redigera grupp</string>
-    </resources>
+    <string name="plugin_install_needs_network">En Internetuppkoppling krävs för att installera denna modul.</string>
+</resources>

From acac0a2e797700c551ad531e4fe2f95103b23d84 Mon Sep 17 00:00:00 2001
From: Viktar Palstsiuk <vipals@gmail.com>
Date: Fri, 6 Feb 2015 12:09:14 +0100
Subject: [PATCH 25/26] Translated using Weblate (Belarusian)

Currently translated at 100.0% (1624 of 1624 strings)
---
 OsmAnd/res/values-be/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml
index b59bc39ae0..d50fdda071 100644
--- a/OsmAnd/res/values-be/strings.xml
+++ b/OsmAnd/res/values-be/strings.xml
@@ -2016,4 +2016,7 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
 <string name="edit_group">Правіць групу</string>
     <string name="osmo">OsMo</string>
 	<string name="plugin_install_needs_network">Неабходна падключэньне да Інтэрнэту, каб усталяваць гэты модуль.</string>
+<string name="enable_plugin2">Уключыць</string>
+	<string name="disable_plugin2">Адключыць</string>
+	<string name="get_plugin">Атрымаць</string>
 </resources>

From b05c558b0e23854b2e8227cc2354823ef7f12efe Mon Sep 17 00:00:00 2001
From: Ivan Vantu5z <vantu5z@mail.ru>
Date: Fri, 6 Feb 2015 12:11:26 +0100
Subject: [PATCH 26/26] Translated using Weblate (Russian)

Currently translated at 100.0% (1624 of 1624 strings)
---
 OsmAnd/res/values-ru/strings.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index c3b28f80a6..e4d98eed56 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -1872,11 +1872,14 @@
     <string name="points">Точки</string>
     <string name="parking_place">Место для парковки</string>
     <string name="remove_the_tag">УДАЛИТЬ ТЕГ</string>
-    <string name="enable_plugin">Включить</string>
-	<string name="disable_plugin">Отключить</string>
+    <string name="enable_plugin">Выключено</string>
+	<string name="disable_plugin">Включено</string>
 <string name="osm_editing_manage">Управление</string>
     <string name="plugin_description_title">Описание</string>
 	<string name="plugin_settings_button_caption">Настройки</string>
 <string name="edit_group">Редактировать группу</string>
     <string name="plugin_install_needs_network">Вам необходимо интернет соединение для установки этого плагина.</string>
+<string name="enable_plugin2">Включить</string>
+	<string name="disable_plugin2">Выключить</string>
+	<string name="get_plugin">Получить</string>
 </resources>