From 63e9d69b5cadada53feca30ed9f40647d25f55e5 Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Fri, 6 Mar 2015 14:56:24 +0300 Subject: [PATCH] dark theme related fixes --- src/dlangui/widgets/controls.d | 3 +-- src/dlangui/widgets/grid.d | 20 +++++++------- src/dlangui/widgets/styles.d | 8 +++--- views/res/combobox_background_dark.xml | 14 +++++----- views/res/editbox_background_dark.xml | 8 +++--- .../editbox_background_disabled_dark.9.png | Bin 220 -> 221 bytes ...itbox_background_disabled_focus_dark.9.png | Bin 257 -> 241 bytes .../mdpi/editbox_background_focus_dark.9.png | Bin 259 -> 242 bytes .../mdpi/editbox_background_normal_dark.9.png | Bin 216 -> 220 bytes .../mdpi/popup_window_background_dark.9.png | Bin 493 -> 490 bytes .../mdpi/tab_btn_dark_up_focused_dark.9.png | Bin 210 -> 213 bytes ...ab_btn_dark_up_focused_selected_dark.9.png | Bin 205 -> 204 bytes .../res/mdpi/tab_btn_dark_up_hover_dark.9.png | Bin 210 -> 213 bytes .../mdpi/tab_btn_dark_up_normal_dark.9.png | Bin 210 -> 213 bytes .../mdpi/tab_btn_dark_up_selected_dark.9.png | Bin 209 -> 212 bytes .../tab_up_background_dark_focused_dark.9.png | Bin 187 -> 198 bytes .../res/mdpi/toolbar_background_3d_dark.9.png | Bin 252 -> 255 bytes views/res/mdpi/toolbar_background_dark.9.png | Bin 251 -> 250 bytes .../mdpi/toolbar_control_disabled_dark.9.png | Bin 256 -> 257 bytes .../mdpi/toolbar_control_normal_dark.9.png | Bin 249 -> 257 bytes .../popup_menu_background_normal_dark.9.png | Bin 358 -> 383 bytes views/res/tab_btn_dark_up_dark.xml | 10 +++---- views/res/tab_up_background_theme_dark.xml | 4 +-- views/res/theme_dark.xml | 25 +++++++++++------- views/res/theme_default.xml | 10 ++++++- views/standard_resources.list | 1 + 26 files changed, 58 insertions(+), 45 deletions(-) diff --git a/src/dlangui/widgets/controls.d b/src/dlangui/widgets/controls.d index 266869a3..0e8973a4 100644 --- a/src/dlangui/widgets/controls.d +++ b/src/dlangui/widgets/controls.d @@ -305,8 +305,7 @@ class UrlImageTextButton : ImageTextButton { //_icon.styleId = STYLE_BUTTON_IMAGE; //_label.styleId = STYLE_BUTTON_LABEL; //_label.textFlags(TextFlag.Underline); - _label.ownStyle.getOrCreateState(State.Hovered, State.Hovered).textFlags(TextFlag.Underline); - _label.textColor(0x000080); + _label.styleId = "BUTTON_LABEL_LINK"; padding(Rect(3,3,3,3)); } } diff --git a/src/dlangui/widgets/grid.d b/src/dlangui/widgets/grid.d index d4c3cf33..f46ece19 100644 --- a/src/dlangui/widgets/grid.d +++ b/src/dlangui/widgets/grid.d @@ -1251,7 +1251,7 @@ class StringGridWidget : StringGridWidgetBase { Point sz = fnt.textSize(txt); Align ha = Align.Left; applyAlign(rc, sz, ha, Align.VCenter); - fnt.drawText(buf, rc.left + 1, rc.top + 1, txt, 0x000000); + fnt.drawText(buf, rc.left + 1, rc.top + 1, txt, textColor); } /// draw cell content @@ -1272,7 +1272,7 @@ class StringGridWidget : StringGridWidgetBase { if (row < 0) ha = Align.HCenter; applyAlign(rc, sz, ha, Align.VCenter); - fnt.drawText(buf, rc.left + 1, rc.top + 1, txt, 0x000000); + fnt.drawText(buf, rc.left + 1, rc.top + 1, txt, textColor); } /// draw cell background @@ -1288,7 +1288,7 @@ class StringGridWidget : StringGridWidgetBase { if (_rowSelect && selectedRow) selectedCell = true; // draw header cell background - uint cl = 0x80909090; + uint cl = 0xC0909090; if (c >= _headerCols || r >= _headerRows) { if (c < _headerCols && selectedRow) cl = 0x80FFC040; @@ -1296,8 +1296,8 @@ class StringGridWidget : StringGridWidgetBase { cl = 0x80FFC040; } buf.fillRect(rc, cl); - buf.fillRect(vborder, 0x80202020); - buf.fillRect(hborder, 0x80202020); + buf.fillRect(vborder, 0xC0202020); + buf.fillRect(hborder, 0xC0202020); } /// draw cell background @@ -1315,15 +1315,15 @@ class StringGridWidget : StringGridWidgetBase { // normal cell background if (c < _fixedCols || r < _fixedRows) { // fixed cell background - buf.fillRect(rc, 0x80E0E0E0); + buf.fillRect(rc, 0xC0E0E0E0); } - buf.fillRect(vborder, 0x80C0C0C0); - buf.fillRect(hborder, 0x80C0C0C0); + buf.fillRect(vborder, 0xC0C0C0C0); + buf.fillRect(hborder, 0xC0C0C0C0); if (selectedCell) { if (_rowSelect) - buf.drawFrame(rc, 0x80A0B0FF, Rect(0,1,0,1), 0xC0FFFF00); + buf.drawFrame(rc, 0xC0A0B0FF, Rect(0,1,0,1), 0xE0FFFF40); else - buf.drawFrame(rc, 0x404040FF, Rect(1,1,1,1), 0xC0FFFF00); + buf.drawFrame(rc, 0x804040FF, Rect(1,1,1,1), 0xE0FFFF40); } } diff --git a/src/dlangui/widgets/styles.d b/src/dlangui/widgets/styles.d index ed2162f6..edf6d2c9 100644 --- a/src/dlangui/widgets/styles.d +++ b/src/dlangui/widgets/styles.d @@ -377,10 +377,10 @@ class Style { } /// get custom color attribute - uint customColor(string id) { + uint customColor(string id, uint defColor = COLOR_TRANSPARENT) const { if (id in _customColors) return _customColors[id]; - return parentStyle.customColor(id); + return parentStyle.customColor(id, defColor); } /// sets custom color attribute for style @@ -883,10 +883,10 @@ class Theme : Style { } /// get custom color attribute - transparent by default - override uint customColor(string id) { + override uint customColor(string id, uint defColor = COLOR_TRANSPARENT) const { if (id in _customColors) return _customColors[id]; - return COLOR_TRANSPARENT; + return defColor; } /// returns colors to draw focus rectangle or null if no focus rect should be drawn for style diff --git a/views/res/combobox_background_dark.xml b/views/res/combobox_background_dark.xml index f9bedd80..e6eba40d 100644 --- a/views/res/combobox_background_dark.xml +++ b/views/res/combobox_background_dark.xml @@ -1,18 +1,18 @@ + android:drawable="@drawable/btn_pressed_dark" /> + android:drawable="@drawable/btn_default_dark" /> + android:drawable="@drawable/btn_default_dark" /> + android:drawable="@drawable/btn_default_dark" /> + android:drawable="@drawable/btn_hover_dark" /> + android:drawable="@drawable/btn_normal_dark" /> + android:drawable="@drawable/btn_disabled_dark" /> diff --git a/views/res/editbox_background_dark.xml b/views/res/editbox_background_dark.xml index 1b19d1e1..07ef78b8 100644 --- a/views/res/editbox_background_dark.xml +++ b/views/res/editbox_background_dark.xml @@ -1,8 +1,8 @@ - - - - + + + + diff --git a/views/res/mdpi/editbox_background_disabled_dark.9.png b/views/res/mdpi/editbox_background_disabled_dark.9.png index ff8ed95de9034c163de3c2e3afb87419b57acdd2..9d00f811bf8449bf51a838a47adacff46a43475a 100644 GIT binary patch delta 187 zcmcb^c$aa4R=qrf9mA28{H5{?3=EtF9+AZi4BWyX%*Zfnjs#GUy~NYkmHj?58wUsP zSDv9@o$&&2Hi^cXlVAcOoZjrWlTk>|_ nwWYs~otM8V|Kg(W?;7S(c}3A#Cm+lLTFc<+>gTe~DWM4f-a$my delta 186 zcmcc1c!zOxE|McBs<4246Y927l|0usvws?|`r_%F1 mwU1c@1kL2XyjoVgk8x3l(t-_#?&kt+W$<+Mb6Mw<&;$TkHA<-f diff --git a/views/res/mdpi/editbox_background_disabled_focus_dark.9.png b/views/res/mdpi/editbox_background_disabled_focus_dark.9.png index ddfc4bb7c8a222d1493625b1bc2302444f29ee59..5cc18265d6f6875ac8ddd351507b0bf8f9116e5f 100644 GIT binary patch delta 207 zcmZo<`p7szt6rYLj^W5k{!)1c1_sUokH}&M25w;xW@MN(M*=9wUgGKN%6^}jje|oi zazni|P^iw+#WBR<^xLV{Tnz>SF6qv1E>|&cy{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G` z2j2k>4L1&rWJI|D0053jL_t(I%k7o14FWL?MW3T|cSW|LIf((dIp`SxF#@w7-2#-^ z#s#T!4MwRb&Rm1?Dod80zFd5ZssfNw;!R~60${!fFyEhbx>!AMQUP)qISeleO;R`4 z^XW6kcClQJE^#i{S!;0I^ecg#=;AK!;=dEi9^%+`snwnrRh6i!pY@sa=l002ovPDHLkV1j-bS||Vj diff --git a/views/res/mdpi/editbox_background_focus_dark.9.png b/views/res/mdpi/editbox_background_focus_dark.9.png index 30929e17efb69ea4031586d21656b8fb949b4e51..43a67539a533dd36661dfed57ec9ce9f485d224a 100644 GIT binary patch delta 208 zcmV;>05AW80`dWnDt{jUJ^;k24|N{^000SaNLh0L01FcU01FcV0GgZ_00007bV*G` z2j2q*2nhoVubLeI004hUL_t(I%k7o134kyVMgJWcAhi>SO~3(M(iNP;UEJU|*0J#* zL9j?-BYD-q!Q*qqKOqSK@ZRGlq6`55^9e}|(^4vXFwOz{wn>U6Nt;LwmoD6SRH}oW zHEP98Ur~HS7k6Lp^22FD9Nm#TOszNte|U?+I#_Bs3319>G7lh0000< KMNUMnLSTaYFHPnE delta 225 zcmV<703QGH0fPdNDu4d~{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G` z2j2k>4LBj8EoCnN0059lL_t(I%k7o14Z=VSMW0XCk>a*VlMO(O!4?tOAhXb>LsVIW z+65`mrNQVb3QQVwud-z6>C45ps44&{C0=B{LjcSd0S@CecUtEQPBOr}G_<>igd(Y% z{^TuYknqS^Y`X68+^hkwE+8L#W@kNVIgzURUHhckL__1!hw mdhMmOeSJv%0(bMbpLr|f6(z*a|2zV;mBG{1&t;ucLK6TMU`Rm# delta 182 zcmcb^c!P0*R{ehlAY8C_`D6wL2F?PH$YKTtZeb8+WSBKa0w~B{;_2(kexH$#S4A>E zqTvltDAm)&F~s8Z+p8M|4=C`k9GraI^1kBQK&GX(q7OKP+8-1ia_uTx;*luL;K?v| zYf?qx?5NjT7N;#QM{zTFY1XE1+i5oEzgN)yA1j#k<$oMt|0mmbcg5Qsxs!u#?fb}k hCR}Od`aG*=?0anr{;w}`H3Qnn;OXk;vd$@?2>?qOM#lgE diff --git a/views/res/mdpi/popup_window_background_dark.9.png b/views/res/mdpi/popup_window_background_dark.9.png index 40ca23cb9e41d68974765e5b837e55dc6b21d15e..1e3450a6fe28c7d6f753feaa4b3ef49877f682df 100644 GIT binary patch delta 416 zcmV;R0bl;@1L^~iRDTE)FNs(^ccS%G+R7l6ImEBIlKoo?(u1m3?LQJ?YMu>*^ z0>1wv@CICQLn5Lm|39VP%$f=dwq_?e-EGs(Y|rkQ6LE};Vu%XA)b73%CG}#^?>zuk zi`xNf#nci8cR)n~D_{mpj|3*8eks;wtLvs6AOTVlkM(?LOMm429G-wHU<*JuHQy97WaE~B}NpaRjs zJh*_@K0*nYQ{EIxz#ioPZ{?DxN+j|r`@E$r5|2OzM4{>+afBMPUw<&@_nu|B9pDkT z2X29y3dbCrcYmw2)I?s9MWpHnsp2O^vC7+(d;@6ezT!FOPQaLACB{=!`PcyqncRnZ!ZI(g)q^iJ3#(Nm@^*8kxZI+a>IFk_%<=*&k&pDjT^X~ufS(sU?Gyd=HuMiHU$LIToz^`pZdHb`x&PPoy0c_5Mv+8Qh9Fx0000< KMNUMnLSTYRUcnXs delta 419 zcmV;U0bKs-1MLHlRDT8*G<4P+h5!HodPzhABMp}^GOb$@-V{o}tmXf2<&vmMB=RZyyrnEsk3bGYq3R&Dgc|c-f6(o;Z)CYG z;1W0oPJo&UCx2c$??!2g#GayZV+o99a_{O16IWoN2VZIyMyp8W?eUJ{vWuFi7xct2bOoj&f6)gc zr6-ZVuA}VsVcX4~flpUpERvPxedlb)1q3oD3qz3)d>r19|I>rE;u{Q#WmTMH5orJb N002ovPDHLkV1hJYxq1Kq 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 74c57673202d8e78150cdd242bbec8a22521e7cc..a2fc896eb735143495619e2ad5e330f6124e07fc 100644 GIT binary patch delta 158 zcmcb_c$IO23O`$tx4R32JcAv>k(KzUcOEJZ^0{dH$xU`X? zbb101SZvLFRL>^VFf-mxnHdNc0~v>x{ypt+iHEtWFR-VFhll6CWrgd>i|0Q){+!LG z#>RDU1><7213U>!jxdNt%u;jzywX?rzwx0WWmmlgD%Q*l$(>>sG!}En0c~UOboFy# JS?83{1OO)sI28Z@ delta 182 zcmcc0c!_a>NGZx^prw85kJYlDyqrfHV;NblzPLq&N#aB8wRqxI00Z(fs7; zwLn4k5>H=O_WO(if`-z_HTd6fhDdt9ejTJg8X92DK*px$)deD0aqo9us> cd)%*N+|?}btNOPnC(w8XPgg&ebxsLQ0I5_wtN;K2 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 95057205fc244c26ce01eb8d0455bd4e4d6dc492..7f3015a9f24c737e0c5a612e9b6ca8897570230b 100644 GIT binary patch delta 148 zcmV;F0Birv0n7oABo78+OGiWi9{@f8#HkN;ACW*GdIJUv2r0`++|vL609i>yK~y-) z?US()z#t3*UtDU2$^uy+9dprTfh>@rSim&lj@G8-d%YS-)+zwX#c*J)3P9E>=k>V4 zgYUhSyv;Mp#S)8b!4?dGRs{Nw5uUQ5;lVN6B6sf9hZ?KM4_|!%0000GZx^prw85kJYlDyqrfHV;NblzPLq&N#aB8wRqxI00Z(fs7; zwLn4k5>H=O_WO(if=a5Jrz?g6g?v3-978Nlzn#31_ke-`^ZCH6X(@WsQW%#%RGso} z{}APoEgP94)^Gu)xg7T*QVsJ%>p$cN?EB3A X?1$*-CTqqlpverLu6{1-oD!M<4V*iF 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 c4ac1a8becda6c37e4d9d6d2559ef46215245cff..7373013ce62c3608aef6d597d8d2b7e38734917d 100644 GIT binary patch delta 158 zcmcb_c$IO23O`$tx4R32JcAv>k(KzUcOtke%UpP$6Qz>wtW;uvCaI@#p& z>GT93u-KaUsGd!zVP?FYGBXe?1~Lvm{d?N;5)bpPzKK0OJUl%AEh~?nxOo1<-_P1? zYHVBwS1>MSJHV5$c+@4uV{y^IpJYD@< KSk^fuGywpg)jEp+ delta 182 zcmcc0c!_a>NGZx^prw85kJYlDyqrfHV;NblzPLq&N#aB8wRqxI00Z(fs7; zwLn4k5>H=O_WO(if`+`$&z`Ua3I%z(IEGl9emi+1FM}cv^ZE7jI}IaRBO_W3BeYCh zs%ocSDBA0k(KzUcOtc8EP;Ywp*U`X? zbb101SZvLFRL>^VFf-mxnHdNc0~v>({ypt+iHCVtUtmuU4-e0O%SzXi7teqA`#GCU zjg9Nz3dY532Y3>e9AOZPn5E|ad8M!Lf8#?%%C33~RIHg9lC8zgUt9U~3eYwNPgg$| JmUT`EO#pJQI;Q{t delta 182 zcmcc0c!_a>NGZx^prw85kJYlDyqrfHV;NblzPLq&N#aB8wRqxI00Z(fs7; zwLn4k5>H=O_WO(if(H89+jh(V3I%z(IEGl9emi+1FM}cv^ZE7jI}IaRBO_W3BeYCh zs%ocSDBA0k(KzUcOtaUAW#m_P@FeG}qIEGl9PX6MX zk(2-gH}))eXV1)ezv2xL4waBQYZW*Z~>{}MMhHnz6^dzvmid6E9(&p%CO zVdmC^D-D6n32X*INetXNzLOVMes0?Jzh}c8kBQtGC(kk1v5J@eXgc*BXc>d2tDnm{ IW~YQE06cjGZx^prw85kJYlDyqrfHV;NblzPLq&N#aB8wRqxI00Z(fs7; zwLn4k5>H=O_WO(if`*Lms$0Z>LV=zxjv*GO-%j4h%b>`^e13g=zwC^bCeIs>FVdQ&MBb@0B+boc>n+a diff --git a/views/res/mdpi/tab_up_background_dark_focused_dark.9.png b/views/res/mdpi/tab_up_background_dark_focused_dark.9.png index 90c8b6b21b0cdc3c79cd76078a949edc49b5c0c8..ab204072490e0683361810f97b6f3d7b1de40e8b 100644 GIT binary patch delta 164 zcmdnZc#Ls^R=qrf9mA28{H5{?3=EtF9+AZi4BVX{%xHe{^je@Gdx@v7EBk$BHg0n+ z!w>CqfkMHaE{-7{$KOtMrG25TG0&aQJF`WlJ#UlJkNqw0%D@ez>X6E`Kzx zDR_#}pP=dC+#3!saqDb&!2jaELRQ&4GnMT#XU>UakQMm8yVUip90T{pQ-Yf+A`^sw P<}-M@`njxgN@xNAmd-cF delta 153 zcmX@cxSMf;R=pX6A47hDwpJ7a0|RG)M`SSr19v9~Gn$_~y%s3QUgGKN%6^|wfRA5G zq@pPeDCFVk;uzv_{O#00UIqmbCVu9KOEJ^79Qb^h>Cv-etPdV=7izpyiVHmV;hElh zF#$&wK^K98{6GFXY+d%&>?-?tu?2SP)~zsQ-N5)GRfum>xGmoVprH(&u6{1-oD!M< DT9!1c diff --git a/views/res/mdpi/toolbar_background_3d_dark.9.png b/views/res/mdpi/toolbar_background_3d_dark.9.png index 70186345d2905cb5b83dfcf7fa6a31a370355b3b..33db3885d7c6d4851143cba41235c3eceff7b7c0 100644 GIT binary patch delta 179 zcmV;k08Ib<0sjGzRDTE?Iki_ad;kCdj7da6R7l6|maz(eAQVOKiy*}1{a(=4N47Qe z8`W6zT_T!n5}cGkhrlyEbvRrRu0j$as)__Ic1TjfwU9(Vj1HMO&J)W#N$WSZea$K` z#sUBu6s8I9{Jt)ju8YoJP*qnxLF!fH5TFXGpbDxWEs%dF2rN6O7R4( hFKFMPxslS}mKVr6Hz7?*2EPCR002ovPDHLkV1mI2OI`o~ delta 176 zcmV;h08jt_0sH}wRDT8!A46(P-T(jqiAh93R7l5T{P5ue12Pa05MUqx{^OJU@Zkd^ zGN19ohYt*qG0FcKs0^Myd&Y2R-*!e8n826sKN)BNm>6gbn2^K#);NfmP77 e0*th7wg3PvA~!c85Kxo=0000=Ak=G-;b1G;nwZZ%bU6a z02D}ws`?^+bGOWg`D*@^qzQt+rxqX!vLFkxz!u1VCx|<_X(zj**{0s8@vRDT8$6P}$vDgXcgh)G02R7l6|mN5>4Fc1Xy5G90*@;(YmUX+r8 z_eE@g-c$xR=oAY}MDkQ;$@Xa7tc4^(R22r!+CWnLEF{r(y?H2xad=DV7xS`SdikTS z000FNqN=V4-~2m$cJtZ%D@hZ0flDnw7GyydWPvS^|4tBgawzkB?ag*J-zovgqmyGB d%R*9rTQ*V)G0EkReLVmG002ovPDHLkV1n|ANdy1@ diff --git a/views/res/mdpi/toolbar_control_disabled_dark.9.png b/views/res/mdpi/toolbar_control_disabled_dark.9.png index ed99fed9aff1f729549755fc9f1be4ab4096ce1e..ffaca2785538bca0b524076b77afb7de19e7b2c0 100644 GIT binary patch delta 107 zcmV-x0F?iL0)YaMR0|6b1$&ApX#fBKj*(v_Awx<=F1dzb1rxJ57+C}a1QD~Cdu3(VV?j1 N002ovPDHLkV1oCKBxe8s delta 106 zcmV-w0G0oN0)PULR0{?Z7Tm$9CjbBdjgem^AcK{?E4hYY1-qvhFtP{;2ry{rn=(jA z%2377XV0H7NRg#1FyYzrCsZ|<@xzA?3|}voGDsLk!OK!|y^qWX08|4eS=}$-y#N3J M07*qoM6N<$f^LW@0RR91 diff --git a/views/res/mdpi/toolbar_control_normal_dark.9.png b/views/res/mdpi/toolbar_control_normal_dark.9.png index f3cf0e64a74ec3d8051efcbd4ba7be86535c335f..ecf7c99f0ba963173910342d65fce66a118c3251 100644 GIT binary patch delta 147 zcmV;E0BryH0f7RLR0|6bAxDYKxBvhEj*(v_eM3}iGP#Cf1+&Y97+C}a1Q@)0gBgw= zJ;+E6LoKcC|4SG~F)%UE2ry9)rZ@pJkK=!ux_H#!QG-Vf9##f3QrpnKU-mQ7%*8Cw z8ic{p+McS#C*y|?9~iz~E@hA~jDnY?0{H=uR0{?ZGnd7EU;qFBhLK+-b%UOfCAo%S1;-cKFfuYQFfhm|Y5rGJ zRi}!fw{G8LxPNIHBNGFS022jaiW4yNIR2-pi$@I}HF(tEVP!BQwGI9IWk2nTO%`Yk t!f@;MP3js9t4bscqu^yJx!y0>Z=Wzf4002ovPDHLkV1o7jI3WN4 diff --git a/views/res/popup_menu_background_normal_dark.9.png b/views/res/popup_menu_background_normal_dark.9.png index cd70dc6425c6de7d3819aebbd7f2f46c15156df5..f85cef80b1a5eaa5e08734acc5955c29597d887f 100644 GIT binary patch delta 308 zcmV-40n7g80{;S#RDTLJ8XvQtOaK4@3`s;mR9M69m@#ewF%U)Ht|-2gijJEg1yZIV z1$7R<0jVijkSNFjasqc-Ax)PwwzMFYSg^(^{3;ig{5-QensG%uKip3hwPF7D{>UNG zG}}$D&?qd%?NzTj;mw$U|p34WYkTlIL0`Lh; zE`Nj^A|XZ7+z|tS#=1y!+4*_P$NckvHS&3_&zS_MS(>C00003sknh(>~$U>`77SBIM3Oq&o=NHZuUS+632q=&xHyoZ2$KKMPt>4DSvvSbnGv`sw; zO3g)<9lRp?{tc2hDP?85pJ3aRB#(Q5Tmcj|%+?S9xC6+?AAdp!h_ytaAQ+b@Bm~0} zg@(ZFO0w|8TrCN9k_d^A2#Jsgi4e~biObCKSEWgZb4PGU+th;O4M3?|{%|`YrL0IQ z0G)36edRR^(U=EG0C?)%@s&=mVTTxuZfX^P!V|j hF$Y;|#Be?=zZ9noH?{kpxu*aC002ovPDHLkV1oXqfGhw2 diff --git a/views/res/tab_btn_dark_up_dark.xml b/views/res/tab_btn_dark_up_dark.xml index b00959da..f60c84d2 100644 --- a/views/res/tab_btn_dark_up_dark.xml +++ b/views/res/tab_btn_dark_up_dark.xml @@ -1,17 +1,17 @@ + android:drawable="tab_btn_dark_up_normal_dark" /> diff --git a/views/res/tab_up_background_theme_dark.xml b/views/res/tab_up_background_theme_dark.xml index 801b3a6a..7f5fa78e 100644 --- a/views/res/tab_up_background_theme_dark.xml +++ b/views/res/tab_up_background_theme_dark.xml @@ -1,8 +1,8 @@ + android:drawable="tab_up_background_dark_normal_dark" /> diff --git a/views/res/theme_dark.xml b/views/res/theme_dark.xml index ab7dc39d..7ffef40d 100644 --- a/views/res/theme_dark.xml +++ b/views/res/theme_dark.xml @@ -7,6 +7,8 @@ > + + + @@ -196,20 +201,20 @@ align="Left|VCenter" textFlags="UnderlineHotKeys" > - + +