From e492a3a146014fdd372718f5836013f2cf56063c Mon Sep 17 00:00:00 2001 From: Ivan Murashov Date: Mon, 11 Sep 2017 15:18:01 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=B2=D0=B5=D1=80=D1=81=D1=82=D0=BA=D1=83=20=D1=81?= =?UTF-8?q?=D1=82=D1=80=D0=B5=D0=BB=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/settings_arrow.png | Bin 2043 -> 1882 bytes lib/screens/settings.dart | 12 ++++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/assets/settings_arrow.png b/assets/settings_arrow.png index 7b3efe87e170346db67d807363d0bdcf5c2f640d..a68e66cd77e45d5a5ead2c4c2c25fa88ed9119d1 100644 GIT binary patch literal 1882 zcmc(g`#%%rt&oGVTz52kb({{wSWP^#E!IzfN3$~%Z1&J) zIcGl8WOa*>zwUp?w5<942Aw6g&bcked2w#j5eZ*)oNax9f&cU~vO zHKSA!QrtN=EA3eCTH_`C%zN?qCye$-1h!x5dJF;D_o09in9(3vUf7ERBt6KC{7=aL zvT(w}Po_=z<7utCtVPGlUQNScxSCO7-^UdsRLBCdmsX)(pRot^b}50C8yhd&3*^?I z1Zuk>zEkQQaXPY&6?>IJSk+_La>~pz+ZJHLjiYOnw_&J7uD{^u19Q#O@L$w$zYhia znQ=LoiH_}4(E%ADHF;R6RmWoT%R1#;F}cJtvkk33p}S<3R6nle{#@7p<0w@4N<*dz zUeF5O4S<+PNxoS@RererKF=6xQ!NZ={FG)m1{G>)7p+sWfktyg<*?2#PyRmG=>V{% z{g8Sn<9%TIE%xJ(O9{piL})j>!K!AN@;6BZi1PiGqyMT^X56HW;bVB)A@588<7{yI zW6r9w%}6A`>h$*ZX12GtulosAKPaw-3A1F|N{hk~~+x0-x%Jkshu~_gmd)y7=BA@jB%0AE+QTe*p zBS#&H1g)vZwPi36IGM#y?^mVTNoMC|7)WkZg}>lO_vel553lk0b`2*4*FRl3r+YJ@ z91J=-SNfW55J{fhu1)iMheggX9P04n4jry{>b8n|VGq3nT;h|*AsEDjEs{BIQ zFF*dU$|?YS%4TpLCLuw!Lk6}kzMK#_8dn=FRtr-DA;H(K$$PF=f71pfF&&7I7$ zk!uA$j=nb=-!woQaX^7im2r3cx(eu@vB-UOu@Dve#wv8M`osf3@)?Y%Q~~3OAYssI z?VV9}{{G9sKj_-6N;Lrx))T)!r#B87F@4v3L|GbRW=Wogi6Cmaw_5o#b=1_?-6;Ig z)w_9YiM33ANe%Z@oC`BRLxfK`Lr;gk-|D|nT*mE^Kt#>W2Z&WsL%%`YM4?>oXmxdU zr-ekhDl`L$Yq{_`ZcZD>vVy03Ws4{?z5sUG!y`yCPrbjhXx#^tdqoOdif9>NP<2cU z?V{P69y=>I=SKge*gthGN)JLvJCmL&LDvq56?4Hp={(OcANB?9ix7r@cH`_66S|bs zFBA%&sp%YDpGR=C8(DA+XVScN`q2Irz1VhyQSF0}Au^lWbqR@b6}z%ntcu3?%wT!= zmz#nW%07=T-_2DT>~VEObcwGS9|$K)TilvPMOotRbaWJ2Xv`;S6)H;GT&p%MQ(M&) z8l)@ysyLoG8Yswu>X@Q+45Yld?v2HnwTgQ+2ijix|D{!*I}57hEs7u;D%t7HtII8E z9ZxJ*lB1P|3M9?SNXnVSYF@}t=v6Md-9UKGk*+!8IAE-|#Q-9EW@E^&TF5TPd%L2Q>w!xJiYnFg**GELNuy-^0n(?=y$gU0zqkdo4%_ z(|pt23-(L}WwD|&spmJjmuZ27(7UYsoOU0Q%a@Q3_h+~p*^4LT&L@WlpA6Mk!)<% zc}Ly^F6oaS0r^IRv_#b6ad6(+OUI9XhmvlhJ}-fhW|fLh74$@d@>;KDrbSy$hU(bc zT}lu@xI38;RN!q#-b^J0nK^lFz!gNsuj79n_TWEg4MPCJGe=0_#yTzBakFR(2Aejh lzy)paN2o-)^Z$#9O>`y7i~p8ujND=-Ah>$sOaDVk{s)57P6_}3 literal 2043 zcmcIl`#;nBAAf(gVa9A>=|~Ytrna4A8HQU3nq)ta zT-k^tQcm6MwaJykV^fjj_B%_SS2RiPvMugEet8Qen8<}}4uATBIHsP@S?CxUIwtqT$4KB~M{M{BFjV4z4j>)nU0m^i5I~F~ zVNT$AK;#dJC!FN4Al*o08B+*gfFqZFjfkTGMj4PU=EIPn1IO4Y^a2p?39O^(Pt^Zl z;)xSj{GLHCxY+Ni|1M+A@7zik=(%{F@ia+J8}@j+NIK&c6w!<)os}TKHE#4nY;!Ci z?bv&1ITz%=d+osffyp*PSuFvrh1p`Fe8pF2#FxAgGkyqr+}>2*9Pbf->VZ8x{E>mh z{+$m4Kqg^EyH}N(=5s$4mCm&c988fDSQy_`rfEY5!~Df}Fe_TTlbeZYAiM&Wf)J#x znk<_jJLUf(EdPG|npb=*e(ND{-F`=V@K@Tz{f$;xvJvDS{j_l62%MG8);t8N_5Kar zI10}Gc;R}_9r#C2!0RzpDmIoWo1@;<;_WbTO^}NJyeEYy1)gyB<7iCXg4XvLBnPb)%Ra`u4;y% zDaJQ6w6$u)LJh{F>$|I04cWIml9cgb!I_mnP;D;R;oR�$De9?1=C#WE2(`!^z;L zcf9|nHT+HmZjf25H!~#X<6Sn-Qy88pBl@4At!@@ zOqYwZo#PdCCQiVS6Q2Ul|8|byqj(qos6Xutvlg(B%PC9N*foEsPE*W++?4tZ*;ghm zy)g+zZ?9pyrf1#RY*EdwPnp?V%;B;VY>_(pP;m`Yd(df>%GNf}QmIbOkn2Eq#4f2X%{0deCFyxZsM5)lWe4wUD3-=o}u&UJx_R{wC zkOfIeea=mE>(ARBXNruz54;;0Dd}E(W#STN4;L_JI)aY{AxHHJ`X3LXY<|(3{`sCG z>y9NbZ%v8S+9E?RmRLOrrI*{Io%h73F~t}sTjPD8{x@0VTqLBA z-1{Yab5?|mZYoE z!Ggxuqe=JVfYE6r8w;aFy*t)h1sGS+6KHFIbd5IRZUrTec0Hpb|G#1H**If7zi7ly Ree { Widget getScreenContent() { return menuItems == null ? getBackground() - : new ListView(children: getSettings()); + : new Container( + margin: new EdgeInsets.only(top: 16.0), + child: new ListView(children: getSettings())); } @override @@ -59,10 +61,11 @@ class _SettingsState extends BaseState { Widget getSettingsItem(MenuItem item) { return new Container( height: 56.0, + padding: new EdgeInsets.only(left: 8.0), child: (new FlatButton(onPressed: () => onPressed(menuItems.indexOf(item)), child: new Row(children: [ - new Expanded(child: new Container(child: new Text(item.title))), - new Text(item.selectedValue), + new Expanded(child: new Text(item.title, style: new TextStyle(fontWeight: FontWeight.w600, color: faqGrey, fontSize: 14.0))), + new Text(item.selectedValue, style: new TextStyle(fontWeight: FontWeight.w400, color: faqGrey, fontSize: 14.0)), getArrow()])))); } @@ -74,7 +77,8 @@ class _SettingsState extends BaseState { } Widget getArrow() { - return new Image.asset(settings_arrow_png); + return new Container(margin: new EdgeInsets.only(left: 8.0), + child: new Image.asset(settings_arrow_png, height: 42.0)); } @override