From a63a15f9e3d8bef6f858a5c22f0889ab27159e0b Mon Sep 17 00:00:00 2001 From: fmk Date: Tue, 14 Feb 2023 18:40:43 +0800 Subject: [PATCH] =?UTF-8?q?ios=EF=BC=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/image/2x/write_off_bg.webp | Bin 0 -> 17189 bytes assets/image/3x/write_off_bg.webp | Bin 0 -> 35157 bytes assets/image/write_off_bg.webp | Bin 0 -> 5226 bytes ios/Podfile | 10 + ios/Podfile.lock | 8 +- ios/Runner.xcodeproj/project.pbxproj | 6 +- lib/community/community_child_page.dart | 1 - lib/community/community_details.dart | 11 +- lib/community/community_page.dart | 1 + .../community_view/class_details_video.dart | 6 +- lib/community/community_view/home_class.dart | 2 +- lib/community/new_community_details.dart | 2 +- lib/home/home_page.dart | 4 +- lib/main.dart | 2 +- lib/mine/vip_pay_code.dart | 251 +++--- lib/order/write_off_page.dart | 715 ++++++++++++------ lib/retrofit/data/user_info.dart | 3 + lib/retrofit/min_api.dart | 2 +- lib/retrofit/retrofit_api.dart | 4 +- lib/retrofit/retrofit_api.g.dart | 2 +- lib/view_widget/mine_vip_entry.dart | 16 +- lib/view_widget/my_appbar.dart | 4 +- lib/vip/vip_view/vip_top.dart | 5 +- lib/web/web_page.dart | 2 +- lib/web/web_view/input_comment.dart | 7 +- pubspec.lock | 7 + 26 files changed, 647 insertions(+), 424 deletions(-) create mode 100644 assets/image/2x/write_off_bg.webp create mode 100644 assets/image/3x/write_off_bg.webp create mode 100644 assets/image/write_off_bg.webp diff --git a/assets/image/2x/write_off_bg.webp b/assets/image/2x/write_off_bg.webp new file mode 100644 index 0000000000000000000000000000000000000000..e79aaf50e158f07c3c2a679ed0442fac4bc1cedb GIT binary patch literal 17189 zcmeHP`&Uy}77ig`L@`km(^d)iLMuqoK|n+z-~+MhfH#ReLNrd}sxMkhQRI=J^|6XF zGhK`iP*g^dn*hNVnwSTmWV8;*v^U^jBpNZ2@DSxDl#no?RZX+H z2n1h3Tt77*20!=2wt%>rZ!g`5CVju-neb+jXk**-#EskiR{oH8kbf@Z zBV$uesll#`C>8Bp-n5Lr$~Zl3N#FAblTh`hq#QQMAweFbON8>0A^w!Xb~~R$rus63 z1Q%lF9d#!>6ay*Jp#2b{Iu%^yb9Co(Q`GqkM=BJV3Q<@{$8(d)s`C2ve&-LvglY|h zCPAq*-msN#w}yIZ!;RkMBPq~k2uYnV7-RRx&6D=A^xwl-mtn_W3ToDLrwtE@>tr_A z6eKq7uC@6O^-UbZK_btJ*4IL)LS;d;DzejJ)K)}g%QpF)wR;oC?1^$ncbe}x3^YU3 z{_NKyZsw8?DUc$NY5mG_7&m00wp~G!c?I#U9fK;aF6Rq0Dtj`Q!ci4DyZehF?zd`7 zzi@xb$VT(2x}o7-xr<~l=KktYI(}`Zi+bb}R^E(E4`gT3-3Eg?Jh}8l)fv3~vf83^ zb>!N1sZp+d8)Q#^N!KsJK)MiZ9>Zpup|r8rpKULsdq}IxJ2qp+rEIQEDM@R~M{N)~ z^hy)C4r^gJVZ|g%9k*bg2J2LbZp;TFbSU(Wgu6 z|MLmXxF<2MEnl#FWp~^-pm-9=JZ)_uPW6F_WbKk|ebX?P227<&;%Sl57?h{;ecAGz zig@f=8q1I_**-uX<44FiBjon{9bJN5tEait$&R+n#X+PJ^KZv%<@hxK02lxa00sa9 zfC0e3{{aJ{8pTrM%0$SiJyW2ZdvI?hY!iQJ8?mjyGzH^Qvi@sG0YQCCsr`p;YqIRj zG3@Go?>6O?A+#YoR9I}kea79qB&oE+E)*F)-oFgJSO)Ve?NhVG)$JlXQfkGxAKUS2>vLS|-ivC?q`zx0i{_qI|uu z$d$RBMx$i!_g2c98*G?|%4UXXJG74}Q^JN^m%5CBaSq6n!Ht_`j=yU24ulv7%C^au z8&k*3Gft~(94(S|D_7@uS(Jt=dw-VxJ)@e+uarFaAKVKW7h$*%HXZnF``rYHuc6VaFG?1(b25cU z@q3>!tiEabN5PHXi8U!cPXAWrzNIHua*FWK=qH|W&NhBT7HiXgr%IYx$d8MU4|wCG z*G#?pS>wSkI&Z~0Y5W<1vs7?zQuse>@yI%TO6?B`nrVhi@dA!Bf(nV*TOcFT(>NQC zPu`;R3b>bpwg~6ftuQ`!j+(VlWO_iH=jWK4q)DUGKzcz<&O9|kuXY>ulI53P>Htff=mwJDDb+Q;cl(C>gQbQl*`9-pGs@tJ98u+Zxe+mV2I zvWVEOarFuB<|k2RNaTI)@8U<)Uv~N^uz5DDh1eeTVCcnmETZe}8hN&#|m z)xx}R%(>3lk|O0?hmHG;;>rmg+SKc-WHu3jzv7w|A5!YsbEWoJ$>^NAx*lCN%AB)% z*I}P3_{Yr2msJaKdX0YRS7DAAZq?BGUUXCLdpiRoh>29__z9{6$jU_QP^Y+}R09ux zgm<)^mD&NrR@h{PZs)u~O*F%1UQ_tbSQL|~>t|3U6~)2hBPYbA&P2sMcEydfdmw8v zo=y9*b$F)CxFzJC;uOBbZzhR9!RAHk32&;T#T+~fLoehCTyaz_#Qcz~$YXP{kfloY zVcuo>(v57@>7dzD~A7VJ8Mt#wd8 z0E#3)B?wk>18RCe;S#9M0wrjm&JGk4{vH*RjcY#xXBNPj1#o78Ayk7i3%~1`g##-P uoAa#!n$h+_Lfo27u~pIB{Qm(_yV-jH literal 0 HcmV?d00001 diff --git a/assets/image/3x/write_off_bg.webp b/assets/image/3x/write_off_bg.webp new file mode 100644 index 0000000000000000000000000000000000000000..7a201a300e88fbacedb8d8123a5e64452efbc809 GIT binary patch literal 35157 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 M+FRcDdhN-71AgXC }); setState(() {}); - // Navigator.of(context).pushNamed( '/router/eom'); }, ); }, diff --git a/lib/community/community_details.dart b/lib/community/community_details.dart index 30731e72..6c918b2f 100644 --- a/lib/community/community_details.dart +++ b/lib/community/community_details.dart @@ -17,8 +17,6 @@ import 'package:huixiang/web/web_view/comment_list.dart'; import 'package:huixiang/web/web_view/input_comment.dart'; import 'package:shared_preferences/shared_preferences.dart'; -import '../web/web_view/input_comment_o.dart'; - class CommunityDetails extends StatefulWidget { final Map arguments; @@ -60,7 +58,7 @@ class _CommunityDetails extends State void didChangeMetrics() { WidgetsBinding.instance.addPostFrameCallback((_) { - // isKeyBoardShow = MediaQuery.of(context).viewInsets.bottom > 0; + isKeyBoardShow = MediaQuery.of(context).viewInsets.bottom > 0; if (!mounted) return; if (MediaQuery.of(context).viewInsets.bottom == 0) { if (isKeyBoardShow) { @@ -108,7 +106,7 @@ class _CommunityDetails extends State void _focusNodeListener() { /*if (_focusNode.hasFocus || _focusNode.consumeKeyboardToken()){ setState(() { - smileyPadGone = true; + emojiShowing = false; }); }*/ } @@ -161,9 +159,9 @@ class _CommunityDetails extends State @override Widget build(BuildContext context) { double h = MediaQuery.of(context).viewInsets.bottom; - if(h > 0 && keyboard <= 0) { + if(h > 0 && keyboard < h) { + keyboard = h; setState(() { - keyboard = h; }); } return GestureDetector( @@ -176,6 +174,7 @@ class _CommunityDetails extends State }); }, child: Scaffold( + // resizeToAvoidBottomInset: false, appBar: MyAppBar( title: S.of(context).dongtaixiangqing, titleColor: Colors.black, diff --git a/lib/community/community_page.dart b/lib/community/community_page.dart index d767da25..61a91406 100644 --- a/lib/community/community_page.dart +++ b/lib/community/community_page.dart @@ -79,6 +79,7 @@ class _CommunityPage extends State return Scaffold( appBar: MyAppBar( leading: false, + centerTitle: true, titleChild: PreferredSize( preferredSize: Size( MediaQuery.of(context).size.width - 60.w, diff --git a/lib/community/community_view/class_details_video.dart b/lib/community/community_view/class_details_video.dart index 995b5ff6..e34f7516 100644 --- a/lib/community/community_view/class_details_video.dart +++ b/lib/community/community_view/class_details_video.dart @@ -139,7 +139,7 @@ class ClassDetailsVideoState extends State { color: Colors.black, width: width, height:MediaQuery.of(context).size.width / 1.5, - margin: EdgeInsets.only(top: MediaQuery.of(context).padding.top), + // margin: EdgeInsets.only(top: MediaQuery.of(context).padding.top), child: chewies = Chewie( controller: chewieAudioController, ), @@ -147,7 +147,7 @@ class ClassDetailsVideoState extends State { : Container( width: width, height:MediaQuery.of(context).size.width / 1.5, - margin: EdgeInsets.only(top: MediaQuery.of(context).padding.top), + // margin: EdgeInsets.only(top: MediaQuery.of(context).padding.top), )), if (widget.isShowImg) GestureDetector( @@ -161,7 +161,7 @@ class ClassDetailsVideoState extends State { child: Container( width: width, height: MediaQuery.of(context).size.width / 1.5, - margin: EdgeInsets.only(top: MediaQuery.of(context).padding.top), + // margin: EdgeInsets.only(top: MediaQuery.of(context).padding.top), color: Colors.black, child: Stack( children: [ diff --git a/lib/community/community_view/home_class.dart b/lib/community/community_view/home_class.dart index 2649c8ab..d8f8c2ad 100644 --- a/lib/community/community_view/home_class.dart +++ b/lib/community/community_view/home_class.dart @@ -67,7 +67,7 @@ class _HomeClass extends State { ), ), Container( - height: 195, + height: 195.h, margin: EdgeInsets.only(top: 10.h), child: ListView.builder( scrollDirection: Axis.horizontal, diff --git a/lib/community/new_community_details.dart b/lib/community/new_community_details.dart index f005b3e2..5b904034 100644 --- a/lib/community/new_community_details.dart +++ b/lib/community/new_community_details.dart @@ -175,7 +175,7 @@ class _NewCommunityDetails extends State with WidgetsBindin @override Widget build(BuildContext context) { double h = MediaQuery.of(context).viewInsets.bottom; - if(h > 0 && keyboard <= 0) { + if(h > 0 && keyboard with AutomaticKeepAliveClientMixin { ///活动海报弹窗 posterShowAlertDialog(ActivityPos activityPos) { + var today = DateTime.now().day; SharedPreferences.getInstance().then((value) { - if((value.getString("ActivityPosCode") ?? "").contains("${activityPos.code}_${value.getString("userId")};")) + if(value.getInt("today")==today && (value.getString("ActivityPosCode") ?? "").contains("${activityPos.code}_${value.getString("userId")};")) return; value.setString("ActivityPosCode", "${(value.getString("ActivityPosCode")??"")}${activityPos.code}_${value.getString("userId")};"); + value.setInt("today", today); //显示对话框 showDialog( context: context, diff --git a/lib/main.dart b/lib/main.dart index 49f8b9ed..99a6c6eb 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -199,7 +199,7 @@ class MyApp extends StatelessWidget { } else if (locales[0].countryCode == "CN"){ locale = Locale.fromSubtags(languageCode: 'zh', countryCode: 'CH'); } else{ - locale = Locale.fromSubtags(languageCode: 'en', countryCode: 'US'); + locale = Locale.fromSubtags(languageCode: 'en', countryCode: 'CH'); } return appLocale ?? locale; }, diff --git a/lib/mine/vip_pay_code.dart b/lib/mine/vip_pay_code.dart index 63f18fe4..60305ceb 100644 --- a/lib/mine/vip_pay_code.dart +++ b/lib/mine/vip_pay_code.dart @@ -1,3 +1,4 @@ +import 'dart:async'; import 'dart:convert'; import 'package:barcode_widget/barcode_widget.dart'; @@ -39,7 +40,6 @@ class _VipPayCode extends State { void dispose() { super.dispose(); refreshController.dispose(); - Location.getInstance().stopLocation(); } @override @@ -51,6 +51,8 @@ class _VipPayCode extends State { UserInfo userInfo; final RefreshController refreshController = RefreshController(); bool vipCodeText = false; + Timer _timer; + bool isDispose = false; ///查询用户信息 queryUser() async { @@ -67,185 +69,122 @@ class _VipPayCode extends State { refreshController.refreshFailed();}); if (baseData != null && baseData.isSuccess) { userInfo = baseData.data; + SharedPreferences.getInstance().then((value) => { + value.setString('user', jsonEncode(baseData.data)), + }); setState(() {}); - SharedPreferences.getInstance().then((value) => { - value.setString('user', jsonEncode(baseData.data)), - }); refreshController.refreshCompleted(); }else{ refreshController.refreshFailed(); } }finally{ - setState((){}); + refreshCode(); } } + refreshCode(){ + if (_timer != null) return; + const oneSec = const Duration(minutes: 2); + var callback = ((timer) { + if (isDispose) return; + queryUser(); + }); + _timer = Timer.periodic(oneSec, callback); + } + @override Widget build(BuildContext context) { return Scaffold( appBar: MyAppBar( title: "会员码", - background: Colors.white, - titleColor: Colors.black, + background: Color(0xFF32A060), + titleColor: Colors.white, brightness: Brightness.dark, - leadingColor: Colors.black, + leadingColor: Colors.white, ), - body: SmartRefresher( - controller: refreshController, - enablePullDown: true, - enablePullUp: false, - header: MyHeader(), - physics: BouncingScrollPhysics(), - onRefresh: () { - queryUser(); - }, - child: SingleChildScrollView( - child: Container( - color: Colors.white, - padding: EdgeInsets.only(top: 45.h), - child: Stack( - alignment: Alignment.topCenter, - children: [ - Container( - padding: EdgeInsets.only(top: 50.h), - child: Container( - width: double.infinity, - margin: EdgeInsets.symmetric(horizontal: 14.w), - padding: EdgeInsets.only(top: 68.h, bottom: 16.h), - decoration: BoxDecoration( - color: Color(0xFF32A060), - boxShadow: [ - BoxShadow( - color: Colors.black.withAlpha(12), - offset: Offset(0, 2), - blurRadius: 14, - spreadRadius: 0, - ), - ], - borderRadius: BorderRadius.circular(6), + body: Container( + color: Color(0xFF32A060), + height: double.infinity, + padding: EdgeInsets.only(top: 45.h), + child: Stack( + alignment: Alignment.topCenter, + children: [ + Container( + color: Color(0xFF32A060), + // height: 485.h, + padding: EdgeInsets.only(top: 47.h), + child: Container( + height: 438.h, + width: double.infinity, + decoration: BoxDecoration( + color: Colors.white, + boxShadow: [ + BoxShadow( + color: Colors.black.withAlpha(12), + offset: Offset(0, 2), + blurRadius: 14, + spreadRadius: 0, ), - child: Container( - width: double.infinity, - decoration: BoxDecoration( - color: Colors.white, - boxShadow: [ - BoxShadow( - color: Colors.black.withAlpha(12), - offset: Offset(0, 2), - blurRadius: 14, - spreadRadius: 0, - ), - ], - borderRadius: BorderRadius.circular(6), - ), - margin: EdgeInsets.symmetric(horizontal: 16.w), - padding: EdgeInsets.only( - top: 46.h, left:16.w, right: 15.w, bottom: 79.h), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - GestureDetector( - onTap: (){ - setState(() { - vipCodeText = !vipCodeText; - }); - }, - child: - vipCodeText ? Text( - userInfo != null - ? "${(userInfo?.vipNo ?? "").substring(0, 4)} " - "${(userInfo?.vipNo ?? "").substring(4, 8)} " - "${(userInfo?.vipNo ?? "").substring(8, 12)} " - "${(userInfo?.vipNo ?? "").substring(12, 16)} " - "${(userInfo?.vipNo ?? "").substring(16, (userInfo?.vipNo ?? "").length)}" - : "", - style: TextStyle( - fontSize: 14.sp, - wordSpacing: userInfo == null - ? 10 - : (MediaQuery.of(context).size.width - 64.w) / - ((((userInfo?.vipNo ?? "") - .length) * - 4)), - letterSpacing: userInfo == null - ? 8 - : (MediaQuery.of(context).size.width - 64.w) / - ((((userInfo?.vipNo ?? "") - .length) * - 4)), - fontWeight: MyFontWeight.semi_bold, - color: Color(0xFF353535), - ), - ) - :Text( - "轻触可查看会员码数字", - style: TextStyle( - fontWeight: MyFontWeight.medium, - fontSize: 13.sp, - color: Color(0xFFCACACA), - ), - ), - ), - SizedBox( - height: 12.h, - ), - BarcodeWidget( - barcode: Barcode.code128(useCode128C: true), - data: - userInfo != null ? userInfo?.vipNo : "", - height: 72.h, - color: Colors.black, - drawText: false, - ), - SizedBox( - height: 16.h, - ), - QrImage( - data: userInfo != null - ? (userInfo?.vipNo ?? "") - : "", - version: QrVersions.auto, - size: 200.w, - gapless: true, - ), - ], - ), - ), - ), + ], + borderRadius: BorderRadius.circular(6), ), - Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(56), - color: Colors.white, - border: Border.all( - color: Colors.white, - width: 8.w, - ), - ), - child: Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(56), - color: Colors.white, - border: Border.all( - color: Color(0xFF32A060), - width: 2.w, + margin: EdgeInsets.symmetric(horizontal: 16.w,), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + SizedBox(height: 46.h,), + Text( + "请保持屏幕常亮，并对准扫码盒或枪口", + style: TextStyle( + fontWeight: MyFontWeight.regular, + fontSize: 12.sp, + color: Color(0xFF4D4D4D), ), ), - child: MImage( - userInfo?.headimg ?? "", - width: 80, - height: 80, - radius: BorderRadius.circular(56), - fit: BoxFit.cover, - errorSrc: "assets/image/default_1.webp", - fadeSrc: "assets/image/default_1.webp", + SizedBox(height: 30.h,), + QrImage( + data: userInfo != null + ? (userInfo?.vipScanNo ?? "") + : "", + version: QrVersions.auto, + size: 200.w, + gapless: true, ), + ], + ), + ), + ), + Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(56), + color: Color(0xFF32A060), + border: Border.all( + color: Color(0xFF32A060), + width: 8.w, + ), + ), + child: Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(56), + color: Colors.white, + border: Border.all( + color: Colors.white, + width: 2.w, ), ), - ], + child: MImage( + userInfo?.headimg ?? "", + width: 80, + height: 80, + radius: BorderRadius.circular(56), + fit: BoxFit.cover, + errorSrc: "assets/image/default_1.webp", + fadeSrc: "assets/image/default_1.webp", + ), + ), ), - ), + ], ), ), ); diff --git a/lib/order/write_off_page.dart b/lib/order/write_off_page.dart index 26ec1c5e..9eba17ea 100644 --- a/lib/order/write_off_page.dart +++ b/lib/order/write_off_page.dart @@ -3,6 +3,7 @@ import 'dart:convert'; import 'package:barcode_widget/barcode_widget.dart'; import 'package:dio/dio.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_html/flutter_html.dart'; import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/retrofit/data/base_data.dart'; @@ -13,9 +14,13 @@ import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:huixiang/view_widget/separator.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:pull_to_refresh/pull_to_refresh.dart'; import 'package:qr_flutter/qr_flutter.dart'; import 'package:shared_preferences/shared_preferences.dart'; +import '../view_widget/classic_header.dart'; +import '../view_widget/my_footer.dart'; + class WriteOffPage extends StatefulWidget { final arguments; @@ -31,6 +36,7 @@ class _WriteOffPage extends State { dynamic coupon; ApiService apiService; CouponDetail queryCoupon; + final RefreshController refreshController = RefreshController(); @override void initState() { @@ -79,248 +85,495 @@ class _WriteOffPage extends State { background: Color(0xFF32A060), leadingColor: Colors.white, ), - body: Container( - alignment: Alignment.topCenter, - child: Stack( - alignment: Alignment.topCenter, - children: [ - Image.asset( - "assets/image/icon_write_off_bg.webp", - width: MediaQuery.of(context).size.width * 0.912, - fit: BoxFit.fill, - ), - LayoutBuilder(builder: (context, constraints) { - return Container( - width: constraints.constrainWidth() * 0.912, - child: Column( - children: [ - Expanded( - child: Container( - child: Column( - children: [ - Text( - coupon != null ? coupon["couponName"] : "", - style: TextStyle( - fontSize: 16.sp, - fontWeight: FontWeight.bold, - color: Color(0xFF353535)), - ), - SizedBox( - height: 8.h, - ), - Text( - (coupon["useStartTime"] == null || coupon["useEndTime"] == null) ? "" : S.of(context).youxiaoqi( - "${coupon["useStartTime"].replaceAll("-", ".").split(" ")[0]}-${coupon["useEndTime"].replaceAll("-", ".").split(" ")[0]}"), - style: TextStyle( - fontSize: 12.sp, - color: Color(0xFF353535), - ), - ), - ], - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - ), - alignment: Alignment.center, - ), - flex: 6, - ), - Container( - margin: EdgeInsets.only(left: 20.w, right: 20.w), - child: MySeparator( - width: 5.w, - height: 1.h, - color: Color(0xFFA29E9E), + body: SmartRefresher( + controller: refreshController, + enablePullDown: false, + enablePullUp: false, + header: MyHeader(), + footer: CustomFooter( + builder: (context, mode) { + return MyFooter(mode); + }, + ), + physics: BouncingScrollPhysics(), + scrollController: ScrollController(), + child: Container( + child: SingleChildScrollView( + physics: BouncingScrollPhysics(), + child: Column( + children: [ + Container( + alignment: Alignment.topCenter, + height: 530.h, + child: Stack( + alignment: Alignment.topCenter, + children: [ + Image.asset( + "assets/image/write_off_bg.webp", + width: MediaQuery.of(context).size.width * 0.912, + height: 540.h, + fit: BoxFit.fill, ), - ), - Expanded( - child: Container( - alignment: Alignment.center, - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Text( - coupon != null - ? "${coupon["memberCouponId"].substring(0, 4)} " - "${coupon["memberCouponId"].substring(4, 8)} " - "${coupon["memberCouponId"].substring(8, 12)} " - "${coupon["memberCouponId"].substring(12, 16)} " - "${coupon["memberCouponId"].substring(16, coupon["memberCouponId"].length)}" - : "", - style: TextStyle( - fontSize: 14.sp, - wordSpacing: coupon == null - ? 10 - : (MediaQuery.of(context).size.width - - 64.w) / - (((coupon["memberCouponId"].length) * 4)), - letterSpacing: coupon == null - ? 8 - : (MediaQuery.of(context).size.width - - 64.w) / - (((coupon["memberCouponId"].length) * 4)), - fontWeight: MyFontWeight.semi_bold, - color: Color(0xFF353535), + LayoutBuilder(builder: (context, constraints) { + return Container( + alignment: Alignment.center, + width: constraints.constrainWidth() * 0.912, + padding:EdgeInsets.only(top: 24.h), + child: Column( + children: [ + Container( + child: Column( + children: [ + Text( + coupon != null ? coupon["couponName"] : "", + style: TextStyle( + fontSize: 16.sp, + fontWeight: FontWeight.bold, + color: Color(0xFF353535)), + ), + SizedBox( + height:11.h, + ), + Text( + (coupon["useStartTime"] == null || coupon["useEndTime"] == null) ? "" : S.of(context).youxiaoqi( + "${coupon["useStartTime"].replaceAll("-", ".").split(" ")[0]}-${coupon["useEndTime"].replaceAll("-", ".").split(" ")[0]}"), + style: TextStyle( + fontSize: 12.sp, + color: Color(0xFF353535), + ), + ), + ], + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + ), + alignment: Alignment.center, ), - ), - SizedBox( - height: 12.h, - ), - BarcodeWidget( - barcode: Barcode.code128(useCode128C: true), - data: coupon != null ? coupon["memberCouponId"] : "", - height: 72.h, - color: Colors.black, - drawText: false, - ), - SizedBox( - height: 16.h, - ), - Expanded(child: QrImage( - data: "{\"type\":\"wiped\",\"memberCouponId\":\"${coupon["memberCouponId"]}\"}", - version: QrVersions.auto, - size: 200.w, - gapless: true, - ),), - SizedBox( - height: 35.h, - ), - ], - ), - margin: EdgeInsets.symmetric(horizontal: 20.w), - ), - flex: 27, - ), - Container( - child: MySeparator( - width: 5.w, - height: 1.h, - color: Color(0xFFA29E9E), - ), - margin: EdgeInsets.only(left: 20.w, right: 20.w), - ), - Expanded( - child: Container( - padding: EdgeInsets.fromLTRB(20.w, 15.h, 20.w, 15.h), - child: Column( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Container( - width: 3.w, - height: 15.h, - margin: - EdgeInsets.fromLTRB(4.w, 7.h, 4.w, 7.h), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(3), - color: Color(0xFF20662A), - ), + Container( + margin: EdgeInsets.only(left: 20.w, right: 20.w,top:16.h,bottom:30.h), + child: MySeparator( + width: 5.w, + height: 1.h, + color: Color(0xFFA29E9E), ), - Text( - S.of(context).shiyongtiaojian, - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 14.sp, - color: Color(0xFF353535), + ), + Expanded( + child: Container( + alignment: Alignment.center, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Text( + coupon != null + ? "${coupon["memberCouponId"].substring(0, 4)} " + "${coupon["memberCouponId"].substring(4, 8)} " + "${coupon["memberCouponId"].substring(8, 12)} " + "${coupon["memberCouponId"].substring(12, 16)} " + "${coupon["memberCouponId"].substring(16, coupon["memberCouponId"].length)}" + : "", + style: TextStyle( + fontSize: 14.sp, + wordSpacing: coupon == null + ? 10 + : (MediaQuery.of(context).size.width - + 64.w) / + (((coupon["memberCouponId"].length) * 4)), + letterSpacing: coupon == null + ? 8 + : (MediaQuery.of(context).size.width - + 64.w) / + (((coupon["memberCouponId"].length) * 4)), + fontWeight: MyFontWeight.semi_bold, + color: Color(0xFF353535), + ), + ), + SizedBox( + height: 15.h, + ), + BarcodeWidget( + barcode: Barcode.code128(useCode128C: true), + data: coupon != null ? coupon["memberCouponId"] : "", + height: 72.h, + color: Colors.black, + drawText: false, + ), + SizedBox( + height: 16.h, + ), + Expanded(child: QrImage( + data: "{\"type\":\"wiped\",\"memberCouponId\":\"${coupon["memberCouponId"]}\"}", + version: QrVersions.auto, + size: 200.w, + gapless: true, + ),), + SizedBox( + height: 35.h, + ), + ], ), + margin: EdgeInsets.symmetric(horizontal: 20.w), ), - ], - ), - Row( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - SizedBox( - width: 11.w, - ), - Expanded( - child: Text( - S - .of(context) - .qianwanghuixiangmendianduihuanhexiao, - style: TextStyle( - textBaseline: TextBaseline.alphabetic, - fontSize: 14.sp, - color: Color(0xFF353535)), - ), - flex: 1, + flex: 27, + ), + Container( + child: MySeparator( + width: 5.w, + height: 1.h, + color: Color(0xFFA29E9E), ), - ], + margin: EdgeInsets.only(left: 20.w, right: 20.w,bottom:20.h), + ), + ], + ), + ); + }), + //原版本样式 + // LayoutBuilder(builder: (context, constraints) { + // return Container( + // width: constraints.constrainWidth() * 0.912, + // child: Column( + // children: [ + // Expanded( + // child: Container( + // child: Column( + // children: [ + // Text( + // coupon != null ? coupon["couponName"] : "", + // style: TextStyle( + // fontSize: 16.sp, + // fontWeight: FontWeight.bold, + // color: Color(0xFF353535)), + // ), + // SizedBox( + // height: 8.h, + // ), + // Text( + // (coupon["useStartTime"] == null || coupon["useEndTime"] == null) ? "" : S.of(context).youxiaoqi( + // "${coupon["useStartTime"].replaceAll("-", ".").split(" ")[0]}-${coupon["useEndTime"].replaceAll("-", ".").split(" ")[0]}"), + // style: TextStyle( + // fontSize: 12.sp, + // color: Color(0xFF353535), + // ), + // ), + // ], + // mainAxisAlignment: MainAxisAlignment.center, + // crossAxisAlignment: CrossAxisAlignment.center, + // ), + // alignment: Alignment.center, + // ), + // flex: 6, + // ), + // Container( + // margin: EdgeInsets.only(left: 20.w, right: 20.w), + // child: MySeparator( + // width: 5.w, + // height: 1.h, + // color: Color(0xFFA29E9E), + // ), + // ), + // Expanded( + // child: Container( + // alignment: Alignment.center, + // child: Column( + // mainAxisAlignment: MainAxisAlignment.center, + // crossAxisAlignment: CrossAxisAlignment.center, + // children: [ + // SizedBox(height: 5.h,), + // Text( + // coupon != null + // ? "${coupon["memberCouponId"].substring(0, 4)} " + // "${coupon["memberCouponId"].substring(4, 8)} " + // "${coupon["memberCouponId"].substring(8, 12)} " + // "${coupon["memberCouponId"].substring(12, 16)} " + // "${coupon["memberCouponId"].substring(16, coupon["memberCouponId"].length)}" + // : "", + // style: TextStyle( + // fontSize: 14.sp, + // wordSpacing: coupon == null + // ? 10 + // : (MediaQuery.of(context).size.width - + // 64.w) / + // (((coupon["memberCouponId"].length) * 4)), + // letterSpacing: coupon == null + // ? 8 + // : (MediaQuery.of(context).size.width - + // 64.w) / + // (((coupon["memberCouponId"].length) * 4)), + // fontWeight: MyFontWeight.semi_bold, + // color: Color(0xFF353535), + // ), + // ), + // SizedBox( + // height: 12.h, + // ), + // BarcodeWidget( + // barcode: Barcode.code128(useCode128C: true), + // data: coupon != null ? coupon["memberCouponId"] : "", + // height: 72.h, + // color: Colors.black, + // drawText: false, + // ), + // SizedBox( + // height: 16.h, + // ), + // Expanded(child: QrImage( + // data: "{\"type\":\"wiped\",\"memberCouponId\":\"${coupon["memberCouponId"]}\"}", + // version: QrVersions.auto, + // size: 200.w, + // gapless: true, + // ),), + // SizedBox( + // height: 35.h, + // ), + // ], + // ), + // margin: EdgeInsets.symmetric(horizontal: 20.w), + // ), + // flex: 27, + // ), + // Container( + // child: MySeparator( + // width: 5.w, + // height: 1.h, + // color: Color(0xFFA29E9E), + // ), + // margin: EdgeInsets.only(left: 20.w, right: 20.w), + // ), + // Expanded( + // child: Container( + // padding: EdgeInsets.fromLTRB(20.w, 15.h, 20.w, 15.h), + // child: Column( + // mainAxisAlignment: MainAxisAlignment.spaceBetween, + // crossAxisAlignment: CrossAxisAlignment.center, + // children: [ + // Row( + // mainAxisAlignment: MainAxisAlignment.start, + // crossAxisAlignment: CrossAxisAlignment.center, + // children: [ + // Container( + // width: 3.w, + // height: 15.h, + // margin: + // EdgeInsets.fromLTRB(4.w, 7.h, 4.w, 7.h), + // decoration: BoxDecoration( + // borderRadius: BorderRadius.circular(3), + // color: Color(0xFF20662A), + // ), + // ), + // Text( + // S.of(context).shiyongtiaojian, + // style: TextStyle( + // fontWeight: FontWeight.bold, + // fontSize: 14.sp, + // color: Color(0xFF353535), + // ), + // ), + // ], + // ), + // Row( + // mainAxisAlignment: MainAxisAlignment.start, + // crossAxisAlignment: CrossAxisAlignment.center, + // children: [ + // SizedBox( + // width: 11.w, + // ), + // Expanded( + // child: Text( + // S + // .of(context) + // .qianwanghuixiangmendianduihuanhexiao, + // style: TextStyle( + // textBaseline: TextBaseline.alphabetic, + // fontSize: 14.sp, + // color: Color(0xFF353535)), + // ), + // flex: 1, + // ), + // ], + // ), + // Row( + // mainAxisAlignment: MainAxisAlignment.start, + // crossAxisAlignment: CrossAxisAlignment.center, + // children: [ + // Container( + // width: 3.w, + // height: 15.h, + // margin: EdgeInsets.fromLTRB(4, 7, 4, 7), + // decoration: BoxDecoration( + // borderRadius: BorderRadius.circular(3), + // color: Color(0xFF20662A), + // ), + // ), + // Text( + // S.of(context).shiyongshuoming, + // style: TextStyle( + // fontWeight: FontWeight.bold, + // fontSize: 14.sp, + // color: Color(0xFF353535)), + // ), + // ], + // ), + // Row( + // mainAxisAlignment: MainAxisAlignment.start, + // crossAxisAlignment: CrossAxisAlignment.center, + // children: [ + // SizedBox( + // width: 11.w, + // ), + // Text( + // S.of(context).zitiduihuanquan, + // style: TextStyle( + // textBaseline: TextBaseline.alphabetic, + // fontSize: 14.sp, + // color: Color(0xFF353535), + // ), + // ), + // ], + // ), + // Row( + // mainAxisAlignment: MainAxisAlignment.start, + // crossAxisAlignment: CrossAxisAlignment.center, + // children: [ + // SizedBox( + // width: 11.w, + // ), + // Text( + // S.of(context).huixiangrenyimendian, + // style: TextStyle( + // textBaseline: TextBaseline.alphabetic, + // fontSize: 14.sp, + // color: Color(0xFF353535), + // ), + // ), + // ], + // ), + // ], + // ), + // ), + // flex: 13, + // ), + // Expanded( + // child: Container(), + // flex: 3, + // ), + // ], + // ), + // ); + // }) + ], + ), + ), + Container( + width: MediaQuery.of(context).size.width * 0.912, + padding: EdgeInsets.only(left:18.w, bottom:15.h, right:18.w), + margin:EdgeInsets.only(bottom: 21.h), + decoration: BoxDecoration( + borderRadius: BorderRadius.only( + bottomLeft: Radius.circular(6), + bottomRight: Radius.circular(6),), + color: Colors.white, + boxShadow: [ + BoxShadow( + color: Color(0x08213303).withAlpha(12), + offset: Offset(0, 2), + blurRadius: 3, + spreadRadius: 0, + ), + ], + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + width: 3.w, + height: 15.h, + margin: + EdgeInsets.fromLTRB(4.w, 7.h, 4.w, 7.h), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(3), + color: Color(0xFF20662A), ), - Row( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Container( - width: 3.w, - height: 15.h, - margin: EdgeInsets.fromLTRB(4, 7, 4, 7), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(3), - color: Color(0xFF20662A), - ), - ), - Text( - S.of(context).shiyongshuoming, - style: TextStyle( - fontWeight: FontWeight.bold, - fontSize: 14.sp, - color: Color(0xFF353535)), - ), - ], + ), + Text( + S.of(context).shiyongtiaojian, + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 14.sp, + color: Color(0xFF353535), ), - Row( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - SizedBox( - width: 11.w, - ), - Text( - S.of(context).zitiduihuanquan, - style: TextStyle( - textBaseline: TextBaseline.alphabetic, - fontSize: 14.sp, - color: Color(0xFF353535), - ), - ), - ], + ), + ], + ), + SizedBox(height:12.h,), + Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + SizedBox( + width: 11.w, + ), + Expanded( + child: Text( + S + .of(context) + .qianwanghuixiangmendianduihuanhexiao, + style: TextStyle( + textBaseline: TextBaseline.alphabetic, + fontSize: 14.sp, + height: 1.5.h, + color: Color(0xFF353535)), ), - Row( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - SizedBox( - width: 11.w, - ), - Text( - S.of(context).huixiangrenyimendian, - style: TextStyle( - textBaseline: TextBaseline.alphabetic, - fontSize: 14.sp, - color: Color(0xFF353535), - ), - ), - ], + flex: 1, + ), + ], + ), + SizedBox(height:16.h,), + Row( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Container( + width: 3.w, + height: 15.h, + margin: EdgeInsets.fromLTRB(4.w, 7.h, 4.w, 7.h), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(3), + color: Color(0xFF20662A), ), - ], - ), + ), + Text( + S.of(context).shiyongshuoming, + style: TextStyle( + fontWeight: FontWeight.bold, + fontSize: 14.sp, + color: Color(0xFF353535)), + ), + ], ), - flex: 13, - ), - Expanded( - child: Container(), - flex: 3, - ), - ], - ), - ); - }) - ], + Container( + child: Html( + data: + coupon != null ? coupon["remark"] : "", + customImageRenders: { + networkSourceMatcher(): networkImageRender( + loadingWidget: () { + return Container(); + }, + ), + }, + ), + ) + ], + ), + ) + ], + ), + ), ), ), ); diff --git a/lib/retrofit/data/user_info.dart b/lib/retrofit/data/user_info.dart index 4b412eac..b3015f2b 100644 --- a/lib/retrofit/data/user_info.dart +++ b/lib/retrofit/data/user_info.dart @@ -20,6 +20,7 @@ class UserInfo { UserInfo(); String vipNo; + String vipScanNo; String nickname; String headimg; bool userType; @@ -54,6 +55,7 @@ class UserInfo { factory UserInfo.fromJson(Map json) => UserInfo() ..vipNo = json['vipNo'] as String + ..vipScanNo =json['vipScanNo'] as String ..nickname = json['nickname'] as String ..headimg = json['headimg'] as String ..userType = json['userType'] as bool @@ -87,6 +89,7 @@ class UserInfo { Map toJson() => { 'vipNo': this.vipNo, + 'vipScanNo':this.vipScanNo, 'nickname': this.nickname, 'headimg': this.headimg, 'userType': this.userType, diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart index f7e60731..7e9d7012 100644 --- a/lib/retrofit/min_api.dart +++ b/lib/retrofit/min_api.dart @@ -26,7 +26,7 @@ import 'data/shopping_home_config.dart'; part 'min_api.g.dart'; -const localBaseUrl = "http://192.168.10.78:8765/app/";///本地 +const localBaseUrl = "http://192.168.10.129:8765/app/";///本地 // const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地 const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上 diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index 06429ed5..d0cbdfe8 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -64,7 +64,7 @@ import 'data/wx_pay.dart'; part 'retrofit_api.g.dart'; -const localBaseUrl = "http://192.168.10.78:8766/app/";///本地 +const localBaseUrl = "http://192.168.10.129:8766/app/";///本地 // const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地 const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上 @@ -497,7 +497,7 @@ abstract class ApiService { Future wiped(@Path("memberCouponId") String memberCouponId); ///查询优惠券详情 - @GET("/coupon/detail/") + @GET("/coupon/detail/{memberCouponId}") Future> couponDetail(@Path("") String memberCouponId); ///查询会员信息 diff --git a/lib/retrofit/retrofit_api.g.dart b/lib/retrofit/retrofit_api.g.dart index 9d5c20d7..49509dc2 100644 --- a/lib/retrofit/retrofit_api.g.dart +++ b/lib/retrofit/retrofit_api.g.dart @@ -1862,7 +1862,7 @@ class _ApiService implements ApiService { const _extra = {}; final queryParameters = {}; final _data = {}; - final _result = await _dio.request>('coupon/detail/', + final _result = await _dio.request>('coupon/detail/$memberCouponId', queryParameters: queryParameters, options: RequestOptions( method: 'GET', diff --git a/lib/view_widget/mine_vip_entry.dart b/lib/view_widget/mine_vip_entry.dart index 2c6ae5a0..932d2bd1 100644 --- a/lib/view_widget/mine_vip_entry.dart +++ b/lib/view_widget/mine_vip_entry.dart @@ -81,10 +81,13 @@ class MineVipEntry extends StatelessWidget { } Widget widget = Container( + height:20.h, + width: double.infinity, child: Row( children: [ Container( - padding: EdgeInsets.symmetric(horizontal:4.w,vertical: 3.h), + height: double.infinity, + padding: EdgeInsets.symmetric(horizontal:3.w,vertical:4.h), decoration: BoxDecoration( color: logoColor, borderRadius: BorderRadius.only( @@ -102,12 +105,13 @@ class MineVipEntry extends StatelessWidget { child: Image.asset( "assets/image/mine_vip_logo.webp", fit: BoxFit.cover, - width: 13.w, - height: 11.h, + // width: 13.w, + // height: 11.h, ), ), Container( - padding: EdgeInsets.symmetric(horizontal:2.w,vertical:3.h), + height: double.infinity, + padding: EdgeInsets.symmetric(horizontal:3.w,vertical:3.h), decoration: BoxDecoration( color: levelTextBackdrop, borderRadius: BorderRadius.only( @@ -136,8 +140,8 @@ class MineVipEntry extends StatelessWidget { Image.asset( "assets/image/icon_right.webp", fit: BoxFit.cover, - width: 8.w, - height: 8.h, + width: 8, + height: 8, color: levelTextColor, ), ], diff --git a/lib/view_widget/my_appbar.dart b/lib/view_widget/my_appbar.dart index a464ca01..7a3ce7c5 100644 --- a/lib/view_widget/my_appbar.dart +++ b/lib/view_widget/my_appbar.dart @@ -16,6 +16,7 @@ class MyAppBar extends StatelessWidget implements PreferredSizeWidget { final Size preferredSize; final double toolbarHeight; final bool leading; + final bool centerTitle; final Brightness brightness; final Function exit; @@ -34,6 +35,7 @@ class MyAppBar extends StatelessWidget implements PreferredSizeWidget { this.titleSize = 18, this.brightness = Brightness.light, this.leading = true, + this.centerTitle = false, this.exit }) : preferredSize = Size.fromHeight(toolbarHeight ?? kToolbarHeight), super(key: key) { @@ -79,7 +81,7 @@ class MyAppBar extends StatelessWidget implements PreferredSizeWidget { ) : Container(), titleSpacing: 2, - centerTitle: false, + centerTitle: centerTitle, leadingWidth: leading ? 56 : 10.w, title: ((title == null || title == "") && titleChild != null) ? titleChild diff --git a/lib/vip/vip_view/vip_top.dart b/lib/vip/vip_view/vip_top.dart index 74fd97ff..54f11b73 100644 --- a/lib/vip/vip_view/vip_top.dart +++ b/lib/vip/vip_view/vip_top.dart @@ -717,8 +717,7 @@ class _VipTop extends State { topLeft: const Radius.circular(8.0), topRight: const Radius.circular(8.0))), child: Container( - // height: 230.h, - height: 160.h, + height: 230.h, child: Column( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.center, @@ -800,8 +799,6 @@ class _VipTop extends State { ), ), ), - if (widget?.vipCardHome?.cards[selectIndex]?.autoSubscribe ?? - false) GestureDetector( onTap: () { state(() { diff --git a/lib/web/web_page.dart b/lib/web/web_page.dart index aa53cb2a..148e141d 100644 --- a/lib/web/web_page.dart +++ b/lib/web/web_page.dart @@ -265,7 +265,7 @@ class _WebPage extends State with WidgetsBindingObserver { @override Widget build(BuildContext context) { double h = MediaQuery.of(context).viewInsets.bottom; - if(h > 0 && keyboard <= 0) { + if(h > 0 && keyboard < h) { setState(() { keyboard = h; }); diff --git a/lib/web/web_view/input_comment.dart b/lib/web/web_view/input_comment.dart index ad9d7513..4a11f1ae 100644 --- a/lib/web/web_view/input_comment.dart +++ b/lib/web/web_view/input_comment.dart @@ -221,13 +221,14 @@ class _InputComment extends State { Offstage( offstage: !widget.emojiShowing, child: SizedBox( - height: 250.h, + height: widget.keyboard == -1 ? 270 : widget.keyboard, + width: MediaQuery.of(context).size.width, child: EmojiPicker( textEditingController: widget.commentTextController, config: Config( columns: 7, - emojiSizeMax: 32 * (Platform.isIOS ? 1.30 : 1.0), + emojiSizeMax: 32 * (Platform.isIOS ? 1.10 : 1.0), verticalSpacing: 0, horizontalSpacing: 0, gridPadding: EdgeInsets.zero, @@ -249,7 +250,7 @@ class _InputComment extends State { textAlign: TextAlign.center, ), loadingIndicator: const SizedBox.shrink(), - tabIndicatorAnimDuration: kTabScrollDuration, + tabIndicatorAnimDuration: Duration(milliseconds: 0), categoryIcons: const CategoryIcons(), buttonMode: ButtonMode.MATERIAL, checkPlatformCompatibility: true, diff --git a/pubspec.lock b/pubspec.lock index 661bac50..fd60a0b3 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -113,6 +113,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.0.10" + emoji_picker_flutter: + dependency: "direct main" + description: + name: emoji_picker_flutter + url: "https://pub.dartlang.org" + source: hosted + version: "1.4.1" event_bus: dependency: "direct main" description: