From 4655d01bb807a8f1e874d1b764242a567c3718ab Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Thu, 26 May 2016 08:38:22 +0300
Subject: [PATCH] dark theme fixes

---
 .../res/mdpi/tab_btn_dark_up_focused_dark.9.png | Bin 213 -> 298 bytes
 .../tab_btn_dark_up_focused_hover_dark.9.png    | Bin 0 -> 309 bytes
 .../tab_btn_dark_up_focused_selected_dark.9.png | Bin 204 -> 297 bytes
 views/res/mdpi/tab_btn_dark_up_hover_dark.9.png | Bin 213 -> 439 bytes
 .../res/mdpi/tab_btn_dark_up_normal_dark.9.png  | Bin 213 -> 298 bytes
 .../mdpi/tab_btn_dark_up_selected_dark.9.png    | Bin 212 -> 335 bytes
 views/res/mdpi/toolbar_background_dark.9.png    | Bin 250 -> 218 bytes
 .../res/mdpi/toolbar_host_background_dark.9.png | Bin 0 -> 377 bytes
 views/res/tab_btn_dark_up_dark.xml              |   3 +++
 views/res/theme_dark.xml                        |   7 +++++--
 views/standard_resources.list                   |   4 +++-
 11 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 views/res/mdpi/tab_btn_dark_up_focused_hover_dark.9.png
 create mode 100644 views/res/mdpi/toolbar_host_background_dark.9.png

diff --git a/views/res/mdpi/tab_btn_dark_up_focused_dark.9.png b/views/res/mdpi/tab_btn_dark_up_focused_dark.9.png
index a2fc896eb735143495619e2ad5e330f6124e07fc..95d260aaa171d8f21ce15cb8ac3d8ece5b64131f 100644
GIT binary patch
literal 298
zcmeAS@N?(olHy`uVBq!ia0vp^f<Vm2!3HExzWu%hNU<e(ySp%GGFUQ%vTF9`0Yx|q
zJR*x37`TN&n2}-D90{Nxdx@v7EBgahNe)Aq$9g(UKq1-8kcblJ{M_8syb>Unfx)>b
zHL)Z$MWH;iBtya7(>EYRFO?lA-skD!7@~3h?qoy0Lk2vq^R>lxF!F4eK2h1A@ZqK@
z(o-hBi!5qcGykN9(uJl&N2V)9-v4;{dqQ&5sjTYnCmEc4TpyeDwQkS9edu;>m`+jh
z?zp0TF^m?n{6`zU#~tJ_RP0<QKf&bpt~!MyPo!Tk{uKGZ!*u0`)YV^RuJevfUSZ~P
nnEy+=!0MD4XJzg_IlJ@SS^devm%BXHf}HH>>gTe~DWM4fK&EMG

