From 41fd167ab626e280860b341f61ae5a53629882a5 Mon Sep 17 00:00:00 2001 From: Ivan Murashov Date: Mon, 21 May 2018 23:59:29 +0300 Subject: [PATCH] Fixes on adnroid and ios --- .../UserInterfaceState.xcuserstate | Bin 37785 -> 41224 bytes .../more.imageset/Contents.json | 23 ++++++++++++++++++ .../Assets.xcassets/more.imageset/more.png | Bin 0 -> 617 bytes .../Assets.xcassets/more.imageset/more@2x.png | Bin 0 -> 1895 bytes .../Assets.xcassets/more.imageset/more@3x.png | Bin 0 -> 1256 bytes lib/base/base_state.dart | 2 +- lib/db.dart | 2 +- lib/screens/faq.dart | 22 +++++++---------- lib/screens/purchase.dart | 8 +++--- lib/screens/purchase_success.dart | 12 +++++---- lib/screens/splash.dart | 2 +- 11 files changed, 46 insertions(+), 25 deletions(-) create mode 100644 ios/Runner/Assets.xcassets/more.imageset/Contents.json create mode 100644 ios/Runner/Assets.xcassets/more.imageset/more.png create mode 100644 ios/Runner/Assets.xcassets/more.imageset/more@2x.png create mode 100644 ios/Runner/Assets.xcassets/more.imageset/more@3x.png diff --git a/ios/Runner.xcworkspace/xcuserdata/kifio.xcuserdatad/UserInterfaceState.xcuserstate b/ios/Runner.xcworkspace/xcuserdata/kifio.xcuserdatad/UserInterfaceState.xcuserstate index efdfb5d3b7ff85f50429e3304ef169aab44b72ca..118229ec9ab8ac6c0abc33aa4aecb93c89a736f6 100644 GIT binary patch delta 16528 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 Xo>Z>6B_V^b`&-!A{r&FmB<24DAen^{ delta 14697 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 diff --git a/ios/Runner/Assets.xcassets/more.imageset/Contents.json b/ios/Runner/Assets.xcassets/more.imageset/Contents.json new file mode 100644 index 0000000..e5fe489 --- /dev/null +++ b/ios/Runner/Assets.xcassets/more.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "filename" : "more.png", + "scale" : "1x" + }, + { + "idiom" : "iphone", + "filename" : "more@2x.png", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "filename" : "more@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ios/Runner/Assets.xcassets/more.imageset/more.png b/ios/Runner/Assets.xcassets/more.imageset/more.png new file mode 100644 index 0000000000000000000000000000000000000000..4bd79cdc7bf8fc90efee74ff3f8a1f2d9928b3fb GIT binary patch literal 617 zcmV-v0+#)WP)Yg|8frih@GABAEg*a;S5r9~|L3leZfh?RfADufvc*jm~Ng4mcsOe+LL zP(-YvP4;duW@UGd%&rL;o!J@oT-XF=>U-{ac+Z(T?>%F1^@MT?y6Zq=xTPR8n`c-$ z@!drV<6;v6`xe9X+`UBJ6Z==SdGw&c<~$}@9t$EoB=#0Huns_NA49VQVnE~_nl5N) zr4m5osYFo)4*_e?Y@J*v`VqJ^zWnly$Uj@DMG6+_LGMbF)7{^@=jZ>464u%+R!o1o zplSAda*US!0p@rHM%c!-XL)9RY9P~Cy`p;w<~PnU)0jgr4CE!t{ueFaPP|)CS5!Is z)S#}#trgwBiiY+D!W`!BNs{_eBd>}4+b*Epls@cifbk1}Hi^8p7FG|MDhYQ=KA|f_ z{!I<69yGAYZn=v{(l&^_(G_LFM-N)tJl8hw;FP}e3e2sN)_X_f<=;{(_N=}~(?p@| z0w;5Gifj@4S^HNJZtpTTphMWs8^qkm9{8+km8@;v1XZmR;;!_S(oMdo2Ay2H{7AQo z?)%H#f*hsaP3NHhoTc)Mo;S-=v!zv7ujpt1(SyQ?Uc!3&Fwf0E1FHuO><0{&OCY`y zdFQ7KTH8F=Ht)bF8dMsMCq!P^_&>tCk(_5lr+#%4+65l{Tb(|wsnesmSMR^Uh1 zi2W-X$TU{3=nlcc_67RAPnjQLGp&m(9{H?=OymCmO^m54Z>K}#00000NkvXXu0mjf DKxHJ9 literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/more.imageset/more@2x.png b/ios/Runner/Assets.xcassets/more.imageset/more@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0f314bb1fa8f2f65e055e414997be36cd216d1c7 GIT binary patch literal 1895 zcmV-t2blPYP)PcQ$;ck(#2mluChqfZzcMM0n^+sh|&rlopXt8WgWLA`)s54}6He z(DGI7*lt~DfshC={g6;WDk`9~4^fLs3xqb2=*LTdIEi<5ZH%4WIn}svWd$$EoxPK} zmFB+sp8uZnyJu#0uFpLyxHvXz4?W?9c)A{ytAWoToCzF4`3HEv!Ha&!yZ)O@%7SYl zh-(h9W#$VMTR#A~6s3%?vX4rL=$}!(OHh8zr8wMydXE-46kdgTPawM50MZl@8#z*X zi3vGkV3*odcc50oZvYd(K!RxJQK=A=9!p?r-NX&3!{KM~t#rM=cE z846|(b>lxzVQ|$SKrS})eWmGpDVDy>!!l<GOCaO`)W+k8-ju-iPB+!(sFjE8>6t5K54AeI5%nHLD44syf`vv~ z30BptXeAVJ0BZ9ri1q+yC5&O2na7hk7iKX0u8i#PD7P+9Y0nt&A(($8;fqGTm8hnCRrFH!ICufFRP?uu9ZMsZL zZU?y%^ju^S@TtIuC=KA>i0-1r{fw8VPY$XR{}eZ&F8RMvPhoIokR$WG^mzs5qc%N# z3%pmKVe*ri?wNiZVz;55cyc&3Gl!bOa^z5Rs3{OgK{C(O9BK*#Qjp9uHHVr4ffOY3 zOwFODKp+K4H#2qf{(gGsVVy*-CQY`%>>%z39 zwQ&dPNOKs`M?iZLBu+%6cQRVOKY^`v6E~nPUh?|9VTK+HqfX>q!|32H>y!)yvxgc# zl=}ML2Kkhs?<-9|OkZg&56G+qt;7=9LmjCPA>NLJm;DNX%O+~2#}gB=VCVqUa1_{L zuRfJ034DtcFXogTfLebY5qtHd${qs$0&^7hEF6FuzK?LWy^uIa&9_kPlH8;0p;p7Z zJ~jFJb+D|42kg{Q{ZIc8H9tObnb~k4Q|o^L`JzPvZ&UN_)w?Ee%mJv4AA{bS!1qoj zJE-~JvZ!Y)l|9sv`t^uB1r&|FU&$cS?=V_^)QVO@k?f&v)_(dL?*Jx;d^?1zAJF#C zVN7Nc@~~o-J=8di;pTb@(Jz5=7g056>kwn*-*%y4#ncU`aVXXBHsHZ7>QnC`@Z)X6 z%!fNrx9O=Ygj?|>F8npg*apf2gmVwEeRZZADNC#A4%8)&D$OhKqFg&HS#|odY@4 z?)a@}okPu`ra&MC$vjhYs3{OgK{C(O9BK*#Qjp9uHHVr4ffOX&&eZs<>gVXCb+ACO z;L&PF6whq4j|G>`q8__0ZbGeU2@QuA>r+L~M`aa4Kg0)onFiU1M7x+T*O(9|PENbK zp>mIU9GJNluN^m3h>LuWGZs5he4D8ko@Mg7_VH$)tiQXHslx{bDD>TjatmVA?lay) zeUihiJJ@kXe8M{O;SSVFco!abC*Jvw^oNZ4-^)8wEalXe#hY6)lf{pGhMK>@qMor-_L*9(zX@Wqo^&rY|MSKqEE+ffHJpOQA4aeQZ!-*^BU6aii`F zQ3g7HE6`bxztQTcGTy&C4LC_P-GdrOQq?|aUJCJV{PC6l_E3$xRme0N_fF*{@Lq<2 h-PFX1>|DM8{{aYH^JOi(Z4dwe002ovPDHLkV1h;So|pgt literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/more.imageset/more@3x.png b/ios/Runner/Assets.xcassets/more.imageset/more@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..90a0ca1370bf7ef1e696dadc855af50bc70d98a1 GIT binary patch literal 1256 zcma*nX;4#F6ae7+l9%K`AOzWE3rGb-7Ny!^6dn*(6{x8qh$bopEKrz80S)LQl(iyZ zFDfNi8L6nGtu}xVSxgLKL)0=7K#>xR)&i|5#jt2YJN@4u=boAK!H z*XjcR48uYhdvqCF4TPvW`+W}&0syy#G5kNyJ~Y$dmt^X1D!mXw4-YKSw?bx!JXJYC}j<0xhY4SKXtA(=fx5o5l-C&|B?Y2wU$~uaDVn>){=Pc zS7nTN;nYGx=JReVQZ4JzTmh>Ss6Bh9oGzS)msN#1B4o~D@^`(b-Cvx~E~{PoiM=-Q zkZPu}YCo%+RPKh+EiXUz?4KkAOJ}DZo1`EusP`i@OtGMa&;RRR8vfbQwz9+3BrMGJyPEbETVuVS{nd$2^7(MoS z!wPPB(R8%Pw{~of&HaIZzEPLI)kcXm-p*RW)ft~u*EJ&$`{@1C%-E54kL|q;NZlox zeb3=ckd%@5EM4RY4NpO%H(!doUisa=Lj;q|wAA_Jx5`sjYF6}v@1Bi$!?*$UT$3}i zvvv%Z6^zpTzPvkcU9f1$D{3`D_fG~caF-n;WA-f!qBH5k(FVHWH(X>U~Q3v7Kl(R4Y!NmqMtf~=O;rqs31cAYNDT#1XDnoQZ7 z3(h?m0%wh6T`a|w21~`QohPnAVA~*O?I~G1(D24Cc3x&HRmqoLW56Xo0g964G;hD^ zAmCfI+C%T_Ig!xDJQYZCD7FFagep8$mF(^E0X*CY6JL%}){|(m=zvfUB!z*|4!Ryz z0azQZzq_y}0+wBJbKkCq{@LJ+@1HuU|yS zBVjGZ6>SyZnMP|a!J&YE0E-hlVt^(B9XUY&LO+8z+EReS#&N3GW)KWI2(oE690E9G z{$Mmr1uAn|-H-`XO$|6ly;$w_u-fa11$9fi(gv5oLaQ}_>$srB%V|{m7l=BxzfzM5 z34T$;tH*HY^yD4z0xOP_i%g&lhQTJV&1r*3lga?LCLt7zQmX4eL{f|G5C`M1A@u=M^8YkxLuf$ej(V_+|3&qUgrfqGV*$l``a+p~I-8%LB^*aq zAD0`I{RRp8_(|$9JlcFXOfDi|rGZrqX=G4SWP%sq9XUP|5wOB|lMamEGAY#A67JgjS&(@TXNM1vBT#AjKZ9RfDbh zoWQ7+p&r`7vEF~?1{omal_AtiZttD3!Dy_orUB|m38>F#E^zi|8(|yQybxn9)D)c1 x$65E`TWq!kwyV7~FpJUS3+i)fiqgn^EW=BR#+I*K#&sJEgat(~t_QGre*^u_7PtTa literal 0 HcmV?d00001 diff --git a/lib/base/base_state.dart b/lib/base/base_state.dart index a3ab40f..be78f8a 100644 --- a/lib/base/base_state.dart +++ b/lib/base/base_state.dart @@ -67,7 +67,7 @@ abstract class BaseState extends State { List getMenuButtons() { - List menuItemList = []; + List> menuItemList = []; menuItemList.add(new PopupMenuItem( value: 0, child: getMenuItem(settings_png, StringsLocalization.settings()) diff --git a/lib/db.dart b/lib/db.dart index 66711c7..97e2d20 100644 --- a/lib/db.dart +++ b/lib/db.dart @@ -53,7 +53,7 @@ class SqliteHelper { /// необходимые для идентификации пользователя и проведения запросов. Future createSession(String merchantID, String posID, String token) async { - Map session = { + Map session = { columnMerchantID: merchantID, columnPosID: posID, columnToken: token, diff --git a/lib/screens/faq.dart b/lib/screens/faq.dart index ff821aa..94e5612 100644 --- a/lib/screens/faq.dart +++ b/lib/screens/faq.dart @@ -87,13 +87,6 @@ class FAQScreenState extends BaseState { return null; } - @override - void initState() { - initPhoneAndUrl().then((_) { - super.initState(); - }); - } - @override Widget build(BuildContext context) { return new Scaffold(appBar: getAppBar(), body: getScreenContent()); } @@ -104,12 +97,14 @@ class FAQScreenState extends BaseState { } void initHelp(String phone, String url) { - data = [ - new Entry(StringsLocalization.registration(), StringsLocalization.registrationGuide()), - new Entry(StringsLocalization.usage(), StringsLocalization.usageGuide()), - new Entry(StringsLocalization.support(), StringsLocalization.supportGuide(phone, url)), - new Entry(StringsLocalization.common(), StringsLocalization.commonGuide()) - ]; + setState(() { + data = [ + new Entry(StringsLocalization.registration(), StringsLocalization.registrationGuide()), + new Entry(StringsLocalization.usage(), StringsLocalization.usageGuide()), + new Entry(StringsLocalization.support(), StringsLocalization.supportGuide(phone, url)), + new Entry(StringsLocalization.common(), StringsLocalization.commonGuide()) + ]; + }); } @override List getMenuButtons() { @@ -119,6 +114,7 @@ class FAQScreenState extends BaseState { /// Метод возвращает ListView с блоками faq. @override Widget getScreenContent() { if (data == null) { + initPhoneAndUrl(); return getBackground(); } else { return new ListView.builder( diff --git a/lib/screens/purchase.dart b/lib/screens/purchase.dart index 5dc4190..afdf6b8 100644 --- a/lib/screens/purchase.dart +++ b/lib/screens/purchase.dart @@ -62,7 +62,7 @@ class PurchaseScreenState extends BaseState { String loyalityType = ''; String loyalty = ''; String bonus = ''; - List coupons = []; + List coupons = []; ListView listView; @override @@ -388,7 +388,7 @@ class PurchaseScreenState extends BaseState { setState(() { loading = false; }); - List errors = purchase['errors']; + List errors = purchase['errors']; purchaseInProgress = false; apiErrorAlert(errors[0]); } else { @@ -424,7 +424,7 @@ class PurchaseScreenState extends BaseState { } void setBonuses(Map bonuses, bool showBonus) { - print('kifio ' + this.loyalityType); + print('loyalityType ' + this.loyalityType); if (bonuses['type'] == 'amount') { this.loyalty = '${user['discount']}%'; } else { @@ -436,7 +436,7 @@ class PurchaseScreenState extends BaseState { if (showBonus && (this.loyalityType == 'bonus')) { this.bonus = '${user['bonus']}'; } - print('kifio ' + this.loyalty); + print('loyalty ' + this.loyalty); print('bonus ' + this.bonus); } diff --git a/lib/screens/purchase_success.dart b/lib/screens/purchase_success.dart index 3e0f7c4..16ff417 100644 --- a/lib/screens/purchase_success.dart +++ b/lib/screens/purchase_success.dart @@ -15,7 +15,7 @@ class PurchaseSuccessScreen extends StatefulWidget { final String app; final SqliteHelper helper; final Map details; - final List coupons; + final List coupons; @override State createState() => new PurchaseSuccessScreenState(val, name, helper, app, details, coupons); @@ -25,7 +25,7 @@ class PurchaseSuccessScreenState extends BaseState { PurchaseSuccessScreenState( String sum, String username, SqliteHelper helper, - String app, Map details, List coupons + String app, Map details, List coupons ) : super(helper, app) { this.sum = sum; this.username = username; @@ -35,7 +35,7 @@ class PurchaseSuccessScreenState extends BaseState { String sum, username; Map details; - List coupons; + List coupons; int bonusPlus = 0; int bonusMinus = 0; int currency; @@ -56,8 +56,10 @@ class PurchaseSuccessScreenState extends BaseState { void initState() { helper.getCurrency().then((currency) { helper.getToken().then((token) { - this.currency = currency; - this.token = token; + setState(() { + this.currency = currency; + this.token = token; + }); }); }); super.initState(); diff --git a/lib/screens/splash.dart b/lib/screens/splash.dart index a099884..bc43efd 100644 --- a/lib/screens/splash.dart +++ b/lib/screens/splash.dart @@ -201,7 +201,7 @@ class _SplashScreenState extends BaseState { if (userResponse != null) { print('I have user in method handler!'); - List users = JSON.decode(userResponse.body); + List users = JSON.decode(userResponse.body); if (users.length > 0) { return users[0]; } else {