From d3fa67f2aaeb359a266fda423fd9f9a706a1cd3b Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Fri, 6 Feb 2015 13:01:54 +0200 Subject: [PATCH] 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 @@ - - + + 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 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 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 zcmaJ?c~lg29Nz^)!Hf`1gqKc>=%PEjGqbbDY%Br0ORk90fELIfb(UIHm42n0fyN+wl72rzmHIBzsz zRvEOhqrSMET3}^ar%EDmxm;qGR7}wp35;Qw1VSVT0&)nD$#Jl_8+0(CV-~a|W1?+N z)c4vJ2W5W(+G*Mj2ByQX(fyI!-Zui7Bf@W9)`LB#8qM4)| zCn+(I43$lrxO$jF$H-jn{@;-Y$f;2+rfpnN@KsvMlx-&+tX``Ya9_lPjZmR7f-oB8 zauAWrQ4oVr48$-30p%o2%1lO-G#iOAJ5S~qE?M{L4uWHDaJ}U0gYy)>VPoW<{&5+ z6YeR~qo}ncZCgzeu{31|M)It(JwXFRnq`=hgg^|HL!d&5%0Z<>;`-C``gkz7&EwG`9o#(8+~Dxuzc1wGF;TCLPI7;Fy)tv-TdxFlSbD`(OV;mM zzHEEhSH_^uG&)DZKHR6YOM$3TB1U>H}Q8=T)s4(dG7Fg zH3t+Y`M-xvcP*$mx?*tfT4DH$1+d?cF7`oxkA3DPSzJ3JrltXH09-Z z2@3mct^C;SVfCfw{)mi<(IgjUPs_JuT{-{ySFLL3;z9mU)HgpW6DFo5eqns0#V^9A ze0_+5_Zedv9K72qa{8Vcm)bi2$jm9hLj`Mghh7T&xk*|+wK95Zod1?h&Hj;vH=nts z$#^jZXS_0Vs_*RX3{_m%-0(0x;NtW6%6#FOD|7nSt{VtW^j`gG(L+J$Z?7dyhi3HL z#|MsA-K_X5KM&~mIA&&)EU0~3bPVNNm&d|X`jO>aE_<2RPF&A)SNFB~ZsMo6Mwq*)uBXms1Z)(x$0}VVv_oIk z(5CB)Na*md6F%1n|8fhGe$XDK+pzce9<6tv9>FZv=zGO*_xAyZim~3)aivB4NyV`G z)V|n>hA9_iJAZGP<})ra>FTt3?WeLbqxhk*$POIOAFk@HFFeRM9J@-?)Gk~aB1en5 zX2ke)rONxQ;U~S<&zm}VXtQtt?0oil!v(PGs!vt*unVc*rf(?O8CM3QvkgrlO8<9) zFMzWCXPiq+QO)$68Ujf@JNM@D$na~&EE&Zmo&9l%JvYV$t`JQ&4!v5l_LG)q#w%GQ z&D=i}tUT~%z~R1GThXq?SMv8YeDbq4&+4;Vp7z65p?~M$zYhAB`Ad00bC5sa%}w&dA$N3Uo9`tIq{xV<~SR;ES< zHuo%B6Yd`W_T3nK!a#EFPc3ZS$!!NNz2MuJbKPDu_|(3PK6P6wxZvAUr9LYsdF#y)bfLMOVJf+T4sM*+TkixwkZv)4EL^lXpL&<5SOj?PAk|@oYmWO=kyP8$Nnzw h48C0#ayvDj&-0yDn|DKaBiQp()9V77x{Ra@|!gBxs 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 zcmaJ?c~BE)6c2=>#Tpb81hKP?NX2oJ%_h6arXoiYE(vl91=?n_`vp=+Hf|OZfl3W3 zYCRah!Gm_JwO(z-Dz-*iF*xF&#iQCfbr`j#l|mKUX+7Gp+6{v3AC5b-`+e`*_j~X6 zuH7{`*=Z9)qC*4%!NiPoZ63cOzWaqB{#oSzS0lefak^qIpD}R`k_CcfnlS<>!$OvW zJV4S*7x#gA0)cRaxuBRU)@P|H#v&noIufVF#-jy-d5KONNmT+4GJr*t6L12 z=>%~RrbqNP4X7}u*RUYJCcA*DsiX*6oH!qv=T!3sEPx{+r=`kjS348LqjuH&-ghh& zL!&BOWrFw#sbYN&q+wV9VG=N_d zSlXn{)25F3;-v&}1;^RcQmMn?kT~QLhAo%M2!fCzs1!wEUIVr-wQ{5rw%TWoThIbK z#hPuLnXy7Xi=>gM<`Tp_(C5&%$ew6f{|m;>lWFvP`B^s1QV>(IHA5 zrcn~8TrrN#u-ZA&N`Z0TX5RN07JDvMtziMlF>C?DRE>8*P6fj;_6o)ZX*8o%hh`U< ztu*7X$NS3kBx)^S%}W5C$}$#cG|y`DGdLi?gb^x$z=Q%vV5Lfd!zxT>f{k)uqGdEn zD;2nS3{U?re^2_9KjGuBjnh$+C_%|_ISrF4Tn@`*fKRE31TcvKN=9HN1*(*Zr94Hc zuXX;{O5;a-fBLph2ZI-$jux=;^ThIlbAIE6hx|P1GPKDB&MUXJmabl(JLS}Um88Y% z0j&#yCJ(QU4+(9J>;n~OW>~nnH$6U#-08edvhlwgn`4awZ>E1(mhv)vHm0E|J}=v@ z?NM!b{Py=JE?;)MUR!^S7~Ixg*uC|S_usi!QdwWwarmC~H0y33?*BIJE*nqeR1HH13_UhH+Rm*>mm46hS(z3$a+wdrtGaR&)Wu5pT{g~g3 z@|k}HrSF>Z?Q*L94cwJ1x>n@!8uqNZsy=Y(=hwC}iO!(!ALt8A%&aPNXGGb7x8}s%_$qwei?4(%b1{Y^XYO|v zZ_64!j)!^+(|cQ5Yo~RnxZS^w_@Q-a+M|J)UHwNzF*hcyUHi@8KeJhbq&UiR>^9Q4 ztwWerVGqvvGw_x$-wn23Dm{4)^}9J^LUdhMZuX{K?3VlwzdLXJt(^!dNjmHqsP~lj zP2cWs?@jW|5+!sLj`(BOkKP=J+8;g`E2;~wbeBAuG-rFtAwN2hIyBGGW*b?8Oc*$C znN{+jQ5u-J74yEH^H;4#Kbye>h3_35-pJqRw)t7Q_)vuDxev*R+(?nCZwSKy&#_?I}&^?={ z^M2u_o{NWX)FO@dlNJg;UMw%)w5;xnyUn$R4^oQ@UYN6F!?~W*{eDAht0(k!R(^Wy zr`EQ^)0r#T3v`1yEg=icpU3>NdWUdtlV;C#QJp{<;8nX%g$|aL{QcINX5nME@NvL2 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 zcmaJ@X;c$u7Y+f`L z5Eq5AU8|Nzjne2j90jZ)%7%1^CXEh3qfp#XlTM~chKzt5TB_Fa@GolX@PHcR;o}+6 z!EqeMH0pGWCa_7BR=~=PCUHIXw-2?q_ng&Vj7JI>z9%!Y&M%jrjn>s0-`}Mq-%{b6G3b68L=RQ z3<|wkXH>&lV926O4lgtE@CegSA!u~b(O(Q}4WAQ*q>N;e=|~hJnWWJS#Wk#LFvddv zr}0&7gCt!CkzyeOyiBh^>Y?-*0VBElZ%0Fl2pdj}UX2t*mLh}|%QTSI7$xN4kuOA0 z4RYuV5R}WAOahh3q!ZX=I-9^|gH!?&qCgCVoDM1F;E0{C;RS38Ih@W6<_p956iPUq zFQ7&6*<_Z0MP|~-bovN3N^3C6v-?*gMnp(|4!wRE4CL@-v>+`qPkLl<44MsV6tbHGs-!&8g9 z>qYN;v}=v|fsAU%Ny;M*n!cCaYxhc9*=uHJ(3lL735)5d_#tdiS=!&WXB5*>#54lDjML=RLl-LYt=#>JPe1>YW^7 zc7J~`u&+FOT)OJ+nBSP5Idf}&nR?ObUN_UL$vdDgQk1a%e)9VbJoFrce@=O}TeVZ> z#eS*Zz1)}9>xafHcdAaP_G>YH&smRG;TPGuXB%%$Ps~ipcyK;3ecSj=&ipi50`5dL z>F`5uPk!Ml=@M6yZMD}PKIp9}=&*o!xyiY|FF#fp&x?@%JnLsV{H6W*qyiDhBt6*s(U-^B+|2E-c@v zPyA#Y@kq|DPIv680O1~oDU8b9i%n-vEi0Ao^pU?hICwQd9Qvdnbu)#-DrnS9gkkb*@JwsJfYK}b6LAJf8&QEI2c$6NzsA+Wl z)`UW^?i4o=^hk^&-CpmU@}gOEuwcjTXlP~9uanHcZF6q3Z;4&gp``vrfNDSZ_gu5H z@8tcS6|=5*+uJ{z%=doTzC(b>X5=lH_&TtuuWlgx3fJBf^hsP4bo-;oEu0{jP&6v8 zJpK3WdkNJBG*W)a_yJu6zbmBN}fV_To;(-*av+YB1)jDUr zv84m+mf5+nG(iCK3LCF`*KXsfcBJb$9*d7okdz&P*HQadtjWi&g5Aomo!aayiOjY< z!>z){=2lI03r@^0R_em$Zhf28lPb;2>Jo2!9N@C0 zlhS8NbO}6~R)A&nILI$}>m5!&bX?Bc6MjKH=GBBCTD$(FCF19SmfM6FKR?#QgO%r} zbU1o#I8a!1DdXtCuj@-{=k`=yia4FMRtxPDz3M*aT7J~Gt4z+vI&*ko#=P=>WH%9&+-!eL{9=$l^xF~@E)tf7 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 @@ + + + + + + + + + + + + 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 @@ + + + + + \ 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 @@ + + + + + \ 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 @@ - + - + - + - + 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 @@ - + - + - + - + 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 @@ @@ -42,28 +42,56 @@ osmand:typeface="@string/font_roboto_regular" tools:text="@string/lorem_ipsum"/> - + android:layout_marginLeft="6dp" + android:layout_marginRight="16dp" + android:layout_marginStart="6dp" + android:layout_marginTop="6dp"> + + + + + + 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"> + 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"/> + android:paddingRight="16dp"> - + android:layout_marginTop="16dp"> + + + + + @@ -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"/> @@ -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 @@ - - - - - - - - - - - - + android:paddingLeft="6dp" + android:paddingRight="6dp"> + android:background="?attr/card_bg" + android:descendantFocusability="blocksDescendants" + android:padding="2dp"> - + + + + + + + + + + + + + android:layout_height="match_parent" + android:layout_gravity="top|end"> - + + + + 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 @@ - + + 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 @@ #ffffff #333b40 - #dbdbdb - #ffffff + #dbdbdb + #2d3438 \ 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 Select internal camera Picture Size Invalid format: %s Remove all - Enable - Disable + Disabled + Enabled + Enable + Disable Description Settings You need an Internet connection to install this plugin. + Get 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 @@ @color/switch_ex_button_text_light @drawable/bg_plugin_logo_disabled_light @color/plugin_details_header_bg_light - @color/plugin_details_header2_bg_light + @color/plugin_details_install_header_bg_light @drawable/ic_world_globe_light + #727272