literal 213
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4Pvb__>W@|Vg3MK}vQ
zB8wRqxI00Z(fs7;wLn4k5>H=O_WR6iT$Ums`~JEEg_1m7978NlC!2geot^*$7F#nP
z)w2mT%#62FW(I=AK*r&ve@}Z{;$g1p3+(CP;o<pjS>bx};`tAcKWDS4v2h(-!MK?1
z08he_BMf2@v((%_uk;oEZ+xgo*;Q|WiZwGsa;Mk@jl~>tK-(BRUHx3vIVCg!0C|`}
A9RL6T

diff --git a/views/res/mdpi/tab_btn_dark_up_focused_hover_dark.9.png b/views/res/mdpi/tab_btn_dark_up_focused_hover_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab1492cbecebb022cb7c83d6dfa4a25df23570ba
GIT binary patch
literal 309
zcmeAS@N?(olHy`uVBq!ia0vp^f<Vm2!3HExzWu%hNU<e(ySp&_2f+n<mrn+Ya29w(
z7Bet#3xhBt!>l<HKtc8rPhVH|2dq-8yvB-&A(B8L+02lL66gHf+|;}hAeVu`xhOTU
zBsE2$JhLQ2!QIn0AVn{g9VkB2)5S4F<9u?;0seo=8zl=hlTs2A5-NVYk#2Jdi+WOD
zvN3b>v}6et{iCf}9dlIFoBQ(*)U&a%wZ-qROO!Zs>{wgkj6EXa%)&j)#t*KqkB{JO
zko@!dx_(LczjkRR;|7U_JOSY|qEi^$fSTCy<?9#4Hp;n0Z_i0daO!s3#30NpdceTA
rg;mP=f8xrCb0pGKCcONh#tZb8c$9hE!<xe&M>2T2`njxgN@xNAdZ1ym

literal 0
HcmV?d00001

diff --git a/views/res/mdpi/tab_btn_dark_up_focused_selected_dark.9.png b/views/res/mdpi/tab_btn_dark_up_focused_selected_dark.9.png
index 7f3015a9f24c737e0c5a612e9b6ca8897570230b..44ed6f79c253227aa4c45dba3f787407e881b580 100644
GIT binary patch
literal 297
zcmeAS@N?(olHy`uVBq!ia0vp^f<Vm2!3HExzWu%hNU<e(ySp&_2f+n<mrn+Ya29w(
z7Bet#3xhBt!>l<HKtc8rPhVH|2dq-8{5tdEt@D6FvY8<fCC>S|xv6<2KrRD=b5Uwy
zNotBhd1gt5g1e`0K#E=}J5apW)5S4F<9u?;0seo=8zl=hlTs2A5-NVYk#2Jdi+WOD
zvN3b>v}6et{iCf}9dlIFoBQ(*)U&a%wcXynE?HvDs%4#t5?zW0%o{R~rAeGosMK8d
z-^YM6iML^=(9PXG2KfO@5|R=U5_@X@be6I1+P*FC=7|F>V!bJhYHV5!i5VQqt!V~E
gLMKWpCbRJ{FdTiYUzfuzCjxS@r>mdKI;Vst0LZ>x_y7O^

literal 204
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4Pvb__>W@|Vg3MK}vQ
zB8wRqxI00Z(fs7;wLn4k5>H=O_WR6i+#H&xJ?~rw3PpOlIEGl9emi-i-~k05=J=Sb
zwo^=z3bMr)QyX<AEQ~l{^04pPvZvL1r97``F`PPDkg%4^;hNU-uR9Jkzu!A`&spPB
wM}@j`4vO(KhOzwW7o4|g(Zhp=x0TA@U2T_IeS$x}7HA2Br>mdKI;Vst0I)7bo&W#<

diff --git a/views/res/mdpi/tab_btn_dark_up_hover_dark.9.png b/views/res/mdpi/tab_btn_dark_up_hover_dark.9.png
index 7373013ce62c3608aef6d597d8d2b7e38734917d..41f9aebb5d1b5122f3c50dac4d273e2afbb1765b 100644
GIT binary patch
literal 439
zcmeAS@N?(olHy`uVBq!ia0vp^f<Vm2!3HExzWu%hNU<e(ySp&_2f+n<mrn+Ya29w(
z7Bet#3xhBt!>l<HKtc8rPhVH|2dq-80)pJRl@EbJvY8<fCC>S|xv6<2KrRD=b5Uwy
zNotBhd1gt5g1e`0K#E=}I|Boww5N+>h{pNeNxt5P9R%9u-(1tQWyT85xG!3dJpUZ9
zU-)3Yz~9wP?2aEEx#kLb2mfX~8hy-pli_?{_Gxox);^zGUhW=|8}(r+uL{GeC@(v^
zy=G18_55D3D5XyNem?)$N1g@^o-EdPZ$7=*G4n~XfzrG)oZoA9>C8K0X>VJkl6B``
z$u<S9T9+3wfiFJ)`7~{ERKvsT63INrB(7~$y2fC0=YHmc@1B!V-irRHU6-GCRnt@U
zb*P>1fBVR=)tk=U++cP%J50~x+0|stkIz*6Iz`ldv>soZq^~WwJjS!RBz#Maa^}vy
zbXymV{mo+5=_lDruQ{5nb#*Q7N!c`|XThb|Ee2Z{njdz=<#RXOotyi1*2MWQofxK_
ej_2e5_LJF1uF9nGm)dhs_<6eexvX<aXaWE#TCl(X

literal 213
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4Pvb__>W@|Vg3MK}vQ
zB8wRqxI00Z(fs7;wLn4k5>H=O_WR6iTvqA_oX<}J3MF~EIEGl9PB!^`Iz0ghEVgDo
zs%H~wm>F-U%nSsJfsDgX|DN`|#KXL+Z(>gm4-e0O%gUoCE}sAJ_p>&e8XMQa6^x77
z4)7!_Il>?oF-y(;^GaXg|Hg-klwI`}s8};IB)u0qw`Z1;KhQP?Pgg&ebxsLQ0PpNW
AlK=n!

diff --git a/views/res/mdpi/tab_btn_dark_up_normal_dark.9.png b/views/res/mdpi/tab_btn_dark_up_normal_dark.9.png
index 7ed7370662a84112a61672e479c856e808f1b56e..f57cbdc4b469c3d639b9cfd9b338e3ba560d4768 100644
GIT binary patch
literal 298
zcmeAS@N?(olHy`uVBq!ia0vp^f<Vm2!3HExzWu%hNU<e(ySp%GGFUQ%vTF9`0Yx|q
zJR*x37`TN&n2}-D90{Nxdx@v7EBgahNe(0Fu=H0+Kq1-8kcblJ{M_8syb>Unfx)>b
zHL)Z$MWH;iBtya7(>EYRFO?lA-skD!7@~3h?qoy0Lk2vq^R>lxF!F4eK2h1A@ZqK@
z(o-hBi!5qcGykN9(uJl&N2V)9-v4;{dqQ&5sjTYnCmEc4TpyeDwQkS9edu;>m`+jh
z?zp0TF^m?n{6`zU#~tJ_RP0<QKf&bpt~!MyPo!Tk{uKGZ!*u0`)YV^RuJevfUSZ~P
nnEy+=!0MD4XJzg_IlJ@SS^devm%BXHf}HH>>gTe~DWM4f<WOof

literal 213
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4Pvb__>W@|Vg3MK}vQ
zB8wRqxI00Z(fs7;wLn4k5>H=O_WR6iT-L%r-f*P>g_1m7978NlC!2geot^*$7F#nP
z)w2mT%#62FW(I=AK*r&xe@}Z{;$hy^7ueIo!^896veNbB#q%Hje$Hl7W8*rwf^jk1
z0iJ{<M;OE+W~sS<Ug<0R-}q3Gva8+#6>DaOWNWeW*H%8g0<?|6)78&qol`;+0K%$6
AuK)l5

diff --git a/views/res/mdpi/tab_btn_dark_up_selected_dark.9.png b/views/res/mdpi/tab_btn_dark_up_selected_dark.9.png
index 228659f1a1675f54dd8d372bd3848984e84fedce..8068462fd858fcaed4f407060fb50aca279ec2de 100644
GIT binary patch
literal 335
zcmeAS@N?(olHy`uVBq!ia0vp^f<Vm2!3HExzWu%hNU<e(ySp&_2f+n<mrn+Ya29w(
z7Bet#3xhBt!>l<HKtc8rPhVH|2dq-8qN0W6o_m2pvY8<fCC>S|xv6<2KrRD=b5Uwy
zNotBhd1gt5g1e`0K#E=}J5YSHr;B5V#`(J!&vH2?3LN|Rzql-@rIq*l;l3RlO79%Z
z-nHE*<UV!lR=AR)*R*8UbC&xeE5q_H@7X_7>Z3*3*K2##7-!5}eM6pSrFqt~+;`h%
z+j&fqmh=@9S)Iy!Blp_A&W9Oi+ILR)SmL=bXjAn3{KRyRNwE`3%>D~KXjPfXY%qKM
z4>cx_)S~>{!o9xhFCY3i=i_3FKMM67FT9<ZW}KVG(#*)PXyS#-*}2=Q8D;p~Cv{q=
XSFLb8Sz^%m8RRcdS3j3^P6<r_?s|Tv

literal 212
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4Pvb__>W@|Vg3MK}vQ
zB8wRqxI00Z(fs7;wLn4k5>H=O_WR6iT-Lglz2awqLW!O(jv*GOlfU?8BqadBjXewA
z*)ww<Fkjd?u@ML^0vQhv9Gj_<*~ZBJzr@Xrjjiqfo~BDrUZnr{^G}mmn7K9KN<$!X
z0-Hfl5(Br6@8rdmpPP35@7Zw2V<NZ4$#V>Ltm36VnofNOTE^h%>gTe~DWM4ffEP!S

diff --git a/views/res/mdpi/toolbar_background_dark.9.png b/views/res/mdpi/toolbar_background_dark.9.png
index b07769c3f092e3246ef96bcbc877b46b1f2bb8f4..8612803aa1e1b9780d0c75b65ec953c78929697f 100644
GIT binary patch
literal 218
zcmeAS@N?(olHy`uVBq!ia0vp^+(0bB!3HFC-mwb<DYhhUcNc~?4DT6!z1}Em2NdBf
z@Q5r1ssze%3o|mznj--eWH0gbb!C6RD#^~nSEw9x5-22_84^+AoS&PUnpXnkGB7w7
zr6!i7rYMwWmSiZnd-?{X=%um)#qB&@978NlCnqTI{4<`w-EsBj{7#YJK#_Rs`Zxcd
z@vbhsb)@Oc&fg#O4zHEI&VK9c;d{-CCmLDUc!YkCzd4h^G{?Ga)sI`PAS*mw{an^L
HB{Ts5zDGl%

literal 250
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjY)RhkE)4Pvb__>W@|Vg3MK}vQ
zB8wRqxP?KOkzv*xkRJ9DPhVH|`^;<{`T{=ZBc20=+C5zyLp+YZowk>&#Xz7X-Sq=|
zcdhcqj|<mZ)-2XMk|DY}Ln_jbr((kTTMm=@J&gq?bp(b=RAe)Ia&DgBV&C&@p|#Kb
z{wawMuf4r^diE|R1`&^rRlk(#inpI>|C#k~>JrYT1Ixt}xHkdO0kISH>K)cQGj}h(
qx$arGszPPir@O~CO}KJ@nrv&g;V#i-OgDf|V(@hJb6Mw<&;$T;uvsMl

diff --git a/views/res/mdpi/toolbar_host_background_dark.9.png b/views/res/mdpi/toolbar_host_background_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f1529013a11df0a96ee7e5d6a7a8c5f6f302456
GIT binary patch
literal 377
zcmeAS@N?(olHy`uVBq!ia0vp^96&71!3HE9eb4O!Qfx`y?k)@-3;_(m{BmuaKoQOY
zkH}&M25w;xW@MN(M*=9wUgGKN%Km^=id9vyzqR`}P)Ig2B%;JQKQ}iuuLQ_tU~n!<
zO)N=GQ7F$W$xv|j^bJVSOJxU&-}Q8H4AD5hbdqh}VFR94`&(8G`WL=&%xt=|Gq_F9
zv279i3q~vU7ra6&eru*5oc8tk6=%y60zZCEtXU-J{3P-7#+&a>sW8MJZ?<&E*I(~l
zxoh2I<{jUd&mUr(v;J>{Z*ZWfL;dICaMi~Q@0!;yS<13Qmm#wAA^(Cz)i6f(3)|k>
zi#jZ|f2_=U-~!9lu$?cuk}jE?_EoJB;S;;Yb@JSbtV_&hUnd#+zOYaW^>4HhyXL46
z{Fa$3xye&ub*+SB^sGbnck9I4!?%{m-`{`jN&VCNr(dS;+4tVwb5B^*bH=)g`10Vh
Rx9@;Lz|+;wWt~$(698T1j12$)

literal 0
HcmV?d00001

diff --git a/views/res/tab_btn_dark_up_dark.xml b/views/res/tab_btn_dark_up_dark.xml
index f60c84d2..57ed4e8e 100644
--- a/views/res/tab_btn_dark_up_dark.xml
+++ b/views/res/tab_btn_dark_up_dark.xml
@@ -3,6 +3,9 @@
   <item
     android:drawable="tab_btn_dark_up_focused_selected_dark"
     android:state_selected="true" android:state_window_focused="true" />
+  <item
+    android:drawable="tab_btn_dark_up_focused_hover_dark"
+    android:state_hovered="true" android:state_window_focused="true" />
   <item
     android:drawable="tab_btn_dark_up_focused_dark"
     android:state_window_focused="true" />
diff --git a/views/res/theme_dark.xml b/views/res/theme_dark.xml
index bf3c067d..f8305089 100644
--- a/views/res/theme_dark.xml
+++ b/views/res/theme_dark.xml
@@ -113,7 +113,7 @@
         backgroundImageId="tab_btn_dark_down_dark"
         />
     <style id="TAB_UP_DARK"
-        backgroundImageId="tab_up_background_theme_dark"
+        backgroundImageId="dock_window_caption_background_dark"
         >
     </style>
     <style id="TAB_UP_BUTTON_DARK"
@@ -204,6 +204,9 @@
     <style id="EDIT_BOX"
         backgroundImageId="editbox_background_dark"
         />
+    <style id="EDIT_BOX_NO_FRAME"
+        backgroundColor="#292929"
+        />
     <style id="STATUS_LINE"
         backgroundColor="#101010"
         />
@@ -230,7 +233,7 @@
         />
 
     <style id="TOOLBAR_HOST"
-        backgroundColor="#202325"
+        backgroundImageId="toolbar_host_background_dark"
         />
     <style id="TOOLTIP"
         backgroundImageId="tooltip_background_dark"
diff --git a/views/standard_resources.list b/views/standard_resources.list
index 95f221b8..78a33622 100644
--- a/views/standard_resources.list
+++ b/views/standard_resources.list
@@ -209,8 +209,9 @@ res/mdpi/tab_btn_dark_down_selected_dark.9.png
 res/mdpi/tab_btn_dark_up_focused.9.png
 res/mdpi/tab_btn_dark_up_focused_dark.9.png
 res/mdpi/tab_btn_dark_up_focused_selected.9.png
-res/mdpi/tab_btn_dark_up_focused_hover.9.png
 res/mdpi/tab_btn_dark_up_focused_selected_dark.9.png
+res/mdpi/tab_btn_dark_up_focused_hover.9.png
+res/mdpi/tab_btn_dark_up_focused_hover_dark.9.png
 res/mdpi/tab_btn_dark_up_hover.9.png
 res/mdpi/tab_btn_dark_up_hover_dark.9.png
 res/mdpi/tab_btn_dark_up_normal.9.png
@@ -227,6 +228,7 @@ res/mdpi/tab_up_background_dark_normal.9.png
 res/mdpi/tab_up_background_dark_normal_dark.9.png
 res/mdpi/text-plain.png
 res/mdpi/toolbar_host_background.9.png
+res/mdpi/toolbar_host_background_dark.9.png
 res/mdpi/toolbar_background.9.png
 res/mdpi/toolbar_background_dark.9.png
 res/mdpi/toolbar_button_hover.9.png