From dcc45c5d81e6313f3a3b3b23616ea8fa85341cb8 Mon Sep 17 00:00:00 2001 From: seven332 Date: Tue, 2 Sep 2014 01:22:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8F=AF=E8=83=BD=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E7=9A=84=E9=99=A4=E6=95=B0=E4=B8=BA=E9=9B=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cproject | 2 +- res/drawable-hdpi/ic_action_info.png | Bin 805 -> 0 bytes res/drawable-hdpi/ic_action_info_dark.png | Bin 940 -> 0 bytes res/drawable-hdpi/ic_setting_about.png | Bin 0 -> 695 bytes res/drawable-hdpi/ic_setting_about_dark.png | Bin 0 -> 740 bytes res/drawable-hdpi/ic_setting_display.png | Bin 363 -> 405 bytes res/drawable-hdpi/ic_setting_display_dark.png | Bin 405 -> 420 bytes res/drawable-hdpi/ic_setting_read.png | Bin 0 -> 600 bytes res/drawable-hdpi/ic_setting_read_dark.png | Bin 0 -> 688 bytes res/drawable-mdpi/ic_action_info.png | Bin 559 -> 0 bytes res/drawable-mdpi/ic_action_info_dark.png | Bin 642 -> 0 bytes res/drawable-mdpi/ic_setting_about.png | Bin 0 -> 455 bytes res/drawable-mdpi/ic_setting_about_dark.png | Bin 0 -> 515 bytes res/drawable-mdpi/ic_setting_display.png | Bin 243 -> 258 bytes res/drawable-mdpi/ic_setting_display_dark.png | Bin 284 -> 270 bytes res/drawable-mdpi/ic_setting_read.png | Bin 0 -> 407 bytes res/drawable-mdpi/ic_setting_read_dark.png | Bin 0 -> 462 bytes res/drawable-xhdpi/ic_action_info.png | Bin 1120 -> 0 bytes res/drawable-xhdpi/ic_action_info_dark.png | Bin 1253 -> 0 bytes res/drawable-xhdpi/ic_setting_about.png | Bin 0 -> 884 bytes res/drawable-xhdpi/ic_setting_about_dark.png | Bin 0 -> 985 bytes res/drawable-xhdpi/ic_setting_display.png | Bin 446 -> 518 bytes .../ic_setting_display_dark.png | Bin 505 -> 553 bytes res/drawable-xhdpi/ic_setting_read.png | Bin 0 -> 807 bytes res/drawable-xhdpi/ic_setting_read_dark.png | Bin 0 -> 904 bytes res/drawable-xxhdpi/ic_action_info.png | Bin 1774 -> 0 bytes res/drawable-xxhdpi/ic_action_info_dark.png | Bin 1920 -> 0 bytes res/drawable-xxhdpi/ic_setting_about.png | Bin 0 -> 1428 bytes res/drawable-xxhdpi/ic_setting_about_dark.png | Bin 0 -> 1562 bytes res/drawable-xxhdpi/ic_setting_display.png | Bin 732 -> 877 bytes .../ic_setting_display_dark.png | Bin 788 -> 947 bytes res/drawable-xxhdpi/ic_setting_read.png | Bin 0 -> 1404 bytes res/drawable-xxhdpi/ic_setting_read_dark.png | Bin 0 -> 1550 bytes res/layout/favorite_list.xml | 3 +- res/menu/detail.xml | 40 ---------- res/values-zh-rCN/strings.xml | 10 ++- res/xml/display_settings.xml | 21 ----- res/xml/read_settings.xml | 46 +++++++++++ res/xml/settings_headers.xml | 18 +++-- .../hippo/ehviewer/ui/GalleryActivity.java | 10 +++ .../hippo/ehviewer/ui/SettingsActivity.java | 27 ++++++- src/com/hippo/ehviewer/util/Config.java | 73 +++++++++++------- 42 files changed, 148 insertions(+), 102 deletions(-) delete mode 100644 res/drawable-hdpi/ic_action_info.png delete mode 100644 res/drawable-hdpi/ic_action_info_dark.png create mode 100644 res/drawable-hdpi/ic_setting_about.png create mode 100644 res/drawable-hdpi/ic_setting_about_dark.png create mode 100644 res/drawable-hdpi/ic_setting_read.png create mode 100644 res/drawable-hdpi/ic_setting_read_dark.png delete mode 100644 res/drawable-mdpi/ic_action_info.png delete mode 100644 res/drawable-mdpi/ic_action_info_dark.png create mode 100644 res/drawable-mdpi/ic_setting_about.png create mode 100644 res/drawable-mdpi/ic_setting_about_dark.png create mode 100644 res/drawable-mdpi/ic_setting_read.png create mode 100644 res/drawable-mdpi/ic_setting_read_dark.png delete mode 100644 res/drawable-xhdpi/ic_action_info.png delete mode 100644 res/drawable-xhdpi/ic_action_info_dark.png create mode 100644 res/drawable-xhdpi/ic_setting_about.png create mode 100644 res/drawable-xhdpi/ic_setting_about_dark.png create mode 100644 res/drawable-xhdpi/ic_setting_read.png create mode 100644 res/drawable-xhdpi/ic_setting_read_dark.png delete mode 100644 res/drawable-xxhdpi/ic_action_info.png delete mode 100644 res/drawable-xxhdpi/ic_action_info_dark.png create mode 100644 res/drawable-xxhdpi/ic_setting_about.png create mode 100644 res/drawable-xxhdpi/ic_setting_about_dark.png create mode 100644 res/drawable-xxhdpi/ic_setting_read.png create mode 100644 res/drawable-xxhdpi/ic_setting_read_dark.png delete mode 100644 res/menu/detail.xml create mode 100644 res/xml/read_settings.xml diff --git a/.cproject b/.cproject index 061aa71fa..46ab49d27 100644 --- a/.cproject +++ b/.cproject @@ -20,7 +20,7 @@ - + diff --git a/res/drawable-hdpi/ic_action_info.png b/res/drawable-hdpi/ic_action_info.png deleted file mode 100644 index 2b907ef83b127283d72715dcfccd0da8730ba6a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 805 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 literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/ic_setting_about_dark.png b/res/drawable-hdpi/ic_setting_about_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..f0fa89c53feb5c23d7dfe138f318d76817de63c9 GIT binary patch literal 740 zcmVc*l7AevMQ&^^mAf!nXERz(m5fZ`16ftE;VTi=VjQ|vj#i?vI`y2)LOq3Y(ZADS^snKYh>B?vW zP{!wSxmS39T6b_sKUg^J^?L7hL1+Q!ht11d^!zZ^7C^Rj!buB2xm;dG!=l8a7Bb&z zwc6)2`BVV?Y@@vIYQm=3GgxhP2H-msyYERh+z0^gzm`s1R{+r8f`xa+0MyzBBih1NWUIFm_SVe*G`e19Y3iSGD zaR9>W!`-Xvac_^;hc*@de&8719r^l+NxIE-CMP|#a%O<-Kw|*59<-GoGhpjMTlqg} WDYZcDaD9~k0000AlI*z~@ zRA{vt>urMUD(t+m$i&;^OE%dz^UZtTxAV=9$$0)4&&Qt;fnP^Z5%4YoK@j9I=r*hY zE5fpGkhq}j5w?KMj4>y+FFJ)lpbsYg*q{@-oyEWc5U5(tQL-URV)jU(7TJbBCPxH%aMFdP zeZesSf$=v8+^?8IwF)l#>S!&)dw9h(hkfUYiB;&+czR3u=>f6*ivX)w+IU4EZAIDs Yu5dsSK(um27XSbN07*qoM6N<$g2(i$eE59b`I*tGxx6C2C=|A6=JV>H>s1^Wl)7XZ+kfeFC4=pgO_2vSBv i5Ou&%ydbX8ci;oWF(E*uJ6G2L0000%$tM& diff --git a/res/drawable-hdpi/ic_setting_display_dark.png b/res/drawable-hdpi/ic_setting_display_dark.png index 0175972500189580b54dd2e7153b72d7e65a3a35..f297737b0aa9c84a98387f5d60ff0367e767eaf9 100644 GIT binary patch delta 394 zcmV;50d@YB1Ed3xB!6p3L_t(&L+x2HQo}G1j0!3b4OG0qy-fuLb!PGocmsSOZwT)o z(9%E^+m+uyL#Svx6v|SVQHms9*@{QZdL}dR&1W!VftrhoXHu)+4&|KPWmvMiri zpEQ6x&*xz6m-#^-sIV@I;+}O%1AqdHo@ujdj1~&q9Rt848>Fi}0Ni%9ZS8y%_*Vc{ zVB&*i&9T40_sjNu3NfRwY&?-Z~RUf33o;00*qcxK@c0K-`zRp|00) zW&c@K)dMT3&v_t7g9H76XY>b_!2z@_CIq|&YiB;^YG;rZe!k%6?Px6~mZ8x0bP9zY o5bIw6SjL97mjXjG%KF;?ehV!??$Abc00000NkvXXt^-0~g6T50)Bpeg delta 378 zcmV-=0fqjg1C;}iB!65d8r@Wa6e5L4q2D_(FEsoc9oC19VHsr^Wf={-x#&e%mJdVEQTLti z`?nY`evdVoyK_M=Xfy!e{26AWZ({-ICe-Q&0A2||8pgg4Og95qa9jiQy%hKOV07*qoM6N<$f<&LI@&Et; diff --git a/res/drawable-hdpi/ic_setting_read.png b/res/drawable-hdpi/ic_setting_read.png new file mode 100644 index 0000000000000000000000000000000000000000..4df0d47b3ea1c2d2f1c3f8af43e6bd893d380c33 GIT binary patch literal 600 zcmV-e0;m0nP)Jp`KY$AZ zZKKLp7Jz}U0M{|eeqIIueHOrEMQjC3X5a1s)7iHbuocjd0s9!$ki@D&*a}pYJ`I!O zRDnZy>apQ4TyX)oMf4>FFfRR5vnWI?iBHh`F~0H2>z3xF5mrV0GywnQ_Z z+a7&=!nFnb1kwvYHuM43;nzyK0lwUpI4x<3b{C@6z5eJz%F&2&P=y|MUZcuMH^3eN zHxwC_Hd@03GJ~JAS;YawC{Bw}09>-jEW%`CdJe>-x$%LIJo5t&<}Kqq_pzcQO&tI$1U=FrGC+(GeB|-^ zH*^5VX>pXJ=rmjhK$POk*7^@X;tzKdf4nYlXOjDZLz*zrub7PP*bs|X{2d-5mJwGA mU?lB@-_WK7RJ(rSTj&R{-Sja}XH3BW0000n!}2J4upWZ8qCF4T1^~ z3WcVzlFUua0FwfMXGTN@ct&6B0p8IU z84wv@5CQQRWe~)wmJk`JDtruXZkP<300Pb+t^g53)PpzXF?KF7N^K&MNI%Zq zG8U5NGdEJ^1f?Y60*J@ynS^=8-t@`FyQj zua|T&%Io?Z&i7za)B^DP{mo9Na}jeLdZok~KqV!SOeQZ%od$zJAEG^nYi;B@K0n}X z3DJMm6BiDLyD?8TwTouQ6ad1GA?koq5;EqeAV$Uf1{_}-*`z3?LD-Ge9020d5Wfva zWaDa%Kp-%Tj@moyPK=2Ewm}9buzsJ`JxnryFQL19KEIkurC!VkGiv*_A4m!Il;2Y| z03!1SfHl27rBR`Jc7SMixm*k7Elm~x`zVQ179uOHfl?Ykz{unEXH*S6mo7s&hr-<0I61>TCENevI#VbhEQi1 z!Z&{JQ3YKFLGWM=tqFjM`*FC8#!<84{G0wOv;)YK2BHEm`4mppP>1F$*8k4`O(4#F z}ruo^e|1rV0n35Hs>YZJ!%r8;Kg zCF%m0$8gExU26U#(%;H+uaRaKfc>bg3!sdFY&1!28z%>~PF8G~=VK#4g|Sjq_2vSQ zy6y2el&^nAvJxw(F9pCW0J5)m0dDB^Wps4BBx-jGfG+^X{yl&ef-Eaw3W1h{SpZB) zsFh(B08<&tnQz^Q(j=j6Ba+Xfwk=z+n5F@+ZN(vgTtHlh(Jk*KN91t%M31Nm4Inuc z<<1}%myu|kLVNpR6hgR;<2(9JW6tA$XLuoDthMyVaeZW-7m^5stb`n+f4P#Ck}e`O x|E8-}u9wnifOET+D@m8B+Z2LKGbn=_06(qVt|7@ai~|4w002ovPDHLkV1m7d^NklY5Y1h_#ScWHf>>)HkdWv#;x7njVW*`aSc`TdVktHj3WB8;qD2H73tJ(YkU#=j zSxK}I6%I9DcfJK9mw2~37mKs-Ah2Y1XWz_wGdq&Y;ZJh-e%C($TN#K%A_IQEe+;yZ z>bgECNm3`H5Nj3d2P|*Oui zP378p5d3fAzaEaD-Vw<&>wcwDX(tp4^-=-A=PPuu%mn}nc6o|69u5YBORB1NQvm>Y z9T`~s+W9g7kJyS`HUZFDF#}-r z7=gn(^!^me^sQR0eiVyEHu=cmaJb*=^#)LmLA(nyun#wtn%&2U9kzIm@6ib_d0h{a z&?Ep181~qIjvI#^9Y_qlUO`l|?TloYBM+?xk%oWLsO9KTYUJCov7GYMw!4Q!LA%Z= c=l%hF0-?)3Flig{Q2+n{07*qoM6N<$f*U#&r2qf` diff --git a/res/drawable-mdpi/ic_setting_about.png b/res/drawable-mdpi/ic_setting_about.png new file mode 100644 index 0000000000000000000000000000000000000000..6485f26f4014db9cdcf26c525b13a1690c6c4ea0 GIT binary patch literal 455 zcmV;&0XY7NP)2+hkl&_?!W7QPzb3 z&JnCBg5^ja0XRqj3=k|TqJN`#_PQ0uS%uF#0Ke8&Xa?>T^_N_A*MRtp09a4WfH{D+ z1UWOHDuH$p<^ZS`p>`YQ0I0U1-1&9~kw04Pj$#iW4T#-kri!I)g891!1l+|g)s8;0RK3xo+^nx+k< zdr-8%QkIz?0`|u9Jf{@6Y|^rly6$6I9Y#@fHY+D)0vLwTZ8n=5jF`W|wdW**P#xj5Rwh3lkDq+s?`36j z090zo_)}K4Ls2CFst#1fNw!3D0Jd#!fp(jf@lg1Q@tfg*rQWc_S_7}%JC5@(Etdo6 zbUFvrXjsbX%u}Q4_xo3+0Ep)W1eQ4rM35Ow;deYD+IhrSQ!8zctHp*OGCh0hIMj)s|;4GQG2Wta5 zz?fPNSPV4i5s{7oMOiGh9gqg}4N;*1OgA83&l+{WXb6mkz+Y$xjE2By2n@Rr81U+t z$ff|QGHNtP2E0kO4(KO&vb@j0@DLaRL6kPh?0^Pj0Wmqv@~J=v9Hz(tWcr+FZ3O!T gM4LpW!chkR02`D$pNRe}kNn==Zr zLY67Gv6p9&l!`-XtwW4sF1v;BWvQlBi2+QP_^y;SNOSTrXl`A;jQLgr+pftE8vZ+M zEpuS6Ssb=FL_9-4Q}KgD#!oFLKDAwuekT-)p1R8#JWym{P+xgTQE1}(X$(N%>FVdQ I&MBb@0BQ44AOHXW diff --git a/res/drawable-mdpi/ic_setting_display_dark.png b/res/drawable-mdpi/ic_setting_display_dark.png index 02048202eab0452f56e116829ac4f65aa5857442..dba23b71401375d1bad1ddb87a713174d1baa6cd 100644 GIT binary patch delta 242 zcmbQk)W`HQl@ z_T}$ltd{c4aP51aSk=JivAB!5;o=5vktIhg*hEqtw&p2p4Jpn(aDRV&wO-twif#$^ z7q4HhHZ(S#-eZ+u!s6x(Bih0_cq&SLd`x?Mc};IIGv8K`{@|vmdbTKG*G-0=CU23g qoF{v$lfDYR5f{i7*!jv$mVrUS{Ewom_VX$RAn}8Vx delta 256 zcmeBUn!_|frT(#}i(^QHdvc0I!U2l|-;8^#8eRw(7#V$Hbepa(AiT7F;>3?fZ*ESP zZhZCsQFq!R9%e~~5(lXZ0W<&q|Nq!j;H1&S@bz(1Z7V-LvA!zv;r;#nq2hWmKOB4x znVOlMtN!`v>6<|Ip0)!S9LNMis58S2si^bkE6@L*H-qiua{u{74Z4eFhLkd_NOkLZ z8erPvz%CMSn^8^0qJi;6L(MA70|yQ$OzrGEIfaG&54)T5y}8!qbwNu5S1n(@{KTO{ zOhpWVx|s>g-&8j+RyRy&?lkI|pg843zg5BkX9fnXiNOXn$KRi000K`}KbLh*2~7ZP C&~tbI diff --git a/res/drawable-mdpi/ic_setting_read.png b/res/drawable-mdpi/ic_setting_read.png new file mode 100644 index 0000000000000000000000000000000000000000..6c5b8dea2f44cdc0a03e8cf21e6b2a00a70a2a4f GIT binary patch literal 407 zcmV;I0cie-P)nb;gK38=uDN*1FV za}?-+JVFitxs+NyM|Z#lI)0OL^yjE2By2#kgRtwP`l(BRoX zTo1%dxC%2`6+}OP7N!FYzXGhx@`3C)S~vjY!Ia-f(1x+BPSKpRlwT9{!#3#x$ZU?9E@ z#7RK8U+5MA)i?shy3o@DIS$wa)YORPLr^d`0r3o=+(TUP4Rk~yP%Z{po>T{11ZvI% zYWj)G5`5x72Y}iYQ-IhMrj8T`d;)5U1>)!ASdOGe9LQb*#QY#JQXKFPsQx#Fmcz7z zq6}O%5aWOWZ;}moqjX@K5U002ovPDHLkV1gV| Boa6ui literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/ic_setting_read_dark.png b/res/drawable-mdpi/ic_setting_read_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..cebacb00407c600bfc15741f2bf536f7f9213319 GIT binary patch literal 462 zcmV;<0WtoGP)Px# literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_action_info.png b/res/drawable-xhdpi/ic_action_info.png deleted file mode 100644 index 45179f185ad106109cf898f777c16880558c8d08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1120 zcmV-m1fTnfP)KVLO zLL?Ktf#j!nDBksbwND+dd+%BMthLX%w{v!_&VBE!wf0)yS$prb*WQ)3g11V+{ckG) zC?lZY2$Vyh-~muhf|(3~YPC88k+uLd7c>*Zzo&r4x(NJ*=U31G=soBasJBw7@b924 z7yxj38Z2K9S^}B}8s+K9AMn2bJqGmvj8C5OB6f2C;P`a(yb-h#G(luVGSd&R+ymVJ z5FeA-FP?{H<;#0Koa#u;ic%b+u6f1sobD0m5qm zZ$lO}0C0X0dN^(v?oyvPEDiyLr&57hd@2Co{CX(e0~)C@LLvJXvgZIocUm2(0cZl} zBcD|uqyhlWFGlZY48Hsqr(;suFX-e5!ahX86JI^v0JsV7l5)%sL4H3Begu8AVJm2t zukpk9IVbG!ofy3Ua7*1qbi~9))84|+jz|IYGAn!l8m&xE-?0EoiJ*i(Q09T-Bev+~#d;i}=ThF#c09-MHlb`Q?KI(H2Kl&5EVeMd+ zF@UTma58LIRFMF{ef?2|aqnQnx<>KT1}0A75sDvMKPC;-Bg#T^K~2P1uudkJDqfO~(2CJp=y>c>Wf z=L6ghPsL*nXflY0BiwzqgT{bZi{v|L3v)2y4CSGS&(YWsIN2k$ycQq8;dL7x!An}$ zqcH~pZ-Yn=N3#SV{NZTy2|SL+zq|04e7$-+jJl))ne2|oV<6;xJ0vnC`wJ3H1cJ(W z`jJ=`Pl{bP9F7UXG)a~3dye_TX>NtYJ5mD>n;46EO)fSZI9YMY+6=O|Lr^Osm_u9x z@y2NLT$GGkTG*?y!#`JHFH6^oTX(|D`aDzGVqBN^oznB-H(3SpGTx%!5&#PnTUkdL m0j>P?ENm|$zyifq*6|MlNUu<$ufp2^0000IyxFlrP9W7x!eTBt;Kf@o*VG%*AzJGcDsM# z`3t_&cz*Bkc-{;T4}Y~;r5p|}D#bVOu^Sv4! z9sMp+pSP@X0;19AYV_VtI1q;eL0&_ul>=5DSVK_J<76`VO$DZop^Si*mKJ|77~BCv zcN?Uw(pJKvq4F@F&p#O-AD>kLu7m){eLajh4Ck9w7{$T>2~#L@2gBk6t1RoiGy!dG zZJS`wF;#MB8T?1OzlX(*v9Ylr>PSE`$Pky5CPg$cUm^u!`P27v|D!oxDA*>dx7hdBw-3uWWUH1 zDMSDw{$3ckPsT{CZU)i2SH}s5!+}sJ)QA581=#n2{eTyTn*eQv*8^aE{m$D)rE&%I zb~ncCXL z!njWeNEfTshr(ibe?p>-id7L@Z;yXM)`9BP+7wL3*hH$M?0NQyA0{UeMxD2BkB?zckHJ8g>n3$ND zwwQpgAmE%70qC7808p_+U0{bD1fanJ;?F5r0SqdxI4Aq1HWt$;wrKWs4Y{NQ0 z&32dwup%L1H33Q!B37ittRz5rN=zFDN|T~i5&(PECPj$=#c6Sug#=iW7S~iDdN7hf zy?6M|VNA{-MU|sxY_ET0v)Rc^CPV2mS3DkHStt~mkTYn&J3oGdC`)&Umf=geNV;3Z z`?2O=gjzRoG33303+95Z1|GQhhEl P00000NkvXXu0mjf4IU@O diff --git a/res/drawable-xhdpi/ic_setting_about.png b/res/drawable-xhdpi/ic_setting_about.png new file mode 100644 index 0000000000000000000000000000000000000000..0c242f9f2fead5bcb527b88ca508205783007568 GIT binary patch literal 884 zcmV-)1B?8LP)B&Mq*;3D9S*|$jEOg5tAonfDDL>w}vO5ahrhuqKxp$34!XW-xtWE`30 zk10uGl2%udTY&hPWTDbX1pvV>!R|3+g@#iBHeR7~8VK(KbO)-`20-v@=;0JHr>--R z?Z2Ua90<=M+x?|p3jo1y!`cxfw!qc#x!hI?=UaU9 z)fX-h4y6o-XaKI@NhQub=6zW%HDNrqFh&7zQ{APE)!r9$^|{Or`(viaSO9zI;6SWb zne{IM;96*(!2sL}?>>e#7CE>uU#_E5(M=*ePfbLfgO2EaiK?^bY7Of(5V z>|Y1Kg%DqZ0PuF^VeBrVwYF~>fb1Q%0^y4fLMVWp7&`1T7V*4k0OHCy0NnKX6bj%9 zhF1EFMLd6uZq+$~ygtH)PjvzSdwoh?0PZm30fyRI?)qYw>bWeAHu(-!LI7;U(1}zp zT5fj|01pTG5CTAJdTN8kKeeXnLT!Bm?%<%>YTEMGDT8O}ypDM8&2Q z*`><;d;ow9;VJ(@GTv~z zKodnU*AP%Cf=x_=xd5n4gH0@iasg0T2sN=3&ILeaDJ)-hwKqdK0O)LnWd3JIsJ$J| z0YGOv>;RZQ5V3tE=CZ)#BEIh2_EabGg>aMa7EfhOJ z&MSf#!6F|P5j{?@Q5&_$fn*bt_@83~OAMKr?3+o#Y~bLsdHd$Q-@Nzc?d(_q!#|ec z{s(*jegqg!z)u0g1HdnWT2dg9NbCxS!$(7*&;dl;-cF~p+p??~{2y^5u-WZ)w}Qdo zFMR*eZnwX-TCGpDTJ5*$2vr6ko6W{;+s?x2<8b0291O`g13+!ae*ugS(P;ENK6RP< zMP{0m$d`JL>iNEF3wDzbJ*{19aH9 z_A(xiuNMl1zZ7GT07#`$`!GwFVbCE8qXcwpBDx+|DwXd7vO`5Y1Az0#5bjs0!d=uM zCoNV1;iKq1gXBB`fb*x|{6*OU=fz<6y{u58HarD{H>2tt8Nj%m?>X!h!bkv|u%92- z%=gc>17UfTbdUzX3Le7#mhPPAg}74_?#mWNDFDt=cU@z(=lR|L`zDsihcZi~6o7O( zeFh_*leJ2-{EKqA{7Q68VF0YdLw~+V(c~ap3#C%&iQC9bCUXgCl@~R9h@6e*js?+< zQ5XPn|2zzzBQP+a7(f6Z*H8ll&TsfWq+sr^XElx_)!?V}jAtG%Tc$+HR2tfFsK=@w~9e9%DkOq&C2JeR1#05aO zJZWb$sMhowAp+nA!vBbN>j?$~fX}D{4?INx*8h7@w1>bRw~B8_s}1)Bgexnu`zgo4 z#Qj7+aN83Aw7<(xK)S`HV;OXuw$T>Pdj+rp1>97TnK_LBx&Uy^2QY*HcV>-G0To41 zR|=36LG%IS%b+d*B+HD5DOUvkHadr z#I~cH>~WYWGk!zF_$@IO1x9a*G62SJi!%sDzZhWvjDI!e)Bp?L3prkuBj6EvbUmuJ;EIp`D8hKpa z>*}KGe$UIGE<;s~;{#Adc3SlM5il(?rOHk}0#uQm7QO!fpXrNV%?C{w00000NkvXX Hu0mjf6JWuB literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_setting_display.png b/res/drawable-xhdpi/ic_setting_display.png index d73918f2698951624e3ed04cdf5955b81ee811f7..a54bdf529928cb9fa62356bc14aa23a059d3d270 100644 GIT binary patch delta 492 zcmVqq|K3PWA#}-~{Q2(5$Gtu)3wCLX{@OaLMT zq=1&!FqEb(z<+RS3u(#&PC0RfAxrc;36fx!zAMvX2L zlnKfNWrA%2ItBDXWc>pSwJ1l;lyLcZ@*#eA2`Wiz3`XXP-yi!0ZPol3p iq=3H2mojhl3itv3VM8 zut^sekeyhId$14`E5X3?Oc@9w%)K(h`-Exa&6#u0yYq9;n@~0U7aAUag#ctg!xdl( zG&})V1kI;FUDprFst>h+TH7JRPQv^SAuKJhJp|~B*p~&lD}NYKgrP(@rjFwwz>7$I zrV_iM|40ICZ+PzNBc1}RH1Z*p;6MGl`md*!y#Q}|Lu+dRw8l(?`Hlc&08@Z9AopE> zMUY*9ZIE*S2O&;^#tLv0rWT+Wq8g+e#t*;{!4bj|!xF<1!xF<1%lyj_o*%;e!4LQq$=X4HmN4V}!|ba;huHr>B0%ot zFd5*iK(F#>s;j?Lzb?`h%sl@Dp09sK0L%c- z32+N|o&XdbibiVC=s`L;&P@evQR%+6FVm9@+3&6vf#Xo1w8%0B!(a%{G`Z_5kn= z0HLgsG(aLS0vI5`3^24tBGb49B-C0XHK_sAfIb0@Orr)+ z0|W?Yq$Wj>B1jSJ5zyFbJOuzVp zKtr5Z2(b`iA;dz6g^)o&Lu^&*09=p13mh&z7q}kZnt%V(*+NKT@k2fdfIUL)G)ej0 zCWlVZl{ZR46MmopC$@Scatg3jHqW>5BraCjERDG?(J}t!LlxTtI z+V9}|3BUK~6MnW`d}lAR1tbEQ$_D{VMc$QpnE|dmiK*gX224fXm3h6-fM57wdQf2+ Sy`TU900{s|MNUMnLSTXe>fH7K delta 479 zcmV<50U-XV1o;DyB!9q3L_t(|UhP`DPK7`ay^Dnf#f_CzRy0aXcv#!`2R7Drx3RFf z@e?fl4trzi7XSqzhQ`>^m>7u(7XgRF+RbKXlO-Gys@WZ8&YT@~PgblJ{)mO=zXAYY zz`_y05?D9^&;(5^fxR#cuN}uZBX&6k7`7Y7@hQ*qXAa-&0Dr`Bd`yAeas>B}kDU-= zo2Kcv?swP$NRlL`3T<=)lg)42_O2|;57{`G-6R07!!R_m095T%`9pe-tOua$y8EIi z-c%EmjgO+}f&jPz0JbjyFaS#cJpfG*e*ydku@AsTNVc<6wPPoUtuW34I1J%5h~qHy z00<&bgrEpnu73(c5`!cLNeq%0Br!;0ki;N~sY+h5@sPwIi9r&BBnC-r4w4vMlzOP^ z`d!x5RqdYVozt94>je>_X-|QUstL-*6R^|WL&tgmWQpk70f6n2m~Mq-^T7a%8E{IC z>PA*U9sAT^o2J=TRrRIgXPV1?Ro3_Y{q=giArMYX_*kEkC*LnwmObhwZv=q9phOS^ z2YuhO1MIr)58V>~L~> diff --git a/res/drawable-xhdpi/ic_setting_read.png b/res/drawable-xhdpi/ic_setting_read.png new file mode 100644 index 0000000000000000000000000000000000000000..60af7e169b99176b7ca6bfad3a247a12a9675ba7 GIT binary patch literal 807 zcmV+?1K9kDP)T^jkY$X5>Z4G5X3@^A&5Z`!2~rZikL5BA1zYYs-QL& zTG)uCU^>AN5Dk8uzZY_{T(bLyyPLgP<}Ez#_GaeI|NVCM&Ft+YmB^1I^7tzTz(zpi z1nd@wd;nMybiM_u)oKr;kM?{ETQW?HkTyHM;DDw00{mF&MsqHU7Q9`=O-G* zfbdMyq5>fJJvez(qTp*W3xq*!B)9;$g`-0n$w13r0AM&zn+t&F0pIf)_ay)vZWh2h zt(TC?0nlpzatOHG0yY9d9^#rdy9F!^d$&wP^ufbIC0X(S)C3&0E= zPa=F5q9?I!3WO@9`57(4z?vn_!H`nYk>jb z7{WVqtr%#AFk!``Va0KQczAk5}W`4002ovPDHLkV1o1SUkv~N literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_setting_read_dark.png b/res/drawable-xhdpi/ic_setting_read_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..fcb8d23f89d6843d24793a8fbb88f90eed3e3a37 GIT binary patch literal 904 zcmV;319$w1P)hiDi}yeatI#uAfljn6A{#__)#hrvHyUeM38z=s|OLGdbX{e zD+r$Qp%NrQA?itL4w4|IF^Rto27)F#W0FaB*$FJkWMcSMp8-@D8Q#VRXYBc_17H!ij#pz)=8rkN>q&siX>pLb=mm z((zf!k$xbI1ptQp;#y|@9^smjRNUOoy2W#YnNdj#(8#w?*KFfC0gZ3O|V|A~`qiY>vs$g*$mjEwP9=bF03*+IQ=I=dN~O}BVzKyB!Y~5}m;NUn zj1oWUU4IH4mYh7`ZIc_;?rEK^jQ@d(5oJg zIt0X%qW;PO5Zt~HWzPTrQjY8yCC9162Ub6Ig=;u%R=yOHs!O7K!rQ6Zj)yL&kEm3xmD?A}$2PIYNpaH0)>jc@_1Dr5QDs|Kz eppvc=Wd8vgceaVd*O~a^h7)Ht=@Fjnt1zyTOrz*xQ400&@f0b})E0~|oV1?K1H zkHP<*0yz;u&M-g!?A+H@>Q%^QfcQ>RaaWfK02rRl$_$AN20R z=Sz@h0fNnyYETCNawq5I&I1 zv>1Rere{ZcJ49+&DQO#~&0*_f5O&Zaa|aOs!T8IOamoSGRuWEs57K{vA^|}Pz%pd` zjwvwyUbckrC;)7#4ZAu3y#41OlaCCz+3B+}o1;~L@P17QRRM(2&U%Fomo9{tAv=OG zIJdY&0XjS8l{H64)c}NX{yJn(dZ@`aaSe>{PWMfOel~eG)qFd9(&7+xb**_qO#rKq zu^SZ(@C6Eg{kR?gpv#&r1�w^1x=cI8*_E!k-n|eT^CJYbg9Z69627ziokNIQ2MV zW`95zcTp$?5FBe8kc(4`auWaW+bH;&2>^}`05o0#s{b5vTd4!D27ndJNWA@uW3mHY zih}R#ri2&a3Vgq>IQ6syHXt95r#-T7>>>ccpZ^?^)OIPq37um0KlPlR>%ermJwexE__y@D?h}Q zwX1WNH%kC;HS6xmg&Asc4*@{d5I74!aJJDwB|YgH3J^}tmghL@ashC!4jofNbu-rn z%h~xd0N9qAa4rB&`8oCX@Sg?fEqyxGAh`gzNO5kevV{1o(%Tc_Gb%T9QLMtd0KidU zQb-06whO)jEu}lw{x73k3Zz>hIv`)1402Lv6}YA4O5{6f8)OcE3!&&?;ZhC}08Mfy z0KAoAn;Za~cqLc0luRM+Pywt5fQ>0-%>ghA1(&5L$%s3LXTFB~0-?``yPsLL{|ukp zVEbz~-3FQFCFHoxhb^*Xe(bh-A8~{Azptb1HSC&=*>;{1Ir2%lOp7my{Rsrk* z0B*&M4mmZz0rZ)U_BV=X zbrhuHiqLSz4HbZjGfu-DJyZZH?r7fMAiW?nL;yMqGPDdlkJ3w$Lj<6+BpCo$_X90< z!pZGFZJF$f2mq|NrL+b>eOn5_S#Hc~4S?>(tWXOqwtkl0NW!<0RXos);grey+1!dcnXnw zfY`n=@Nc{>fcu0fTPK_mI|+a1-cTOaZLF&ubdPM;Ye-K!MgB*v~f&zucc718V9w90$>wf6y6F@9I|G@leAX4s$d8J+PtbD zG(|J`EV-;>EuNRY%ku>2$h}jd-OD;UO%V@nuzF70@g@3ucuB{5#qCZffoe@qH&bYi z{KBS4N>Turu3uRe0YL;n=nt5-U)r}H2x0)n`h@%OeTdgqK2W>OALk(spffu1i(4nu z1{DAS0^I<&Lau>WZ*T8w80Z3d0rDi?{OP&6cx;43w*@cn*1F&+qAUD23Vl1gyu0`o ztXPGNr&a^TAo%t5!5}68IvuqCfI~`kk&5d-VIpPO#B@79;=^-R>?{07d=hO~HF~(0 zV$#o89RWogRds*HildgFA^tN~RVhq)Vy2z&l-o9{cn%=SOmdMNfShfkQg#4QW|E8K z0OV{Nm9hhfGLu{+2OwwLsFWQ*l$qorIRH7^My2ckqRb>0$pOgOHY(+R061cbf2R~R Qz5oCK07*qoM6N<$f=KxiDF6Tf diff --git a/res/drawable-xxhdpi/ic_action_info_dark.png b/res/drawable-xxhdpi/ic_action_info_dark.png deleted file mode 100644 index 9c13111286e207f3deadea3af2bd26f0a4cb7de3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1920 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 YcMGzLcR=$LcE2s4**n|S+5{&42VR40UH||9 literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_setting_about_dark.png b/res/drawable-xxhdpi/ic_setting_about_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..c7dbd7bbdf69bc63ac0fddef5b4b5f38828c930f GIT binary patch literal 1562 zcmV+#2IcvQP)_66vuaVXCe}jD5WHSlJ?(ZA7l#=N(xCHl)QK#X+8S$;Lqc35)WRaJV-)Gu@Q8050J8;{#ft|Bfbte-Y;2rVTU$GG zXlQ6gDwUds*A%3lh}U?0Hx}<{ojZ@;zTxv1yguQ#_jtXNyX7KT~` z?dITfol`A!VJN?Vj|#>Ee13@Qs}DJpGFbt@@DpK-Rv2Rm-X~KkZkrY|KS1U^yx#?g zPqyWm=H~*CZf#V_?wfeeJ1R4AF~I@U*VoU=WHK9Z_svaQ z%K!=C3D0u5+{OO>{+9v7{Spxj0K!cMMqdTV>Sf!o`m)gg3ho4qPK2eLFCoR{1_990 z(lRBV&u@j`1tFAjAmed5oj%*u)%D&%S${3UI{@7IvvKEdM=hrMR>pDp@8Aii;R!Ds zmph_3uK+NRT8e?xCP>WqRKjD~ISk}3U?6wLmke(JVEmOBP;Kzlr}t%$(sI?<0oNr! zxZy*l7Xa$chw(R8y77k%t|6TF;R((G=$PMD!C|M|jh+LD4%cmhQvkZRql{l^4Q|rt z@(#VD4wtG~Hu(!bw--1ZMy+wXha7U1zFQh2^_~sf(*F>g)u7 znqGiws?Zbb2-k(Jipv zUH4Zy3o`^SafCgZp1wlWO!Uql${q~$iY}xI`=8ST{v(8; z<5V5V0Q7dj!w^(0(+){(I)K%)1JrGhWB>?1^{COVq_wKDbSDso`YAe-0W>u=t%19( zrwFN*vDPfCp@YfW;IcRh0HVJm3sPUorqRznLyTQLrQ1Wbjc_z2^^|y)VgQ$ERTmim4pPcA0niRbCs2gAOdI1sY*;_k?K1%E zrRYlrfHvSH1h8$iiWvaxl0zGy*2NQFCIC*MbaKALHTp-w$N>xizz&M8WJAIO1VDKU z2LT`Va`CNyZ8w*pj3Iz`Q6Q)yAx%AwjrBdD)gS zawMjnAq%=KMTa5Tn58)c-L*nwRI=oU6Sc_;XI{GqFNbx|Avgt~yQb=hGC8g$Aq(dKlw3KmDWUb%NIH2^T1q*xESbH$ z0T}iKIkfNZAiM%7Y7^wx$}$|h11Rbp$-%9oKnMardx9KY%n4vvwjAC)l0q;KD1k4> z*K31t0r(+a{=mWGI3QUs_-88l3loa9Jg1dE@$qb6O7ZeHRupSVS|bavHo`_V{?9TA z0A`>9KmagXfLXkFfB;~&0JC`U00F>k0cP>y0Rn*80?gvY1DFAP2RHMHj>H>QxBvhE M07*qoM6N<$f|oqYEdT%j literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_setting_display.png b/res/drawable-xxhdpi/ic_setting_display.png index 363a0f6a5712952d668a43d2201eafc0ae57cc6e..0b8145a58a8512b3fe5e69967cf38a1bfb515246 100644 GIT binary patch delta 855 zcmcb^`j%~iay_$&r;B4qMcmuDySqXh1=^lJPz`W&bUAwWNVtKKK)k~h2iJnfuFi?( zW~LtmeM}-sS4^ zdaiTXx8Glb$v2~H(su=gA4&}j92{;67Pg`cj0ZVbmM>>gP^gz^eDEcNfrUj`V9q?Q z8R|^G{{FLD`@QGQsyBAC+S( zBUk+TsPtfMSmB0OUZ>dqt1_LN&i}jKMW5;3^*E2-A4(5mdUyOk*3#g~#L2jI{r;05 zS2jfasTN>hOcl7$E1_h=b}B=#ZmChcrt@aqF1^0$PkU@mRm*Kt;MfprUKv*}3}l^X zzGNoFbnI~(+XBXp4Y~0rKO}J{aZ7bGC{st+S#0(1QlSc8%>bf4zJp?o_DA<(Yi%{Hg|R zxBJ)f;_Cm47KR%~W!bKNDX~M1N$$$LE^)?}cV-;llxc7KSpVMaU&^u%J|wDfcywP- zekuKHm#%eGb)f9y_b2RS6DMgc_?2j8L^fK>U?r|--7Z|gN_GrnDB z62DkMVMabjLqh^f)8$}B0f8Qef+{TrrY1oSKYvyS2Lq;qFIPg6@n5;QjvDnFL}GOr OfWXt$&t;ucLK6V;xqD0i literal 732 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>U|Q_y;uum9_jc}nJr_rjW8b?p z1Oht`344@$k!$FvU=>>HwfvHX$h`y19@`d#WPVYR>g@>fe{}xq-5a7#DQV|V&hdTc zZ=`5geD2Kmvor7C>5U0(Umw7_>cSh9_X!Rk)DAH4aD*vX*ornV9^_(KzMRQGA)@iY zmkBkyv+57eZTgTT|5;Z`2SibEny6vb#CS@m(JF-XE!D= zmd{LPd)3ESfBKpg^SPym|2jmU$iL9zwD!xPt>+qKr~YZ3KketlBTHC&t&TO+yp3^7 zU=V$x(__Q?VyS>rz-Aay)`S&mXI~D)=5)Dl{+Pi)}OzU_0a>!NHuUdErm2fd3)B zn6q4rEpXw7IwikKp(+%3S{gUVhi_J5Oaw8(IxV>8*3E^hPE>ev{OTGHuz3(A=bVbP0l+XkKUa&aQ diff --git a/res/drawable-xxhdpi/ic_setting_display_dark.png b/res/drawable-xxhdpi/ic_setting_display_dark.png index 5269c7eda4a6aca33f995dbb8f11ce94c77fd709..a91484a1af4b741cdbc73091f373ca0aa9a674cf 100644 GIT binary patch delta 926 zcmbQjwwZl`ay@gEr;B4qMcmuDySst|McO7?xHR{Dk2oyhvuOF559(PPYV7LOCZDtsU^ssFxc)A-n>XKnt&+Zd`}X`r-m`TN zax+BzEq`*w^!m9Yn(^QEt-k(R|M3({&uQWer=ETi*0g_qYvzon-@~* zur#Q0*{)rWZq2lKs?A)d&HV1T=4B)1xE*CjT5D1d*oqf@KmBDAqn0Cs0jnp&jQWj7 zPBL8o`CtAgFl;`$G{_m)_ARq@2wAVW>bs5HjKiK6AMIE@bGq8uxL-mn4D;T3_-Q)= zRdRX>*eb+)<}&IQV&R@8#porVs^MYCX+BNJg>w;$@133p(>KgttT;shDA6HgQpsCj zK4tg9JAHia@0ial;=J6FdB`Mj)`ue;^##U#vkMt_Wu90F6fp3eq2?pJjPt)VW8cyO zoz`Sc8DAbx-DaQWHYewW3ois@XqbpdS?y!HF)77+lI}@`9-}J}U@x`BEK+p7dD^497Sa85oWT*E7mRZd4qYtUl>G=hsb|@j7Dpug^-F$5;z*{xgfALUi*P!@@X* z08Xpb%a_|v`Q}<*ee6C%?ex9URo%zl1u<-R-r^83J=px~#}(Pj7oE61@#nm_7oV41 z&AO^`{O9SKJt+s`9IjovR&R7OXPXxL^{-!B^zwH-XK{I*d}V5F^sX$ct#@Y^$1O>W zYYtc&7QXB5yGqNdz_9oUi8KAHF0AkexS7Y#$Wa^ixcbj?VX+gj8_IvS3j3^P6V7l$;;uum9_jazWH?yNa+uoW5 zf}Bb>x|ete8+a}at!udPTb!lZaifq@#O+%g|M)lZDZ1{`Fl)+CRh-aKUbsj@OK_9? zPR={YdyO~$-e>*$O=M1!<-ZV7j*!*CHGIrd%o*7d8a6SVdis)qCm_sWr;Tg_<0&qU z>C2f793mN?ekyU8#H%s=^y-x%S>YxceC>yOmWeqEv>3JTHsDzwwf35GOmX1bhODi- z)VuF>WN(~&MNm0Uy7$=3o?bP{_f~Fa8=Mvz%s>D9^`-{Z>#h}j(`^lHvdm_mpZB@X zcX?XFn}4n|FRs)nQ|xP{u$ z9D`-sxu<7xD}^p;`K}C!I-jE>_ghBR0_WlCyM`9^O4Lkauay$Y;Ay&J8(x-G!{B5nGzLXLN_>3+(`jW(ix=7$=!U%CGK zYNzpm+W)`KHZazGH96PDcx=*7-UAH#tEAEoGbEq<1B}yn+uqHpCmVLf{4F}hE*`5B{Ze~Y% zZI;$suKiR0d6ksHWY2J|scSX5x{_S1*17htR{pB|lXdCuxb@|CUzV^Ho^`$5u;ZHL z=28QPn^HUn7*biMoW9H`v0zO@QKc0F^AynlJ%4tzWVRsZfVFzq>AArQxh=rd&fw|l K=d#Wzp$PzGi%doU diff --git a/res/drawable-xxhdpi/ic_setting_read.png b/res/drawable-xxhdpi/ic_setting_read.png new file mode 100644 index 0000000000000000000000000000000000000000..a2dc85f0107d30bc9539a1a8864c6135b9b539e1 GIT binary patch literal 1404 zcmbW1Ydq6?0LFj&8)gn$=q%LQ5ONLW9^=dhx#TiTE`{ZuOq1r)nai?5%_XCYmdxdp zNI4j3rQ}kQ%ZVf`6cSsM<2X6a%k%cUc%J9Y_jz7E=RMpV<&Y{!0Dzpc6VYockNqoz z)RqfNlFR{+{Kc7QM>-R{cs+pS7NYe0V{=i!)MK89x0s7|Zu3@CL%km=;@ByE_!gS5 zSNsG=w02UVFLU2vt$X$J3#4b#sk%hGO4tUbwKS~HBBgF=EM>9RVlzlL{Kjf+vYfj>x!x`<^ZqfmBd+)mFNLa*+yoG|^5@4SMA@A!EQqtX z9Z|0iM59&MU;v3w_$lif6^Z28ZSxPtr85i}X->`M^2}UsUJR&zet==Z;J&iGNX&b? zI5a@!-!gq;^jKODtZ`)S5Z`X24q|+|Ws?d5?N*}Zf6AL#LjvDc(x|i`NTd3DO=Zrx znf8OAzKd6nVq_c0sJz60+18;_5IE$urogb*aKS+JB)@G}fs&d(AI;$LFO0ys=Qx7stK4*#Rl+WHFwoaVcNt78XmYLZoel(z!&gjVdUR#v)lkOUoQwD@CtH>g*;f4 zIeSn%uM?{Hzo)r;rwD2?^kR3C6*z&Gg>lnRh87h`%w@4fbZiDSg@#}^^pK)+r3n; zfBc7og7+lfW*iL3!CUNsjON1V3?P?K5dwR?Y_w z#;fgg4OVLHi^iAzw+pq*0#q9_qG0)|A%Y zUo%vG1hIx|&htce?V@EX$*VU-b+d&LU|^gkgbev4`SLEEz=Xje>*{xD8~WaTyA4F; zsre^OQz@FW2e8x1g2X6cGof_JY8U$W&&Zvb-8w-DZRyTt-`?(J4_Ne_Vf%qs9!YNHbQ$4z2GU(--Ngq21+pO~-2@+$CURw?|of^Q^|skBoi#+7mfsjPU8}qSaj} zv6LXHe;83%iNftypNJ|+y;^B0h6`f)eTI!4vyYoY03&?X(^<}kPd%hK;^ zaxXM71feMYm7dBO380?u5+0JDV>AO}yyy)m*g+dqAQx)wKv9-ChTmhbbPzA)mlW(> z1Fbum4P8kB#&0++$p^7wy5}dY2lPnTs&*US9nLN8>C6YQG#^Jd34n>K%~QY33}~TI zPk`}ASjbVFPf_kVzpfn2cBD`Xa+3VA**(JXhT}4vx;i+!PrO=ysb#2|lOU%EiEO|~ zHF>7*Dut_PWjZUvv?)j>pefj$9r&(H151K0Mr{0?9mx2sO= hhvJL%M*maTfF-zX#@j@rt+rkjI6Jr#@7f>B_y-IqYq9_U literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/ic_setting_read_dark.png b/res/drawable-xxhdpi/ic_setting_read_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..896036b0dea59ee68c21fdbd92aa26989c5ce99c GIT binary patch literal 1550 zcmbtUdorjK*UaQtS{j@+gxUwv3@Nq?k6sG8kdn%0w*1Y+hv;ncB9^<4B$j zWf>&oQAA?I5Md3yyhh%vVLWS1YyaE-_nvd_J?EbD`TTXyz2)R+hmyz00{~DIds~++ zr~gZ&?3Rk|Uo{5+A*9$^yN3JBXM0`La?@yiN@*(%%;4MV?};yb#l_*&f33kT=dbq} zB7AMm$=L`K`R}*5)_9b&-bC&rf7|e5YJ2&o4Q_5SzlvJ|U4Tun$is9gYH! z2et7^_$q*vm9WOea}b>F33ZIVm&sG&*42IW?;G`uru|gzam^rwS9!+p;iz-#k-o*# zaL<;>*K>1o6=|%}D6*HA7xS=o%pv^s=V=F2Ml1XgXBiAefWQB=6>%j5fyGNRi-dJ@ zw73gY=xh@T?hXiZFO*as9I(dKyG~mw+C7-D=$1{~CE=i_%9Jc`9Hch)aB4}fP^|0l zNb9s^T=`2SkYd4P%8VR=hua#q;VL#!-~@A~7{x6pVC3}`WLUr^J{0YpdGqGCjI5i= zL7)xNxm~Ygb8MMK3@dT~76EdBa%5~WWjl<(D{Uk~NLy2X8(<*Zv2Flj?F}4|jgM+! z!*DEG@JJ52@9I913E;Zv2XP=}Mm~Bwi>#Mo0H?cn#|FdDH_!LRgHuI#u>*i5oytJ7 zC`?4d|9DQ;P7)Iq-Oar@97YrZ6KRTLv6nXC&Rt<)VSK!i(Fu?%NNG~KA&0fYR{kB+ zJH7m_si|of6LYtpIQj{B{ZvLA8F*gk>0QG~4MRgiiJ>jB@jm3KX41T2vwk;nBqp^X zLBn@K#kgN66f%r-&_K;j;ia38k5pxd`o41@AW1p-k0on8h+G!jqbu}EI6$e5FwtE1 z{5UkE-E3Jm6SNw~;YFiK06o`QRaLcUtD98HEv zoDd)D?rS@$oqCPiWjgk|p6ygv@q0L%lctF^1=uCV#f^a_o(%G|=*!1v1{qH*^}P$U zV?BGCry?GTC9IUkf3DaA@~m%@;)OE~9`bI;<{syprmWfHle4{#X7#kVIx?(*ED>qr z7L2vh+1aT~rBbCKMT*!gc)Ys8dtRooo;R}qf3j9-(e1ZIwUvR#07Ezj>>us0dfHfvp5ix&Ak;O}8-IdHX)Kr6sBKI)<{A?C$G0J~+WHgSt=FI_ANz?b;|% zA^IEb9iW`!$gzqa;U8ag`ellFWU3`#syLCahyn*F?k+vpppY1`JXR}>uc!dtZYA%z zfixOTwABIjMc31$7DXABn&07tuSsFqMw*{j0*{8Pn~b%HXxq5j5GCJb7{1rhsXQ@J zNC?yI1LASBif@DRC({~5+{?Twm)p`C{gKMZQ+E<&bwLLm$?bzeM*ExM*|cY=Kd7tw zmHm#hcW`Urtd2!IJG8*Lx_>C!S47^qK=ry8vhjrt;yfFCTE=CSA~ItLn&ySwpPD`c z7QKcbh;4L;4h$5fbXe8p3qs8cs>>tG`qp-~{d{gkeWo~PD)V(oYnK^S6tNR^+lYGv zm7gOuA_M6RZ~hLb)R)u%XuY_gnh5K@_huLdA9<4VVF*d~GL2C{vtC99MC}Gag1?Rb bd(h~eVptXvT;6qhYv%#wxT9^U4L$B3a~8 + android:layout_height="fill_parent" + android:saveEnabled="false" /> - - - - - - - - - - diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 773998adf..1b8499249 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -172,11 +172,11 @@ 开页位置 列表 列表模式 - + 列表缩略图列数 预览 预览图列数 - + 热门 显示热门更新时间 EH @@ -191,6 +191,7 @@ 预览图模式 正常预览图 大预览图 + 数据 下载 下载路径 @@ -199,6 +200,11 @@ 大多数图库应用将不会显示下载目录中的图片 收藏 默认收藏夹 + + 阅读 + 显示时间 + 显示电量 + 关于 作者 日志 diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index dcccead6d..ffaea44e5 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -45,27 +45,6 @@ - - - - - - - - diff --git a/res/xml/read_settings.xml b/res/xml/read_settings.xml new file mode 100644 index 000000000..f6fcb02f1 --- /dev/null +++ b/res/xml/read_settings.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml index e87f0949a..30c6e7f43 100644 --- a/res/xml/settings_headers.xml +++ b/res/xml/settings_headers.xml @@ -15,29 +15,35 @@ --> - +
- +
- +
- + +
+
- + android:icon="@drawable/ic_setting_about_dark" /> + \ No newline at end of file diff --git a/src/com/hippo/ehviewer/ui/GalleryActivity.java b/src/com/hippo/ehviewer/ui/GalleryActivity.java index 6556c947f..6edfdf978 100644 --- a/src/com/hippo/ehviewer/ui/GalleryActivity.java +++ b/src/com/hippo/ehviewer/ui/GalleryActivity.java @@ -220,6 +220,12 @@ public class GalleryActivity extends AbsActivity initAnimator(); + // Hide or show + if (!Config.getGShowTime()) + findViewById(R.id.clock).setVisibility(View.GONE); + if (!Config.getGShowBattery()) + findViewById(R.id.battery).setVisibility(View.GONE); + // Set listener mGalleryView.setGalleryViewListener(this); mPageSeeker.setOnSeekBarChangeListener(this); @@ -305,6 +311,10 @@ public class GalleryActivity extends AbsActivity } public void updateSeekBubble(int progress, int max, int thumbOffset) { + if (max == 0) + // Avoid divide by zero + return; + thumbOffset = thumbOffset + Ui.dp2pix(12); int x = (mainView.getWidth() - 2 * thumbOffset) * progress / max + thumbOffset; mSeekerBubble.setX(x); diff --git a/src/com/hippo/ehviewer/ui/SettingsActivity.java b/src/com/hippo/ehviewer/ui/SettingsActivity.java index 48b907a33..668a986e6 100644 --- a/src/com/hippo/ehviewer/ui/SettingsActivity.java +++ b/src/com/hippo/ehviewer/ui/SettingsActivity.java @@ -136,6 +136,7 @@ public class SettingsActivity extends AbsPreferenceActivity { DisplayFragment.class.getName(), EhFragment.class.getName(), DataFragment.class.getName(), + ReadFragment.class.getName(), AboutFragment.class.getName() }; @@ -143,7 +144,8 @@ public class SettingsActivity extends AbsPreferenceActivity { R.drawable.ic_setting_display, R.drawable.ic_action_panda, R.drawable.ic_setting_data, - R.drawable.ic_action_info + R.drawable.ic_setting_read, + R.drawable.ic_setting_about }; @Override @@ -584,6 +586,29 @@ public class SettingsActivity extends AbsPreferenceActivity { } } + public static class ReadFragment extends TranslucentPreferenceFragment + implements Preference.OnPreferenceChangeListener, + Preference.OnPreferenceClickListener { + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + addPreferencesFromResource(R.xml.read_settings); + } + + @Override + public boolean onPreferenceClick(Preference preference) { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + // TODO Auto-generated method stub + return false; + } + } + public static class AboutFragment extends TranslucentPreferenceFragment implements Preference.OnPreferenceClickListener, Preference.OnPreferenceChangeListener { diff --git a/src/com/hippo/ehviewer/util/Config.java b/src/com/hippo/ehviewer/util/Config.java index 311cc50bd..a12aafb14 100644 --- a/src/com/hippo/ehviewer/util/Config.java +++ b/src/com/hippo/ehviewer/util/Config.java @@ -38,10 +38,6 @@ public class Config { private static final String KEY_SCREEN_ORIENTATION = "screen_orientation"; private static final String DEFAULT_SCREEN_ORIENTATION = "0"; - private static final String KEY_PAGE_SCALING = "page_scaling"; - private static final String DEFAULT_PAGE_SCALING = "3"; - private static final String KEY_START_POSITION = "start_position"; - private static final String DEFAULT_START_POSITION = "1"; private static final String KEY_CACHE_SIZE = "cache_size"; private static final String DEFAULT_CACHE_SIZE = "25"; @@ -174,30 +170,6 @@ public class Config { } } - public static int getPageScalingMode() { - int pageScalingMode = 3; - try { - pageScalingMode = Integer.parseInt(mConfigPre.getString( - KEY_PAGE_SCALING, DEFAULT_PAGE_SCALING)); - } catch (Exception e) { - mConfigPre.edit().putString(KEY_PAGE_SCALING, DEFAULT_PAGE_SCALING) - .apply(); - } - return pageScalingMode; - } - - public static int getStartPosition() { - int startPosition = 1; - try { - startPosition = Integer.parseInt(mConfigPre.getString( - KEY_START_POSITION, DEFAULT_START_POSITION)); - } catch (Exception e) { - mConfigPre.edit().putString(KEY_START_POSITION, DEFAULT_START_POSITION) - .apply(); - } - return startPosition; - } - public static int getScreenOriMode() { int screenOriMode = 0; try { @@ -400,8 +372,6 @@ public class Config { mConfigPre.edit().putBoolean(KEY_GALLERY_FIRST, galleryFirst).apply(); } - - /****** Mode an API Mode ******/ private static final String KEY_MODE = "mode"; @@ -517,4 +487,47 @@ public class Config { public static int getPreviewPerRow() { return Integer.parseInt(mConfigPre.getString(KEY_PREVIEW_PER_ROW, DEFAULT_PREVIEW_PER_ROW)); } + + /****** Read ******/ + + private static final String KEY_PAGE_SCALING = "page_scaling"; + private static final String DEFAULT_PAGE_SCALING = "3"; + private static final String KEY_START_POSITION = "start_position"; + private static final String DEFAULT_START_POSITION = "1"; + private static final String KEY_GALLERY_SHOW_TIME = "gallery_show_clock"; + private static final boolean DEFAULT_GALLERY_SHOW_TIME = true; + private static final String KEY_GALLERY_SHOW_BATTERY = "gallery_show_battery"; + private static final boolean DEFAULT_GALLERY_SHOW_BATTERY = true; + + public static int getPageScalingMode() { + int pageScalingMode = 3; + try { + pageScalingMode = Integer.parseInt(mConfigPre.getString( + KEY_PAGE_SCALING, DEFAULT_PAGE_SCALING)); + } catch (Exception e) { + mConfigPre.edit().putString(KEY_PAGE_SCALING, DEFAULT_PAGE_SCALING) + .apply(); + } + return pageScalingMode; + } + + public static int getStartPosition() { + int startPosition = 1; + try { + startPosition = Integer.parseInt(mConfigPre.getString( + KEY_START_POSITION, DEFAULT_START_POSITION)); + } catch (Exception e) { + mConfigPre.edit().putString(KEY_START_POSITION, DEFAULT_START_POSITION) + .apply(); + } + return startPosition; + } + + public static boolean getGShowTime() { + return mConfigPre.getBoolean(KEY_GALLERY_SHOW_TIME, DEFAULT_GALLERY_SHOW_TIME); + } + + public static boolean getGShowBattery() { + return mConfigPre.getBoolean(KEY_GALLERY_SHOW_BATTERY, DEFAULT_GALLERY_SHOW_BATTERY); + } }