From 3f9c1c335f717c666bac8a7d39c6aad5cf51295c Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Wed, 25 May 2016 15:21:42 +0300
Subject: [PATCH] dark theme rework

---
 views/res/dock_window_background_dark.xml         |   8 ++++++++
 .../res/dock_window_background_focused_dark.9.png | Bin 0 -> 329 bytes
 .../res/dock_window_background_normal_dark.9.png  | Bin 0 -> 338 bytes
 views/res/dock_window_caption_background_dark.xml |   8 ++++++++
 .../dock_window_caption_background_down_dark.xml  |   8 ++++++++
 ...k_window_caption_background_focused_dark.9.png | Bin 0 -> 290 bytes
 ...dow_caption_background_focused_down_dark.9.png | Bin 0 -> 249 bytes
 ...ck_window_caption_background_normal_dark.9.png | Bin 0 -> 295 bytes
 ...ndow_caption_background_normal_down_dark.9.png | Bin 0 -> 246 bytes
 views/res/theme_dark.xml                          |   6 +++---
 views/standard_resources.list                     |   9 +++++++++
 11 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 views/res/dock_window_background_dark.xml
 create mode 100644 views/res/dock_window_background_focused_dark.9.png
 create mode 100644 views/res/dock_window_background_normal_dark.9.png
 create mode 100644 views/res/dock_window_caption_background_dark.xml
 create mode 100644 views/res/dock_window_caption_background_down_dark.xml
 create mode 100644 views/res/dock_window_caption_background_focused_dark.9.png
 create mode 100644 views/res/dock_window_caption_background_focused_down_dark.9.png
 create mode 100644 views/res/dock_window_caption_background_normal_dark.9.png
 create mode 100644 views/res/dock_window_caption_background_normal_down_dark.9.png

diff --git a/views/res/dock_window_background_dark.xml b/views/res/dock_window_background_dark.xml
new file mode 100644
index 00000000..fa79dbf4
--- /dev/null
+++ b/views/res/dock_window_background_dark.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item
+    android:drawable="dock_window_background_focused_dark"
+    android:state_window_focused="true" />
+  <item
+    android:drawable="dock_window_background_normal_dark" />
+</selector>
diff --git a/views/res/dock_window_background_focused_dark.9.png b/views/res/dock_window_background_focused_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..b90efe58972b143adf6c7c9ba33db0e9a6255877
GIT binary patch
literal 329
zcmeAS@N?(olHy`uVBq!ia0vp^f<P?7!3HF=7hLlMQfx`y?k)`fL2$v|<&%LToCO|{
z#S9GG!XV7ZFl&wkP>{XE)7O>#0jnerE8m(eY>7Z2+02lL66gHf+|;}hAeVu`xhOTU
zBsE2$JhLQ2!QIn0AVn{g9Voum)5S5w;&gJ#0seo=8zl=hlTs2A5-NVYk#2Jdi+WOD
zvN3b>v}6et{i9#yj|y0N`mxF1Z}`sx1l#jtj~hgU`U)R55OGdmOSs%~)?kL?r=Xbs
zGZTc4NHG+vZYrOdaBl&NfsuiMLB;PM!f&}s@^kNQn%KyxD|M2|hbM$#aa)3U%S0``
znP%CR$~y5ACb=be&fk^j)RjFUwsEUXW2(-kE~YMSRj*Iy|Ns9l$+*xuV1tSGgffti
NJYD@<);T3K0RVp~ZI}Q6

literal 0
HcmV?d00001

