diff --git a/build/app/outputs/flutter-apk/app-arm64-v8a-release.apk b/build/app/outputs/flutter-apk/app-arm64-v8a-release.apk index 716c157..2f14683 100644 Binary files a/build/app/outputs/flutter-apk/app-arm64-v8a-release.apk and b/build/app/outputs/flutter-apk/app-arm64-v8a-release.apk differ diff --git a/lib/admin/add_promocode_campaign.dart b/lib/admin/add_promocode_campaign.dart index 97ed61f..b866974 100644 --- a/lib/admin/add_promocode_campaign.dart +++ b/lib/admin/add_promocode_campaign.dart @@ -195,7 +195,7 @@ class AddPromocodeCampaign { ); }, description: - r'$d - digit $l - letter', + r'$d - digit $l - letter $s - any', ), IntParam( 'Generation size', diff --git a/lib/features/subscription/subscription_page.dart b/lib/features/subscription/subscription_page.dart index 23084ac..a05058d 100644 --- a/lib/features/subscription/subscription_page.dart +++ b/lib/features/subscription/subscription_page.dart @@ -1,4 +1,3 @@ - import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:mnemo_cards_common/mnemo_cards_common.dart'; @@ -19,8 +18,16 @@ class SubscriptionPage extends StatelessWidget { body: Column( children: [ Header(dto.title, hasPopButton: true, center: true), - ...dto.items.build(), - ...dto.plans.map(_SubscriptionPlanWidget.new), + Expanded( + child: Column( + // shrinkWrap: true, + // physics: PageScrollPhysics(), + children: [ + ...dto.items.build(), + ...dto.plans.map(_SubscriptionPlanWidget.new), + ], + ), + ), BigBackButton(), ], ), diff --git a/lib/pages/profile_page.dart b/lib/pages/profile_page.dart index 6ce5daf..e52cdd3 100644 --- a/lib/pages/profile_page.dart +++ b/lib/pages/profile_page.dart @@ -78,10 +78,10 @@ class ProfilePage extends StatelessWidget { ), Expanded( child: ListView( - physics: FixedExtentScrollPhysics(), + physics: PageScrollPhysics(), children: [ SizedBox( - height: 300.h, + height: 320.h, child: StreamBuilder( stream: locator.userManager.userStateHolder.asStream, builder: (context, snapshot) { diff --git a/lib/pages/settgins_page.dart b/lib/pages/settgins_page.dart index 95c3b28..88b9ec4 100644 --- a/lib/pages/settgins_page.dart +++ b/lib/pages/settgins_page.dart @@ -23,6 +23,15 @@ import '../widgets/shared_pref_button.dart'; @RoutePage() class SettingsPage extends StatelessWidget { + + void _initAdmin() { + if (!getIt.isRegistered()) { + getIt.registerLazySingleton( + () => AdminApi(getIt.get().dio)); + print('set admin'); + } + } + @override Widget build(BuildContext context) { Analytics.settingsPageOpened(locator.userManager.userStateHolder.user); @@ -129,10 +138,8 @@ class SettingsPage extends StatelessWidget { ), setOnTap: (v) { final val = !(v ?? false); - if (val && !getIt.isRegistered()) { - getIt.registerLazySingleton( - () => AdminApi(getIt.get().dio)); - print('set admin'); + if (val) { + _initAdmin(); } return val; }, @@ -179,24 +186,28 @@ class SettingsPage extends StatelessWidget { SimpleTile.text( text: 'Cards', onTap: () { + _initAdmin(); showDialog(context: context, builder: (c) => const AllCards()); }, ), SimpleTile.text( text: 'Users', onTap: () { + _initAdmin(); showDialog(context: context, builder: (c) => const AllUsers()); }, ), SimpleTile.text( text: 'Plans', onTap: () { + _initAdmin(); AddPlan().addPlan(context); }, ), SimpleTile.text( text: 'Promo codes', onTap: () { + _initAdmin(); AddPromocodeCampaign().addCampaign(context); }, ), diff --git a/lib/widgets/card_pack/buy_pack_page.dart b/lib/widgets/card_pack/buy_pack_page.dart index 701f43a..cb11ce9 100644 --- a/lib/widgets/card_pack/buy_pack_page.dart +++ b/lib/widgets/card_pack/buy_pack_page.dart @@ -35,6 +35,8 @@ class BuyPack extends StatelessWidget { CardPackHeader(dto.title, dto.subtitle, dto.color?.asColor), Expanded( child: Column( + // physics: PageScrollPhysics(), + // shrinkWrap: true, children: [ Padding( padding: EdgeInsets.symmetric(