diff --git a/ios/Runner.xcworkspace/xcuserdata/kifio.xcuserdatad/UserInterfaceState.xcuserstate b/ios/Runner.xcworkspace/xcuserdata/kifio.xcuserdatad/UserInterfaceState.xcuserstate index efdfb5d..118229e 100644 Binary files a/ios/Runner.xcworkspace/xcuserdata/kifio.xcuserdatad/UserInterfaceState.xcuserstate and b/ios/Runner.xcworkspace/xcuserdata/kifio.xcuserdatad/UserInterfaceState.xcuserstate differ 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 0000000..4bd79cd Binary files /dev/null and b/ios/Runner/Assets.xcassets/more.imageset/more.png differ 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 0000000..0f314bb Binary files /dev/null and b/ios/Runner/Assets.xcassets/more.imageset/more@2x.png differ 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 0000000..90a0ca1 Binary files /dev/null and b/ios/Runner/Assets.xcassets/more.imageset/more@3x.png differ 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 {