diff --git a/views/res/dock_window_background_normal_dark.9.png b/views/res/dock_window_background_normal_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..f1107dad400966ba2d87265d684f571b9db712ea
GIT binary patch
literal 338
zcmeAS@N?(olHy`uVBq!ia0vp^f<P?7!3HF=7hLlMQfx`y?k)`fL2$v|<&%LToCO|{
z#S9GG!XV7ZFl&wkP>{XE)7O>#0jnervuapS#B!jJY-UJAiF1B#Zfaf$kjuc}T$Gwv
zlA5AWo>`Ki;O^-gkfN8$4iw+!>Eak-ar*5PL%u@>Jg)m~6}Fl$V76uUP>9&+V3}3j
zc+P`oPGhUGfTr`Alq<({vohWOO*wM$^7P61hsr(EeUqniFvy*st{Jmx^O5w@%TfW6
zPcAj*T$3zopUmL!;ao%IRLO|QCx><gI(*0zSn%M%+`^xY8VOxV0;{`Kl^AZk>z^EZ
z#CF&Hbq`)h)(a^&{+p1<p;{PZuA8a%?2q8tfLrs<6kaY(oTHJ!vuta{x+T(H-k+3}
ZzOX56_N(*u{<9zCHBVPRmvv4FO#o9HdVK%@

literal 0
HcmV?d00001

diff --git a/views/res/dock_window_caption_background_dark.xml b/views/res/dock_window_caption_background_dark.xml
new file mode 100644
index 00000000..927600ff
--- /dev/null
+++ b/views/res/dock_window_caption_background_dark.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item
+    android:drawable="dock_window_caption_background_focused_dark"
+    android:state_window_focused="true" />
+  <item
+    android:drawable="dock_window_caption_background_normal_dark" />
+</selector>
diff --git a/views/res/dock_window_caption_background_down_dark.xml b/views/res/dock_window_caption_background_down_dark.xml
new file mode 100644
index 00000000..24e116e7
--- /dev/null
+++ b/views/res/dock_window_caption_background_down_dark.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item
+    android:drawable="dock_window_caption_background_focused_down_dark"
+    android:state_window_focused="true" />
+  <item
+    android:drawable="dock_window_caption_background_normal_down_dark" />
+</selector>
diff --git a/views/res/dock_window_caption_background_focused_dark.9.png b/views/res/dock_window_caption_background_focused_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3ff94d9ff44d6f7d8ef931f3572e5ce7e7e4e59
GIT binary patch
literal 290
zcmeAS@N?(olHy`uVBq!ia0vp^f<Vl}!3HE-RKxZIDYhhUcNd2LAh=-f^2tCE&H|6f
zVg?3oVGw3ym^DWND9B#o>Fdh=fK`%*M=s&uS|6a0Y-UJAiF1B#Zfaf$kjuc}T$Gwv
zlA5AWo>`Ki;O^-gkfN8$4is<mba4#PIG>zyfd8NJM#)0Wq?Ck&go+<;q}z^M&Ax7M
zWXskq21lMO-SKa;0{02eBBPx9)zcb*VB!AN-|Tm_9om%UmeY1HmdTi5b{deuGimyx
zU*}mSD_mokp*?Z$X_n7ystuhX;R(gO!ciuZ-V0?(9P(JH_@U&`v14xA6ni2jnV(E!
YVAvvQ;K-L<FAZ|4r>mdKI;Vst0O-wRa{vGU

literal 0
HcmV?d00001

diff --git a/views/res/dock_window_caption_background_focused_down_dark.9.png b/views/res/dock_window_caption_background_focused_down_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..c46883850aca9e3bfe2d4991d1a53367db4f2dea
GIT binary patch
literal 249
zcmeAS@N?(olHy`uVBq!ia0vp^f<Vl}!3HE-RKxZIDYhhUcNd2LAh=-f^2tCE&H|6f
zVg?3oVGw3ym^DWND9B#o>Fdh=fK`%*mtA(F$yuO~Y-UJAiF1B#Zfaf$kjuc}T$Gwv
zlA5AWo>`Ki;O^-gkfN8$4it~|ba4#PIG>zyfd8NJM#)0WChv;hKmMmH2<F_~G;v~M
z<3oFHp9k01$MZa4QZrGXoXf#%%9FTcmUr3vTYi%gPrO?BOqMMuws{@ja<y>t^Z#2+
kl07G+H2?1jG3XU!*y1L+#dZC)g&-Gry85}Sb4q9e084yNUH||9

literal 0
HcmV?d00001

diff --git a/views/res/dock_window_caption_background_normal_dark.9.png b/views/res/dock_window_caption_background_normal_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5a6cd465e95adacea42d5d62c704d993e9431f4
GIT binary patch
literal 295
zcmeAS@N?(olHy`uVBq!ia0vp^f<Vl}!3HE-RKxZIDYhhUcNd2LAh=-f^2tCE&H|6f
zVg?3oVGw3ym^DWND9B#o>Fdh=fK`%*pIgmPDg`Jcn;8;O;+&tGo0?Yw<T5Zg7o{ea
zq^2m8XO?6rxO@5rr0Aux1I4>NT^vI+&L^iF;Qyz*QL<1oDJ3Bxq2k9I>9!+Rv#%Q*
z*|K$u!I39Rcl_I|z<t8A$SCK2^|VGHSh&mRx&5xTYu_|`ZtyhkW=Uf(I}2n;s^}m6
zI-gU`aSfwExKj0W&S$({48kkd9e5_Cwk1R5zUmc&mWe^m5|R=U5<I@TC%#?!d0G9z
dx&<mR5{wIdje{rL{yYujUQbs)mvv4FO#mtMWJLe~

literal 0
HcmV?d00001

diff --git a/views/res/dock_window_caption_background_normal_down_dark.9.png b/views/res/dock_window_caption_background_normal_down_dark.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ce16ea4f83c781d3871e94a1ab8ee17d5ae55f6
GIT binary patch
literal 246
zcmeAS@N?(olHy`uVBq!ia0vp^f<Vl}!3HE-RKxZIDYhhUcNd2LAh=-f^2tCE&H|6f
zVg?3oVGw3ym^DWND9B#o>Fdh=fK`%5So!Pc_lJQ(vY8<fCC>S|xv6<2KrRD=b5Uwy
zNotBhd1gt5g1e`0K#E=}J5W5z)5S4F<NVr58@UcRa5%^RS<Kh^?|;aSh4WLU^BoW5
z7coxlFcds0XIJQ|#3=LpsmRA3>E9h)Y)l(ei#XkwbILcAOnMWWRvRt5DKjkA;>&mI
ggF^2!9%mI?=8iuropdhg|2vTNp00i_>zopr02~xgng9R*

literal 0
HcmV?d00001

diff --git a/views/res/theme_dark.xml b/views/res/theme_dark.xml
index 9317d94a..bf3c067d 100644
--- a/views/res/theme_dark.xml
+++ b/views/res/theme_dark.xml
@@ -211,16 +211,16 @@
         backgroundImageId="editbox_background_dark"
         />
     <style id="DOCK_HOST"
-        backgroundColor="#091925"
+        backgroundColor="#515658"
         />
     <style id="DOCK_WINDOW"
-        backgroundColor="#8E9BBC"
+        backgroundImageId="dock_window_background_dark"
         />
     <style id="FLOATING_WINDOW"
         backgroundImageId="popup_window_background_dark"
         />
     <style id="DOCK_WINDOW_CAPTION"
-        backgroundColor="#3d5072"
+        backgroundImageId="dock_window_caption_background_dark"
         />
     <style id="DOCK_WINDOW_CAPTION_LABEL"
         textColor="#E0E0E0"
diff --git a/views/standard_resources.list b/views/standard_resources.list
index 3c82e0d4..95f221b8 100644
--- a/views/standard_resources.list
+++ b/views/standard_resources.list
@@ -27,14 +27,23 @@ res/editbox_background.xml
 res/editbox_background_dark.xml
 res/exit.png
 res/dock_window_background.xml
+res/dock_window_background_dark.xml
 res/dock_window_background_focused.9.png
+res/dock_window_background_focused_dark.9.png
 res/dock_window_background_normal.9.png
+res/dock_window_background_normal_dark.9.png
 res/dock_window_caption_background.xml
 res/dock_window_caption_background_focused.9.png
 res/dock_window_caption_background_normal.9.png
 res/dock_window_caption_background_down.xml
 res/dock_window_caption_background_focused_down.9.png
 res/dock_window_caption_background_normal_down.9.png
+res/dock_window_caption_background_dark.xml
+res/dock_window_caption_background_focused_dark.9.png
+res/dock_window_caption_background_normal_dark.9.png
+res/dock_window_caption_background_down_dark.xml
+res/dock_window_caption_background_focused_down_dark.9.png
+res/dock_window_caption_background_normal_down_dark.9.png
 res/fileclose.png
 res/fileopen.png
 res/frame_blue.9.png