From db75d2b35f962e663ca96db0fb3a57b50a4cf21f Mon Sep 17 00:00:00 2001 From: Ivan Murashov Date: Tue, 13 Feb 2018 01:06:03 +0300 Subject: [PATCH] issue 10730 --- android/app/src/main/AndroidManifest.xml | 4 +- .../checker/AbstractScannerActivity.java | 5 +- assets/values-en/strings.xml | 12 +-- assets/values-es/strings.xml | 12 +-- assets/values-ru/strings.xml | 4 +- assets/values-ua/strings.xml | 2 +- .../UserInterfaceState.xcuserstate | Bin 30183 -> 30730 bytes .../WorkspaceSettings.xcsettings | 8 ++ lib/common.dart | 84 ++++++------------ lib/resources.dart | 1 - lib/screens/purchase.dart | 6 +- 11 files changed, 60 insertions(+), 78 deletions(-) create mode 100644 ios/Runner.xcodeproj/project.xcworkspace/xcuserdata/kifio.xcuserdatad/WorkspaceSettings.xcsettings diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index b6654cc..a3a4e58 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="6" + android:versionName="1.1.8"> "Identifier %s is not found" Enter the card number Phone 79XXXXXXXXX - You can use manual input or call the number:\n%s + You can use manual input or call the number:%s Store ID Identifier %s is not found The application is activated @@ -74,11 +74,11 @@ Store log in screen is the first thing you will see after starting the applicati Enter the store number (ID). You can look it up in the loyalty program control panel. If you do not have access to the control panel, ask the administrator. -Click the ""Login"" button. +Click the "Login" button. Please wait while the administrator activates your request. You can refresh your store activation status by pressing the "Update activation status" button. -After the administrator activates your request, click the ""Complete activation"" button. The application is ready to use. +After the administrator activates your request, click the "Complete activation" button. The application is ready to use. If you want to log in as another store, click the Menu button (upper right corner of the screen) and select "Exit". @@ -92,11 +92,11 @@ If the scan is successful, the customer's information will appear on the screen. Step 2: -Enter the purchase amount and click the ""Create a purchase"" button. +Enter the purchase amount and click the "Create a purchase" button. -In a pop-up window press ""YES"" to confirm the amount and allot the points to a customer. +In a pop-up window press "YES" to confirm the amount and allot the points to a customer. -If you want to correct the amount, press ""NO"" and you will return back to the purchase screen where you can adjust the amount. +If you want to correct the amount, press "NO" and you will return back to the purchase screen where you can adjust the amount. diff --git a/assets/values-es/strings.xml b/assets/values-es/strings.xml index 0b4900f..689269b 100644 --- a/assets/values-es/strings.xml +++ b/assets/values-es/strings.xml @@ -64,12 +64,12 @@ Store log in screen is the first thing you will see after starting the applicati Enter the store number (DIN). You can look it up in the loyalty program control panel. If you do not have access to the control panel, ask the administrator. -Click the ""Login"" button. +Click the "Login" button. Please wait while the administrator activates your request. You can refresh your store activation -status by pressing the ""Update activation status"" button. +status by pressing the "Update activation status" button. -After the administrator activates your request, click the ""Complete activation"" button. The +After the administrator activates your request, click the "Complete activation" button. The application is ready to use. If you want to log in as another store, click the Menu button (upper right corner of the screen) @@ -84,11 +84,11 @@ If the scan is successful, the customer's information will appear on the screen. Step 2: -Enter the purchase amount and click the ""Create a purchase"" button. +Enter the purchase amount and click the "Create a purchase" button. -In a pop-up window press ""YES"" to confirm the amount and allot the points to a customer. +In a pop-up window press "YES" to confirm the amount and allot the points to a customer. -If you want to correct the amount, press ""NO"" and you will return back to the purchase screen +If you want to correct the amount, press "NO" and you will return back to the purchase screen where you can adjust the amount. diff --git a/assets/values-ru/strings.xml b/assets/values-ru/strings.xml index 39182dc..055e639 100644 --- a/assets/values-ru/strings.xml +++ b/assets/values-ru/strings.xml @@ -79,7 +79,7 @@ После подтверждения запроса на активацию программы Партнером/менеджером кликните по кнопке «Завершить регистрацию», приложение готово к использованию. -При желании изменить ID магазина, необходимо нажать на кнопку Меню (верхний правый угол экрана) и выбрать "Выход". +При желании изменить ID магазина, необходимо нажать на кнопку Меню (верхний правый угол экрана) и выбрать «Выход». @@ -93,7 +93,7 @@ Введите сумму покупки данного покупателя и нажмите на кнопку «Проведение покупки». -Во всплывающем окне нажмите ""ДА"", для подтверждения суммы покупки +Во всплывающем окне нажмите «ДА», для подтверждения суммы покупки Если вы хотите поправить сумму, нажмите «НЕТ» и Вы вернетесь на экран покупки и сможете её скорректировать. diff --git a/assets/values-ua/strings.xml b/assets/values-ua/strings.xml index b1509d0..ecd0935 100644 --- a/assets/values-ua/strings.xml +++ b/assets/values-ua/strings.xml @@ -8,7 +8,7 @@ "Ідентифікатор %s не знайден Введіть штрихкод вручну Телефон 79XXXXXXXXX - Можете скористатися ручним введенням або зателефонувати на номер:\n%s + Можете скористатися ручним введенням або зателефонувати на номер:%s ID магазину Ідентифікатор %s не знайден Додаток активований diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcuserdata/kifio.xcuserdatad/UserInterfaceState.xcuserstate b/ios/Runner.xcodeproj/project.xcworkspace/xcuserdata/kifio.xcuserdatad/UserInterfaceState.xcuserstate index 133e97ac2f97d0acef9eefe51cafd634c6f1c0ef..9c19406c7abe2a3881b1a3418090fd0b4f97b25e 100644 GIT binary patch delta 14281 zcma)i2Yi!N)c14meMV=Rv}x0Hq)oafdz4*hIv8o2bf#(3tfqwyY|9cP_aX>_2pR+d z1==zM5m1JUEh2)*6h%cqmJDSGhzj`Kq?GaM_kJJcmpr-aoO|v$|1<7$=_;6c1I!IV zZwYTZQ&Z!R1eU%wq?5zM*qLgko@r#7m~qT_W)kxPLzpSdOU!g;7V`=-mwAnOgPG5~ z!>nf3Fz+&JnfI7=%z9=6^AYng^9i$!*~#o;_As9_dzmko{mhTdDds2UG;@YI%lyoo zW6m=dn2XGB%ys4#^E==G4+P)=Jb@SR20p;o0Yo4O$Urbi1W6znq<~b=33LWsKv&QW zbO-%Fe=q>#fqb9^I#2)#K@lhhMokh2gZX5;CV0wya=X(XVt-(5lDk_Q69=iTBJjI~eMmyOLeSzQe9#*Rz}0?d%TrOLjl|9ea}fp8bLS zkv+x!%KpYWuCq7To9r$2clJ;AFOJ~==gE0-Vou5ha-p1(i{nzbRIVr2i|fs0aB41- z%i^-R9BwFA#FcXuoSCz5R<4?>;U;j;a}&8q+zZ@f&cV&*UghR+bGg^J*SQ7Uo7`L6 zN^TXmj@!g-=04`Oaof4w++OYr2e*&=iaW@C%^l(nb62>l+%@i3?lKy?F^A%7^jcd>kLoC-B|)?tBlvKRf68y= zxAEKg9sEvyFaHI9kUzp7T%^EOuUC2ckxt=8WU!1jiDPKtL}71`=Q-pppPH0T$eU>Mah$WIDBP(Ruu~!=R2^eH886108O{_j$*Y+WjE2c&@|b)^%jlQ_rVz_;2oA#v z9Envp8pq=J)l4x{!jv+4ri?K#X1ILg#8BbiZ5tv=dPYieq$H`Uon+8=FAg&JLLL z$c<06PII?LIYl7_Pc1al-5T>`As=b=)4a`b_s7w-49|AVb9W@r zwr4_pfP;CT*~Iv_G9NG-ad+IKmD$W}!98(roK{%XP-|_fur^r6)YWyB5?I?o-V8>%$XkFF*gzGqgKAKNoADSt7LUW@@dW%lB@b#rotp{D03|vRPj)lm zVxYfK9Ia~@(`c~`ab5}i)0q-0IKV_Oxt)&}C?Attd|=AQ3;*T=4UBrEVjVgLUIMSW z7@7`dfS18cFbli_W@C&Ao`PS*Q}HzX(laUy-k?l8QQ_&7A?NOh;Z%pWg@C1?wVjU^ z%Et^BAIm8pFH=O%iwzzOR)hClq}G6U!CLShSO?aF4R{uQ1<%H>;yHLOe(hP&f8^e^ z%UWE2uRksM-Qe?fN_!|Jr;E}Tl+wI^?-=y#ko;HRxQqHh@HIFD4ud1$C^&}a;|2Il zybv$Ki}717$)D&rc(>%=ethu%Dftj^0sPX=$0f?g5*Hs=C?8Adj!g;jcyJxuWRhFJ z4cyWKZsE3P{0I2MjiIeZvDTR%tags}ma4#C;31RT2L1;3!2`S;ufQwYn5&S1fUdd< zze`21(mTp|%{#*Rg?Chi8~UICJzJm$eh05<|LqNZmf_WI#DgN}SMeCe+=$o)MJ`Ni z@0LJ+3W$$TPG@UwgAy3P)KQm3e>hWoWXX@D2ZLZR-3gT8_gbJFuYYDIP~qOmI_JP7 zZC9v-aZK_GsDe>28pgm_yaB(DKfoLDrWG(ACcs3P1e5V*yan&ZXYsFeO9OqoIuH6L zIiK@Qbry>{Iq&&)0&-_Rk=(gVB>2M~u$PN;PyAsE?2SL76Ov2hyRUL6xp!!sT9X;=r(!ShasRLR2&@FG)3A0wT6r9sY}0U^#q z{z5#w46nM>^9sJ+0K%lF<9n@k)F?9EchT1Id zr5{|XPwCb>rMYwCBT1k{l+-SXsDX#u{f0+JS7+4K#Z?yqJX=sV0=%EuH|p)$HvwKo zvBtgenI3)}9vJmSLnsiVeyBehfCi#LC>;$Zz=r@|0z?G(5g;Z&LV*7&l!4SJ6J?=n zl!Jy65I{gM0pSEF2#6pcnt&L(kpNFeG%A3e%TXaJLdB?r04V{11OyQv!)uIUacZa0 z)eZH|zdRMrUp?i{V6VUgw{9V$YgQ#PAv3ZNKpCc@3MC-yzi0Jxpi!vy8D&Kc=sA}h zMiUU(f*J`>y6n`?Hh#3J-fFYvG~4QOGMd_njYZ>I&^Q8A1VrVhwgYegn%L?>+=?c* zPaj^>)STXEGj&LLGIBgkF3=lIK~ow37W5(kaV=;Xp`lWm^VNj#;+e?F_`ic@p;yps z^eUQz=Azfo>jWeckVHT-0VxEe63~f&&IELM2hC$tCj(|9o=$|&#`eQbqxi22--14-9ua+rJ|dtm z0sUIhC+JfG`V%mKvbsJgE_OHCOAQl!hW4P(2^d5`Ist>*&=+VQJW9Y20xGC|_IKV- zs>?eBeO92u=m(e{b#AoCB4{%d9+%dylNsc~uv(Bb|TCNc&xkw;mYyRzP_56xmy zt)^yEt|Vxdd7~ng2O*2Z*aHh#PL(WGm#NVe*v2=fWZO(*Cpi0dTIeGlQjpnD-#ob1 zWEr*bbf+r;4kd`CVXhiv0S&F870~)w2{3>PT0t|@7}NpY03U$^G#)w%Xz&A0(NfsY zv~UJD`Waq< zf6$7QoK~YEX%#BkfnsU-sXHw`4W`zdNiBH&No;ZvO*>7^ zwpKQYsiT=?=d@0pyLRf@xl8XzQ*&h3u6??85s!4E1lt+l)Mr%9s(Xn$2Xh*lae39m-OT_QdaD839%T zstBkiU?c&x1k@8S+T{Wt*AdvfcB{5MDGvDgKj|%O@3p&11A$N13|M`8PmQYp@zexk zd-Et)og?tcI@b1PDwGZn8TM3fO?z*{6CQkmpCMM?KH#~h>Lf$m@eTVNJDwgj+sHPt z&FmOajkEyLS ziWS{DM|SVo#W^`!DfUZmYO*yqrH;4I8WDYPewy9Q5g;vUuN0MxtEsm(jLXR|ilw7% zjZKsit#Ra7=|@dfjja)Tiv6)iu~DPz)1_(%PjH6j zbm4rkFBUoTb9#i!f>TmyYN4|<+HCd1O%oc%G`FUN9_!r2uWPsN&Yd{}C1NbW{zh@| z#EIQHCr5Vg+RZ5$noueW?wv;G6}vb4XkPD7x}CoLo~_OF4W$^T(b4eMW=(IjRM(8P zHGV&EQ2O8@8S2ce?3|&)hL6zX=H+XtZ58I^WH@gQ4N?zrmESb9{8mO;Yo1VR8)0f1 z^_ZMyOr6=*NRgtQdS)XXNW%k-F0-bwsab1l8r?v>cB6C2&@iWXSdarl?1fpep9Gx5 zfTAwKJmwe=M#6+JQA`TcmFYz*iv`RWdTsKmyQsC5`HWtI9HVucYxL6N1}(chpw}G| zdYjRM-eai22#UV?$M{=A?<*G4dy2Pd=DZgi1K&~Hy#j91>xNGBdZC+xrapNzqo}9% z2$s5#=g!vDZWl5U=jf@5HOhl2LYG>LckOPUR+J< z6DoEA`zE`PUBoV?&u`Nlo!ZY-0%j3#iGV8v+;KJBb0KCBReh?^rut^JwWhhDv8ny! zos)-unoypTp>A(|D)eDjv+q*WW7iNct%aqL$4k^4Y2N2xH_*I~eV_e+fawIh`~)U9 zvo!GdADJJ`<=CyRT#kSlI4x?>RO}W*$HsTEd;W9E7wuDKx~7a?_RN&N2iPMty=A{* z53*mghuFgeyh6Zi0$wFx4gqslut(Wr>~Z!R_5=a15wMZ~8VG$ys0PtewSI9X`xAS? z1x%;eGwfORXZ9R>o`Ba0a1t<&fHw%3Pr!ne>_zqxjn6{ZE9_MQ-Xvg&J2(>vSVlk# zUFwB0ne$|s#<{sH+BvUG*^$w*x7oWiK4k9@u&{;wgMdXijhYdaaFMBYjIAlXsesyR z$Nv9jAGl_YF>n8x#&Mhzou)lE&MuPez7uipR`wG`e?JOWat_skms` z1&`v(EnEztMWv1`mW$^SX%9zl3RbkZIdg~K{{v?`c&(%#WfcMMv~t}z z8tkqn;6p0XN#$L-aB18Cnw)WcxV~IJjs~q%|K25l>fd|Ind96bE}a{UX>_@cfc1n{ zulhTGDjyfj4daG$BRCD0%Xo8nTs}%=tXu(C=&Y;g5dk(6@V*CT2-rlxmg96pF;~Ks za(a4+aE>!LcU8oN02)FQ@Ih(%nC1p^L;V<N2RgeL=uCbhQJOI|p-4S6$*L_XfU9z+SwjtX;(-V`3t^ zxC0k%A&q&sMFi}_tH0si=9W+yE#;O`8Mbn5+;VP(vp6?jS0*({#B>~5r=S*pX zxp$bY%emFu8tz?=9?<~;z9xWLofUn%q+(G9E zbBbrXu(xm@I>+TjP?{f6xsJ<=%zU)OC-mSq5^%_M?gvW>s%d^^jqLJ>06gmIrE$Nj zvxDeo?K6(L8=bq&v5!c6$?bP4@>9?ON3eLh9NPXwGM;0yt03HX_SbMMl#JxvedEZy`u z*PjbQxO47PKJPk}3+`QCB%u92J$(BABDEQ3t0gQvjKYMjx?$XqhPu&>HX5Q>bv$_E?;pkD~M-0EVw9qp(B?Xsrpd7k%hL4(^D@SX%* zeG~%oKG3I)_vJ-A-P<(+t`k~i?I;EE{(R8?M0Z}ssCWuHzq*9+8_h>|4G(ZO*u)NA z!K?l?IEoIYaC5^o_$E$!)=xzZnicu9XW$e0)PJqeiLOAg=6BZ$w_Qjqrcx?wuBokQ zuAyK|HHkWyK@8)3X!8o=d-7>i5_~VdHvxAE_@mWjRW5U)au{3{?Fe-pPE&4u?S!J5 zrW$%LRa9de_eji-q{$EBhf-h8r}KmPA$$g}<}>*$KAX=W;76tD;f=hBo*G|CAZp>w1hRA+Q?;G4_$t2I)nO-)YvF4Mi=RlK_v88pyx>VEX(Y3ZzYjdhQe7DfNvbMqA!StK_GKN;H{y(Z(d<);o zw>_?E!9W5-2&5iQ@uaGi<_1Q74Xsb{@A7Ly`Sh5h;`5Xpb*hDaFahRBYf!(H3m zgL?C)7%MFv5}1G)H#qZW__Ic_6XZ*|R{m#-p8we}npR{u=)){~Lduz)l2qCXk+U*X8_8{uUd`-zKmdfz;ge1k$2b$#7d$ zv&*PTwKeu?_mjRoP<0`iQ5@(3NSXt>d)y}QRK&{vEif)}_xT6>L;fEU0lO2}gTS5y z_F9fYsCiv=)!77URKwgRy{LF{fZ#3oQd>S&foe$K zN0283)9_c23shtJ5jgNM+6mzTjlrG`e+3F3LNtN>UFPhnzL64nw2&aA{A*w;9Y{qp z$TcvX4%}W6ViS4@wC?cKm4T2Z^rbwxFJc5rJfnl9fi9K?3F!o?3B73P0AL|Q$o?0l z97<^zfv!{mW>HF`N<*TBJmFv0FhU_6SWIA!Yv52iaCK>@7==-6j8My*b6(SE9I$}EA_7M|rR_q!(9ogn zIs!Ev+U`~;p_yvCFh&?Fj3Y3Yz℞|8LsUf3l3<{|fp^+@yR>(Sq1phvpL5D&FSmPd}qFpmn4N)NM#)uYOz z+GC_gtw+7bXpcq@hsSger^g!}3p^Hj-1Yd!)5|l!Q|_tojPva7+0(PPXCKdbo-Lkj zo+~_8c?EhoR9?|uv0m|B`LD5|$`a*?w4wr0xu{9>ylA>;zUWQSBGFr-C8A}bR?%|NM$u-`hoX-~pNh7L zc8GR~J`?@oC-&>8;1D!;vc`~3F%9rHWmcfs$H-(|nw{BHQ&^1CfYVjr=u*iS4G zE5s?{PU0?NM>lZ~aW8S2xUYDqc(_<2&J%0J1>z!ciC8aoh*yaZif>9}k^z!(iBV#b z)JvKqV z3+NlrKVV=$dccqXZ9qXlQ9wz6KEM!A5l|Um4wxRWKH!^xKcx}UOsP%UC> z4Jr#N4>AUsf-FI{AbU_v(5pdPf_{`SvRK&&S*>h>Y_bf?rpTttUY5<0&6d3-TOxZ` z_K9q(Y`biyY`1KWY_Dve>|5DM*$=W)veORPS=l++1=*!wpWyDn`rygI%YzRDUkUyr z_!^0MYEe~5C_I}vLu+3o~hJ75i zCv0!nzOemaUxj@gb~u~~PYN#$pAr6H__6Raj_`Bg7s7uDzY=~;!6-ZxB86DtuaGK~ zig-n$B3Y5D=%MJPNK^Dx^j8d1lqg0i<|y7&tWc~~tW#`Ie4zMP@u^~)VuxavVz=Ue z;ycA1#UF}46@M!pDE^565h#L-5F$Jyyd!)g{30X~sS%wcx<+)5=o!&FqEAG>hyf9f zK@o!^G9oe~vLl8@438KS(H5~c;%vnINLggp$Ptm%kuOFriTpV7c;xlSyOIAWStYOZ zPXim%jdG-Nl(J6wymF#)l5(u~TgtbU zOO(r$?OHBwcps#lFxjZ;llwWvN-?N%L7eXTmI zI;uLYI-@$PI;Xl8Vja`7Y*M z%#E0vF}GrF$2^F680#G?ij~Al9kH@ld2DQKd~9NDO6=s=S+R>^-;P}t+ZMYrc6IF9 z*!8j7V|T^wiTxsWf9%27!?DL=zlpsb`*)luE-bE7TzXt?TuGcM&KhTr8yQy@*AO=) zZeHAbaeLwp#+`^e8TVt{>A0Wc&d2=`?-{R(Pm3>&uZp+FSI3Wx9~b|8{0s3o-tl7m zwD<+_%i`POSH`c7e>Z+p{KxV8;=hSM5&v!c$@q)$m*cO+Uyr{Pe>(vtcqRlT#3dvq zq$G4s=$6nkAuXX_!oY;Q1YJU5LP(O5&3|lSE09BxzDmQdm+{ zQgTv{q`^r!NyC$Jle9^tNroh2k}1iOG(YM6r2R?9l731$n{+UB>8)ri?Kei!yd(Tvi9D z1Jw$3th$rBtGcgxusTa!t~RQx)uSBhI(373lG>pr>Z$7K>X+58tKU#BP%l)ss@v2n z)a%rrsrRb)srRc7st>D=sZXd+s()0UR-aY>roN%RrM{Dyk(r;V%Ph<+$=sZ|J9AIw z-pntvVzats^~ma#)hBCSR!de}){3lmve|4&c0hJuc5t>myE%Jo_W10H*_X2&cXLn< zpW~V1ljE1;pA(p)%8AK|%Sp^h$?2TaEvH9LWzM9WZ8@iNejDmJ)L)aX$4$UTtzb?%YeW4UK?FXdj&y_)-L?(N*Wx%YDa&V7)_ z=LO`226U=cVOk=H=%V=RKF#oHs7-`MgPa zOY^qn{g`(nUz{JFpO~ML-#Ncqe$V{0{C@d4`NQ*b^R@Yf`6c;f`Q`b|`EB`*-T4>u z?`Q?BR4dblXv4LUT9vlDHeH*c&C(9lj?m_6i?kMPwRV)YPTQy*qaCk(UOQ1cLpw|R zs`fSQJnejKn|8T&g?5#8yY_(gYwZ#3aqYL-liG{g%i3$&>)Kn|+d80Qb-d0~=c5zp zLUjtAQWvd@(arcW5xP8`PFJEU(^cpyb(3^6bqjRMbZxqoy4AY1y3M)|b)V?A z>2~UN>weJvRlpa77IZ7txKxZ(-LlZq!7&n$Kp&o5qBytsHn@n^+Hi!YRb5>&#Mc$WB- z_>~MP8D3IYQc_Y@Qc+?mu{cUbmrN`nB~weLm&`2ruw-Y+>5}uMs8n1UP#RboT&gTh zE$v*|wX{d+;8JyIR_V}Ed+F%X38l+RSC<|yJzILO^e=t5K2e{p&(LS-hw4Y@^Yl7> zk-k)K&>Qt;{RI6ay+cp*Q}xsJGxf9ebM;RBeEmZGV*M8VH~L@oj{9ZevY4{8vJqu9 zWiOU3Dr+lSUbeDqec6Vxjb%H_J}=u>cA)HV*|D+{W#5(EF!&oH3@Ss6A>NQ=NHO#@ z^fwGL3^8OHvJHg>gQ3DuX)qgV47G-O!*hlv!%K!ahPMoDh82cYhSi1*hK+{JhK~%N z81@;C7=AKbFkCWRb{MW2ZW--nz-nqO-d9U)c^1kKeRc*=Oj zc+Pmyc-eT>c(0PJjHv8ZnOj*`Iid26%GS#FD>qesSouliw#uEApH=Ry{HF4|${#9! zsythHzVcG#mC9?CcPby6fWyR^1e2G^#}r}eVj5~PnMRtLOk+(GOp{Cw6EV#*tu*a0 zoiN=sdz(dOiCJovndRnT<^pq>xx#ERTg_GGCi7VH1oI^GWb-WZZ1Y^R)4a^wW?o@_ z$GqOW)x5*J+q}no(0tDPi}|4iSyC;%EPX8fEdwn@7K_DEYiY1FTEFY)@jxm z)|u8=MJ!nVq`&i1}-qiu`rBinA<0o!-B)3&p=bG8e%YqsmQo3`7wyHy@lk}6eI zud4j2+Ny@C=c<~k##PO&T3EHLYHih_svoLORXNU7ovXT7^>@`nJFv5M!R~4Ix6AEe z_6WPm9&PVp?{4p9?_j?byE1{+4}-y~W;UUu$1) z|G>VwNCH=brmH=e|=P!CUv>EMI1p zFnhLtEXISdvG$G4(Gyo@B_F4Ho!*M1Xsc}a3kCdKY@GT z0eBRifM3Fk@DltMUWVVnEATqJ0qr;8|KM-%Df}HigU{g~@K5*`LWn^EazU;r6sb`J zib1hRixNd|mC z0*ypd&{Q-HO-D1(`)DSbg=V8gXfaxXmfF!W^by*GK1Q3-7PJ*@L)*~~v={9|`_Tb( z4twqFd-TdWN2(KhU4(FZ6-|3}jpxH^!X_WT0`razO-|s7*_A>jJ z{mc>OICFwI$9&D4XD%?`Fh4LqGS`_K%md~(<|*?#^Ne}U{K5Rm3akt3%DS-%*2m8J zvPw3L4QHd+IJP_6gYC(_0e7;!*hDs&O<_~nfou+&&+1tlTgkr3j$y~LVkkSg>S1`0YMPskUF1dA|4s1k+>BZX1IXknu8j_|H9LwH}9nIBO--0?fx zgBgPB99_7Xez63`6WE==L;}kRv=KOnz`Q@Kn4KYaBlb8b`LU!VxYc zM4bh$zzw*AbdU++8$bqDHh?S~fHh}9E-lu9Jdh6x9Cnu=N1LcD*E7HXjGzbZvtb%cwoxU z)X^Vjobc^n^h$sM0dIqeI1)$UXdHvp4r1|fxX1WAevg(p(&=-zm}ohe2Bw4f6)Ui& zW%QX~mc!)bXP*gX0~3{#RB5fRtf{utj&7Zj1I!b3GZ$+czr#bU6u0W867aNC@Omchq^4;n?RC3Q8!Ypu5Q%DVc#wKhxZ$c><>1|YjNk-*I^?D*dKQ?OL84;qk22s0t3Rq$6y<4D4Njd$b_j4-OP&>iX8!T1Gd5{lH|F zD8`O$8?S0RK3+ApYv-=w6t^94Az0{3ni=mhw(q?SgY|iDpTEI=5bq89~xSa0&b%+S0e+GWZT$ z0aw8_@I6k#$v6e4;{G@d4`>EIg6rT0xCw57+u#l!h|_T;eiM(xqwrWd_ftXb9opao z`X4CGuB{ObHLbd$Cb_(_zNU6gu+}j(xQ*jXkV0i8r$tPgk$5s2Rao`C;>-@sGwJ9q}3gFnEZ;4kn30tj&i&csQx7y`Z8WOnSW}750Cf2(Dvtezc zxT9P9*27W%={uVC9gBz4z9Vp5wz|)|M}hd~Xb2B@rELNyiU8lnqZ{Bmc#ODM;s3Rj zx)zH{sjRBE)ef|cE~u(3tF_cRcL|&V_BOz&cpUC=4$gq@!!m}WLCHxAWf~Vmb{63zEXW`i^!FKpHJP$8W z|2GFa@O-L`pom#Acolvx4tx#IZGb=Ed9?Vmi1_aC7W@gsuZFkb9e5YsgZJSByZ|r6 zi|}H+1TS3;AHqlQXZQ>J6+Xtx@N)bCZorMWiFVgSHrU|{syYNPb*IKegHhX|tG2#v z?aR3!7I7`suI_!xX<5LfwaN`CK>S+djy#Yj@{X0qju59P5{Lo=`&r}Tk=a8M9 z6&tCz;@2yBI4d?e+Ii%>UeU){v6&8)^A7>Z&eE-P9P>X)2RKW&(?JZ0CCMP%hG;JiHTsfZf7Xl&P$AMI12WPlBi@Vm;Y0W^K0=?4P(Jj%f`N{& zJYDT*5PB2H8qr`>iTC3Jjc5p}!k^=VxGukff zT7eo+BWgk`(JFiae}gaLOZZ!S8GqM|n$a33ob~i+J-&jkQZ%lo@DKFyhnL#2OWayV z+=+Iz!12q{kgmDlZLWj{2bQFDoj^XS02EK`J;oJBQ zzT1pWpf8;;PNCE26uyV=JC*VfKf(_&Y}HCw>xkc>Yb`LYQWy_J7(Y-LKm8YmyinpI z32*Io2mLGpxr^?h`{)7s2|YxQ@GtmR{1`vM|HHrGr{ePb>I6dQ6QOJJyA#MM`ox@a z>cb7%8N_f-`3y_tKcn&)fy#gWU-_u&rEJE7p?kiW@npOhZ$`pM85twTf8xLJ3jzUw zkU&HrBg!X?Qv9UffmG@#0$K4(eBhi1kk0Y8Ux?#{^n1Jd<%+jj3lqh}w&04v`w8S5 z!FEQ2X-pve7a7xfurh5KN(Y*mc1(Mw1JjY|#B^r55a>#v8-eZwdJyPIpcjGO6dcpt zshk$ml~72Me;KbE3}Vul^cEBYMHEs|J(>7(0%i1!o}u&`!04DFQDPpG&lE6)jGi$t zMgkQC`Vi<#pprm80{saL5G9)axf}!rzFLpgp(D<}tI8`H0!Xd<^IeJ5i?7L||tE>FRbRup9kdw`Fjw62={14${++p&IMa zz#Jlw1`hvl@60jL0TbBsAM`wg`I0$BXU&{sz9O&}fxR1<)65wH`w-ZdYTZ{89d(iU zjuI8-67wx{nZSMoCJ~t2#9U#nLOS6T0nUKhvu zu|faG2=E~r!iM5y1Qrs?dNo#{ibOzlhE)T1HiC_$u~hf%(>a~gVaB|E~Smf^AFE6F0x?cRfrAM2)a(f6=!#*_emjnmGESLjz zFdrIV5l#M?p#_eEb11btLQ{DsDQh}I(|MO^BJUdf5#FFg=nl==h0%;%B#J|wP%oOB z%S45!n7Y;)nu8mM=AijB=eCh1+YVCyeF~jLS7gNnmSYUqk6(#a_ih#TmtU#dnGy6b}`@C|>xmJ{~^aJ_?^$pLn0XK02QQpCZS# zexY^~fd(g0WTV*_)2o0o$x?4=qD8U5R6t{N`s?L3Vl`}gO5m7>td>n+erDUUbPG_s zC?c?!ng)S%z>?L>uWU!Q6Wf`7c66GFnZQy4%Lt?oX6L4+Td%LR-Vqh==a`=~-hPJd zO;@B3+gDr>k(-Mw+*kc{9c5dV7J&WOq!ui;Mz$Y~@$+iREu&SIdR6=O-P^a5+;!3g zwm&%50K72s%7)o=)|qReWeqGfyNZ`IoXvgJ@(d`Tyqqm~8D5Le2C#P>at9fdEXpWd z^neGE6r5tMlrSnOUED$mV>6ycDPvy(D@DftinOtVTQ={Te^a_1{f4l$RBLP%JCv znAkXnkltJ7iM_D5S>iu-EJYNrYTvPwqcA6NcI{tF z6E(Jrpb4Q&9S!?z<$Y_dgDXeaYA<){+@))`?mc?G(W`f#zKQ*kl9N*VrwtgGPEERH z#FSbJl^R!GWqp;+ERmX9D{^TVSW|2Buceh~bz(4?smo7GOQP7*>M|^q)sCh$B10*ZyiInZt*c*=jMQ7RkF}u7rYV?P;10cXiJ@+z)g!#a zzE5K-_FZ-o`yM-)ox)CKry1Gl>z~2m(hEIEuj01dbtaEP>E^;CRvEuM&8Jpxy)}5|lv?Ov*XLW4a~a7n6C8Lz%lAA7=WurVQ97c7rH? zCA*4U%{H@Z*tP6Bc0KzcffER{6Nm|{I|WjbwV%NA1YV#&HO4BZHRn;oHcNb8LCJ8Sk}1>@CAz^iBa>`p!v_tr)r$De zu?N`C*@JYW9s+sn5%#Dfykejl&Zp^8IGMmj=h}~drF|C}&Rh1Q$w%UAW#(+S&KJODa(=2g1 z18>n8Nca|4`+)t)u}`mJ*@rY`uumVF`Eo3{lzQ|#m@1O`@tLgxo=`2`A#jdJm}j;g z%g(gR`zV}!4)XA70_S4TGWK8W3&)pbN;L<>?58}bATOyk>U){_aJJ(R$2dkCvsFdPIiH)+l8V4>bg01nj>J3P-VZ&xpLl|#Ia|PhUKJms6B(? zTGHyAoKrYL2S>A<4=oNI92NM|pgASyPstfa8S#<^E`Y$Ll%;%J(k7J);Z$NpD1plw zxG(~jV@;muAzC{|ax@rd;-a`{j&6_-2wXv6LlYN=2p3Oaqo|*~l&VFWEoEGLijt$m zvFTO1i0jPtqMVuQ!gb}kaoxEdTu<%|0#_2aia@HtW&+m`ND1h=X0A8ahwIBFvbVS- zL?edv1X6R~PT(HrvVKNSDUIWvd6rE+Y*Eh{;Snl(3?8^ckTv6H}02>kS4X8p>F&stlo z{r|L3Zc>Yd?)v{(s96#;qS7|9u(GNuuhvpsS1BgqV(M$UkF2a8+&$Kz652{zpv@MS zZw`U`a1TdsYe)}nKDUIX$G8RDLT(X9gNy?NQg(lkz(Xs!rQ9;MBS-DwFoDONd*>Y1 z=+kW#^#xR#V}sRifU)Hu$)H(rLvH1u!Ooi2m0HcM7sqbq)^KaNbp%r5K1$#h1Rh%n zA0t99Ai^m_I7L%%)L%KCTPG;E?c7e$RH;HwG;maLU(yPi>g~zxp{ZW(Gj1<|CkZ_L ziY0LexWoTW*m6feI7g*?CHm!4)NubO_s`)@a%cY2@GNckHKAES+K^^S{+@xl&)62m z-a3^_++`8hw*-FO;EeV)j_KurcJ6zQ-aUx7M6C^PaJOhfXQrCFP2e{#SsQmx#DAZA zK;T6JFaM4I5%>5%u%1v@zY%yzg!L_j^~!mx`%LNTJjz~5vvYs&;NRVO2*P=W!0*KF zS8yF=9dv+yx_Wh=;(h-dhIirJUTK}D`|{dL)Vvo(&3p3_0>3Bl$5*I%IjysJAm+&l&79V$`@Dl+6B5FQ{~Ib4yF|8hxh{4Yw&Jxev3wg4zlx9JHGDj;jOy1pd65PvVpL6!@6$FY?%52z*N5?_wnUmy^eua+Hpn zIbn_iIT4QfoXpm9oX_R+Xn@YsVDHxkKA*tHttv0DR1LS)^{o?+;Fk-=8+e+~XyAcgkh=>#W|0>`l5@1hHhw$5 zgWoA0!2G9sy9i>#&-sInzWL!Se~1?L%@4C@x9aC8|CMNUU+~BH3aOdUJ`%+MMX!6XC;axD8b>a@77LW!QPbuC-8zG z(1ndAD3%}%q4x`|L{M-S$s0j2E$q!PRj=*;lEMiR=K+c0oCl;nZ!qPt<*IfsYx!SW zYQvnhtzGp)OPf;th@nV>ENbtR}9LEQ=Jv0g|J+Q7#`I~pK#q|XWPG5wW5P)~y1pk4&^5*?%2 z`MW1wTUydnTwrk(lf~Br9Q8#~$1-D}uV{2S=Y^lGJkv6wa*&0-&`{^tZVYuiFh)9} zi;^6&BDuR$3(lHa|HuI{a$*1p%@%%5==sgKv5?VluFQmS4V(QCRF^}oeP6NxKK$@ zvS>gl^x&;4R!0ccLhXMV(u{#HoS^<^0KMn1)At7j>*f3o@%8S)O z!X#meIHUK3$pq0!Wi^V{E1E5xk;xR|=wXU*|7Vy!Zm`-uM{wjjw+DtaeD$Y2G@ujc z4ti7mb&q|@0nVMin?xxz7s#o&a4wRP;a>FZqgw7g`o7ULZU%kdXg24d?;9}P ziN0&JmD|C6%I)Fyai4RCxi9G3Mkl!&Jfa6?6raM6=BLqDfj;HG=Fjs#+Ue^)kN98s z$Mkidr}RZ1j+(ox;4XO5*L}JR<-&5|8y6QB9~VED0GD8wP?s>51eeY(i7rVlDK7n8 z7P&OKY;f7`vfE|9%Q2S=E;n6nyWDlT@A8w&BbQ%X9=kHGoU7pK>gw+5>FVt&b(Onn zUAwuayBb}Gy4qc5xXyRAFK}Jt+UWX`>vq@Ou7_Mtx}I`9<9g2Zyz4iv_uN=FUpK8= zhMUo?$gS9|#BGqSZJpb0w?l46-Hy4Pa69RC!R@l!J-4TB zzq>ti`@`MU-NW6>UFt4(_i+z*k8qE2k8vOGKGl7;yTg5+`vUjn?kn6I?d~hxSGyl^ zzw6=dq44nWP+EGd*T|%=MV>vCw0c zN3+LTkM$n^^JF|_o(fN2Pe0E9&mhkbPnBmI&vu?2JUe-I@$BZ=!}AT#-kvp{%RG;J z{?9AYE8puKuN7V!ypDPu^E%;WKk0SK>x|bquk&8tcwO?k>~+QKn%56re|o*}hTe=f z=Ph`0HBtJ`jkvx_{DUvc$PAZeir3$I9R4t8=MoOcl9qrOi($3PZ(qw6h zG*y}=Esz#U^-`mBkaV!LQaVIBN;+CPMmkP9MLJbFO*%umSh_^IRJvTcUizVQgY+Zm zZs}g>e(6E!Vd+unW$6v+UFm)4Ptr%yKV__pm$}H?WKx-2<|9+e{AJOyj%}X*=@O}TpxYpmD`m&m7gkiD?d~2Q+}>Ito%ZGT=|XilJc_hieC@E{(b}e()}|1 z*7$An+u`?#-!A`H|IYqh{k!}3^q=Ox(0{Srf2sd+|K|ZN0d4^v0bT*60Yd|70^SO! z3pfz)Rlwc{)SKyw&y@C4!PX(R{JQsLA z@SDI(ftLfX1YQdgf}(=bgN6mo584&I?-1N6xJz(Sur4@1xG>ldToh~yHV0dRhXvOL*9VUX9u+($cwF#=U>w{Wd^q@i zh$N(QNKwedkat7oge(YI6tW~_MMz`F%8=C|+d_7P>R%{kZU17gj^4~8FD-1 zZpi(R=OKTFyaJiKbE;=yAz?{j zm0`2P9APWMR)sZ(tqt24wkd3L*w(Pm!w!cX4LcTgA?#+@?XbIH_rrb)dldFd*yC^} zoC~)L;jZEC;hy2%;nHwH?26bIaUkMQ#F2>e5f>wFMm&jl8u8p7@mC~_WFv)0w@ClUz{rqDRb+T%L}XNC zOk`YSPUNu2`H`PSUW?+Qv{BuodPnt*N{UL08W@!sl^tb{vP4x!jgP`n6Qd?YO^KQw zH8W~XR6|r#)as};QR|{UjM^BrDQa`n#i*yzA<>D^gQI6eZ;L(W4gukh$)Sk9J4Xz zOw7~R(AZwF17oveb7S*kjj_eC=2%PYu-Lj-96K>~QtXu2>9Oy}E{$!9-4we&_F(Lh z*kiF@#-55j8+$(XV(i`62eA)he~x_|`&;a@*gx&DFXCXFdz^1vo4Ay?qPSsklj9oV zcEml6d!gYq5>2p1rBQ35G_e|urmLpArl+R2W~yd^W~t@_O{1n+vre-?^O0toX1C^$ z=A`CZ%@3Lzn%kOtnqM?eG*30pG=Idmi60PejjxIy89yd|d_0by7(Xd~a{RpbrSTuc zH^$pn#eW$8QT*okZSgzeuW7xs-L?I+1GG8X60J=;SUW^ptsSl%r5&rCpvBrL+G*O^ z+U43++BMqs+Kt+6+MU{6+RwE6v|ngXXwPb|X>V!oY9DAHX@ArHuKh#%A^|42BuEqd zlU61*Cv8glEa_0viKL53HEv_C-z8s9zLWek`B@5+!l$^TxTPpl0#brfLQ}$1B2u&|ZByE(bWC|8 zrB_Oyl(dwRl+u*4l=75{l))))rc|X=rwmJ}OBtT>cFH>`lTxOn{Fch5N>df7%G7|= z;8eRRRh`;4wL@yB)UK&LQhTNLNli>0nmQ%*SnB=M=ly;Aho*DsF6ln$G3lE0g!Fdl z9n-s{cTayKy-#|-^n!FldQo~wx+T3leNg(F=~d~~>BG_|q|Z*@pMEa=ZiatGR7SUq z+zfL@ZN~77Q5j=1CS;I|cQW3~n3^#oV?{<&#%g=Unv8WBA7*@%u{mQ~#*U0nG7e^Z zmvJu>WqM|+GgC5+nL{%tWI8f8WFE~tp7~|wsm!yP_cNbl{*mR9rOE1&)h(-MR`0CD ztir4}vqoo4&svkUK5Jvv$5~smwrAbW`Z?=q*7K~tvSBupEy)hd4$F?nj?RwD?w>s% zTbEs%Ju=%qKf5V=RrZ?f_1QbKcV+L%-j{tO`&{<Kmi;2fCnqE)EhjT) zbk3Zdc{vMm7UwL@S(URUXMN6wob5T+a&F{$=lbRL%I%k1nL8qPbnduZd+yu0@8o`% z`$_KZ+`YL6au4Mm$vu&KG51>TkGVH<@8mwp{WbSV?$g|7x+uG@m##o()|KgOxFl$ z3(^YG3$hA|3(N(Ug7ShP1)~ba6pSyh7c4J0S#Y7?Qo(lxR}21E$P{`MdKbzHeG2^w z!wMq`qYL8-wS{d8yB1~_78TkGYYWE~PADXW?-agQIID0@;aq#+{KAEWiwk!aeqH!f zFV%(Bq5nj`TmPBrJ>od z*09TP&~Vyt&TzqS$?%=ws^PZbf#H$iSHlw{GP)Ywjh;qtqp#7=7+?%Gh8kmxos2z= zy^MW~iN-YJKx2k6+n8%CG7dJ@8AljL8^_s=cH`T|8OB*ghjG4fk#VVUxpBYos`0NP zSyB6<-bLv}Sw*=;`9=DoqN0+bAw|_iZxz)SjVKyjG`47b(cGe@qHRSNi(QJNi#rx~ zDehkUMsc6w#NxbSOL2MepyD@+hZffqk0_p4Jh^yU@r>d*#q)|67B4PdQoOl%Z}EZR zL&f%^#m9@kEWT9yUGcTzAB%4m-!6Vq{IvL4@t-DOLMCsM%;aP8GX-rK!qPW2!feG>tKhGc7c&Hf=HOHtjVXFdZ@-HJvt{HJvwI zG+j1bG5uEJTM}Nd@ zyCwHa9+v!WM&sJV+d%baI6nJ1Vhnpc`vnKzsFnh%%{nU9)}n@^fgo3EI^H(xj3 zG~YJgGe0mtEOjf5DD72hC>>lnxpZpjg3`v)Ri$f6*OzWA{kU{@>E6=)rJt7`F8!j^ ze!TQYi@T+_rPMOXGSf2GvcR&~veeRK`N*= + + + + BuildLocationStyle + UseTargetSettings + + diff --git a/lib/common.dart b/lib/common.dart index 075ffd2..cb9e2ff 100644 --- a/lib/common.dart +++ b/lib/common.dart @@ -1,7 +1,9 @@ +import 'dart:async'; + import 'package:checker/screens/faq.dart'; import 'package:checker/screens/purchase.dart'; +import 'package:checker/screens/registration.dart'; import 'package:checker/screens/settings.dart'; -import 'package:checker/screens/splash.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:image_picker/image_picker.dart'; @@ -19,13 +21,18 @@ const platform = const MethodChannel('com.dinect.checker/instance_id'); pushRouteReplacement(BuildContext context, Widget widget) { var route = new MaterialPageRoute(builder: (BuildContext context) => widget); - Navigator.of(context).pushReplacement(route); + new Future.delayed(const Duration(milliseconds: 200), () { + Navigator.of(context).pushReplacement(route); + }); } pushRoute(BuildContext context, Widget widget) { var route = - new MaterialPageRoute(builder: (BuildContext context) => widget); - Navigator.of(context).push(route); + new MaterialPageRoute(builder: (BuildContext context) => widget, fullscreenDialog: true); + new Future.delayed(const Duration(milliseconds: 200), () + { + Navigator.of(context).push(route); + }); } // Добавление route, с возможностью вернуться к предыдущему экрану. @@ -37,24 +44,24 @@ faq(SqliteHelper helper, String app, BuildContext context, // В методе отправляется запрос на удаление токена кассы, очищаются SharedPreferences приложения. logout(BuildContext context, SqliteHelper helper) async { String token = await helper.getToken(); -// String locale = await helper.getLocale(); - VoidCallback positiveCallback = () { if (token != null) { getDeleteTokenRequest(token).then((response) { helper.clear().then((result) { -// helper.close().then((_) { -// Navigator.of(context).pop(); - // Navigator.of(context).pop(); - pushRouteReplacement(context, new SplashScreen()); // Запускаем регистрацию -// }); + platform.invokeMethod('getFlavor').then((flavor) { + while (Navigator.of(context).canPop()) { + Navigator.of(context).pop(); + } + pushRouteReplacement(context, new RegistrationScreen(helper, flavor)); + }); }); }).catchError((error) { print(error.toString()); }); } else { - Navigator.of(context).pop(); - Navigator.of(context).pop(); + while (Navigator.of(context).canPop()) { + Navigator.of(context).pop(); + } } }; @@ -62,56 +69,27 @@ logout(BuildContext context, SqliteHelper helper) async { StringsLocalization.askChangeStore(), positiveCallback); } -forceLogout(String token, BuildContext context) async { - getDeleteTokenRequest(token).then((response) { - SqliteHelper helper = new SqliteHelper(); - helper.open().then((_) { - helper.clear().then((_) { -// helper.close().then((_) { - while (Navigator.of(context).canPop()) { - Navigator.of(context).pop(); - } - pushRouteReplacement(context, new SplashScreen()); -// }); - }); - }); - }).catchError((error) { - print(error.toString()); - }); -} - /// Запуск спецефичной для каждой платформы части приложения - сканера. /// Может производиться с нескольких экранов (splash, finish_registration). startScanner(BuildContext context, String app, SqliteHelper helper) async { - if (helper == null) { - helper = new SqliteHelper(); - helper.open().then((_) { - startScanner(context, app, helper); - }); - } else { String token = await helper.getToken(); // Канал ловит вызовы методов из "нативной" части приложения. // Могут быть вызваны либо exit либо faq, либо purchase. if (token != null) { platform.setMethodCallHandler((MethodCall call) async { - print('flutter handler'); - print(call.method); - if (call.method == 'findUser') { - var userResponse; String cardPhone = call.arguments[0]; try { switch (call.arguments[1]) { case 'card': - userResponse = await getUserByCard(cardPhone,token); + userResponse = await getUserByCard(cardPhone, token); break; case 'phone': - userResponse = await getUserByPhone(cardPhone,token); + userResponse = await getUserByPhone(cardPhone, token); break; } - } catch (error) { print(error.toString()); } @@ -119,7 +97,7 @@ startScanner(BuildContext context, String app, SqliteHelper helper) async { List users; - try{ + try { users = JSON.decode(userResponse.body); } catch (error) { print(error); @@ -131,8 +109,6 @@ startScanner(BuildContext context, String app, SqliteHelper helper) async { startScanner(context, app, helper); throw new FlutterError("Users not found"); } - - } else if (call.method == 'faq') { faq(helper, app, context, true); } else if (call.method == 'settings') { @@ -150,13 +126,7 @@ startScanner(BuildContext context, String app, SqliteHelper helper) async { String card = call.arguments[1]; print('$userString, $card'); - var route = new MaterialPageRoute( - builder: (BuildContext context) => - new PurchaseScreen(helper, app, userString, card)); - while (Navigator.of(context).canPop()) { - Navigator.of(context).pop(); - } - Navigator.of(context).pushReplacement(route); + pushRouteReplacement(context, new PurchaseScreen(helper, app, userString, card)); } }); @@ -166,12 +136,14 @@ startScanner(BuildContext context, String app, SqliteHelper helper) async { 'url': await platform.invokeMethod('getEndpoint'), 'appToken': await platform.invokeMethod('getAppToken'), 'localeCode': StringsLocalization.localeCode, - 'color': Resources.getPrimaryColor(app).value.toString() + 'color': Resources + .getPrimaryColor(app) + .value + .toString() }); platform.invokeMethod('startScanner', args); } - } } // Запуск диалога с двумя кнопками diff --git a/lib/resources.dart b/lib/resources.dart index f0d80fc..eeb64a0 100644 --- a/lib/resources.dart +++ b/lib/resources.dart @@ -7,7 +7,6 @@ class Resources { } static String getSplash(String app) { -// app != null ? app : return 'assets/${'pip'}_splash.png'; } diff --git a/lib/screens/purchase.dart b/lib/screens/purchase.dart index 29591b0..7afd0ed 100644 --- a/lib/screens/purchase.dart +++ b/lib/screens/purchase.dart @@ -45,7 +45,7 @@ class PurchaseScreenState extends BaseState { setState(() { requestAsyncData(user); }); - return getMainWidget(); + return new WillPopScope(onWillPop: onWillPop, child: getMainWidget()); } bool purchaseInProgress = false; @@ -423,4 +423,8 @@ class PurchaseScreenState extends BaseState { print('kifio ' + this.loyalty); print('bonus ' + this.bonus); } + + onWillPop() { + return startScanner(context, app, helper); + } }