From 5b87e560f8bc90b58dd1ea1292e26a9efaa55a40 Mon Sep 17 00:00:00 2001 From: wuqifeng <540416539@qq.com> Date: Wed, 15 May 2024 23:32:37 +0800 Subject: [PATCH] feat:导航栏视觉优化 --- lib/pages/login/forgetpwd/forget_password_home_page.dart | 233 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------- lib/pages/module/course_module_page.dart | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/pages/module/module_page.dart | 187 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- lib/pages/shop/exchane/exchange_lesson_page.dart | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------- lib/pages/tab/tab_page.dart | 4 ++-- lib/route/route.dart | 4 ++-- 6 files changed, 356 insertions(+), 391 deletions(-) create mode 100644 lib/pages/module/course_module_page.dart delete mode 100644 lib/pages/module/module_page.dart diff --git a/lib/pages/login/forgetpwd/forget_password_home_page.dart b/lib/pages/login/forgetpwd/forget_password_home_page.dart index a1af920..fc6d0f4 100644 --- a/lib/pages/login/forgetpwd/forget_password_home_page.dart +++ b/lib/pages/login/forgetpwd/forget_password_home_page.dart @@ -7,6 +7,7 @@ import 'package:wow_english/pages/login/loginpage/time_widget.dart'; import 'package:wow_english/pages/login/setpwd/set_pwd_page.dart'; import 'package:wow_english/utils/toast_util.dart'; +import '../../../common/widgets/we_app_bar.dart'; import 'bloc/forget_pwd_home_bloc.dart'; class ForgetPasswordHomePage extends StatelessWidget { @@ -50,136 +51,118 @@ class _ForgetPasswordHomePageView extends StatelessWidget { Widget _buildForgetPwdView() => BlocBuilder(builder: (context, state) { final bloc = BlocProvider.of(context); return Scaffold( + appBar: const WEAppBar(), body: Container( color: Colors.white, child: SafeArea( - child: Stack( - children: [ - SingleChildScrollView( - child: Padding( - padding: EdgeInsets.only(left: 49.w, right: 10.w), - child: Column( - children: [ - 34.verticalSpace, - Row( - children: [ - Image.asset( - 'wow_logo'.assetPng, - height: 49.w, - width: 83.5.h, - ), - 12.5.horizontalSpace, - Text( - '修改密码\n请输入您的手机号和验证码吧', - style: TextStyle(fontSize: 16.sp, color: const Color(0xFF666666)), - ) - ], - ), - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Expanded( - child: Column( - children: [ - 44.5.verticalSpace, - Row( - children: [ - Image.asset( - 'phone'.assetPng, - height: 45.h, - width: 35.w, - ), - 15.horizontalSpace, - Expanded( - child: TextFieldCustomerWidget( - height: 50.h, - hitText: '请输入当前手机号', - textInputType: TextInputType.phone, - bgImageName: 'Input_layer_up', - onChangeValue: (String value) { - bloc.add(PhoneNumChangeEvent()); - }, - controller: bloc.phoneNumController, - )) - ], - ), - 11.5.verticalSpace, - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Image.asset( - 'lock'.assetPng, - height: 34.h, - width: 31.w, - ), - 18.5.horizontalSpace, - Expanded( - child: TextFieldCustomerWidget( - hitText: '请输入验证码', - bgImageName: 'Input_layer_down', - onChangeValue: (String value) { - bloc.add(CheckCodeChangeEvent()); - }, - textInputType: TextInputType.emailAddress, - controller: bloc.checkNumController, - )), - 16.5.horizontalSpace, - TimerWidget( - pageType: 1, - canSendSms: bloc.canSendSms, - sendSmsEvent: () => bloc.add(SendSmsCodeEvent()), - ) - ], - ) - ], - )), - 2.verticalSpace, - Image.asset( - 'steven_bride'.assetPng, - height: 173.h, - width: 157.w, - ) - ], - ), - GestureDetector( - onTap: () { - if (bloc.canSetPwd) { - bloc.add(SetPassWordEvent()); - } - }, - child: Container( - decoration: BoxDecoration( - image: DecorationImage( - image: AssetImage(bloc.canSetPwd ? 'login_enter'.assetPng : 'login_enter_dis'.assetPng), - fit: BoxFit.fill), - ), - padding: EdgeInsets.symmetric(horizontal: 28.w, vertical: 14.h), - child: Text( - '确定', - style: TextStyle(fontSize: 16.sp, color: Colors.white), - ), - ), - ) - ], - ), + child: SingleChildScrollView( + child: Padding( + padding: EdgeInsets.only(left: 49.w, right: 10.w), + child: Column( + children: [ + Row( + children: [ + Image.asset( + 'wow_logo'.assetPng, + height: 49.w, + width: 83.5.h, + ), + 12.5.horizontalSpace, + Text( + '修改密码\n请输入您的手机号和验证码吧', + style: TextStyle(fontSize: 16.sp, color: const Color(0xFF666666)), + ) + ], ), - ), - Container( - padding: EdgeInsets.only(top: 16.h), - alignment: Alignment.topLeft, - child: IconButton( - onPressed: () { - Navigator.pop(context); - }, - icon: Image.asset( - 'back_around'.assetPng, - width: 40.w, - height: 40.h, - ) + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Expanded( + child: Column( + children: [ + 44.5.verticalSpace, + Row( + children: [ + Image.asset( + 'phone'.assetPng, + height: 45.h, + width: 35.w, + ), + 15.horizontalSpace, + Expanded( + child: TextFieldCustomerWidget( + height: 50.h, + hitText: '请输入当前手机号', + textInputType: TextInputType.phone, + bgImageName: 'Input_layer_up', + onChangeValue: (String value) { + bloc.add(PhoneNumChangeEvent()); + }, + controller: bloc.phoneNumController, + )) + ], + ), + 11.5.verticalSpace, + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Image.asset( + 'lock'.assetPng, + height: 34.h, + width: 31.w, + ), + 18.5.horizontalSpace, + Expanded( + child: TextFieldCustomerWidget( + hitText: '请输入验证码', + bgImageName: 'Input_layer_down', + onChangeValue: (String value) { + bloc.add(CheckCodeChangeEvent()); + }, + textInputType: TextInputType.emailAddress, + controller: bloc.checkNumController, + )), + 16.5.horizontalSpace, + TimerWidget( + pageType: 1, + canSendSms: bloc.canSendSms, + sendSmsEvent: () => bloc.add(SendSmsCodeEvent()), + ) + ], + ) + ], + )), + 2.verticalSpace, + Image.asset( + 'steven_bride'.assetPng, + height: 173.h, + width: 157.w, + ) + ], ), - ), - ] - ) + GestureDetector( + onTap: () { + if (bloc.canSetPwd) { + bloc.add(SetPassWordEvent()); + } + }, + child: Container( + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage(bloc.canSetPwd ? 'login_enter'.assetPng : 'login_enter_dis'.assetPng), + fit: BoxFit.fill), + ), + padding: EdgeInsets.symmetric(horizontal: 28.w, vertical: 14.h), + child: Text( + '确定', + style: TextStyle(fontSize: 16.sp, color: Colors.white), + ), + ), + ) + ], + ), + ), + ), ), ), ); diff --git a/lib/pages/module/course_module_page.dart b/lib/pages/module/course_module_page.dart new file mode 100644 index 0000000..d0ea049 --- /dev/null +++ b/lib/pages/module/course_module_page.dart @@ -0,0 +1,168 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; +import 'package:wow_english/common/extension/string_extension.dart'; +import 'package:wow_english/common/widgets/we_app_bar.dart'; +import 'package:wow_english/models/course_module_entity.dart'; +import 'package:wow_english/route/route.dart'; + +import 'bloc/module_bloc.dart'; +import 'widgets/module_item_widget.dart'; + +// 课程阶段（模块）列表页 +class CourseModulePage extends StatelessWidget { + const CourseModulePage({super.key, this.starPageIndex}); + + final int? starPageIndex; + + @override + Widget build(BuildContext context) { + return BlocProvider( + create: (context) => ModuleBloc( + starPageIndex ?? 0, + PageController(initialPage: starPageIndex ?? 0, viewportFraction: 0.3), + )..add(RequestDataEvent()), + child: _LessonPageView(), + ); + } +} + +class _LessonPageView extends StatelessWidget { + final double _cardHeight = 240.h; + + final double _scale = 0.8; + + @override + Widget build(BuildContext context) { + return BlocListener( + listener: (context, state) {}, + child: Scaffold( + appBar: const WEAppBar(), + body: _lessViewWidget(), + ), + ); + } + + Widget _lessViewWidget() => + BlocBuilder(builder: (context, state) { + final bloc = BlocProvider.of(context); + return Center( + child: SafeArea( + child: Column( + children: [ + SizedBox( + height: _cardHeight, + child: PageView.builder( + itemCount: bloc.listData.length, + controller: bloc.pageController, + onPageChanged: (int index) { + bloc.add(PageViewChangeIndexEvent(index)); + }, + itemBuilder: (context, index) => _itemTransCard(index)), + ), + 32.verticalSpace, + SizedBox( + height: 32.h, + width: 66.w * bloc.listData.length, + child: ListView.builder( + itemCount: bloc.listData.length, + scrollDirection: Axis.horizontal, + itemBuilder: (BuildContext context, int index) { + return Container( + height: 32.h, + width: 66.w, + padding: const EdgeInsets.symmetric(horizontal: 5), + child: GestureDetector( + onTap: () { + if (index == bloc.currentPageIndex) { + return; + } + int mill = (index - bloc.currentPageIndex) > 0 + ? 100 * (index - bloc.currentPageIndex) + : 100 * (bloc.currentPageIndex - index); + bloc.pageController.animateToPage(index, + duration: Duration(milliseconds: mill), + curve: Curves.ease); + }, + child: Container( + height: bloc.currentPageIndex == index ? 32 : 20, + decoration: BoxDecoration( + color: bloc.currentPageIndex == index + ? Colors.red + : Colors.white, + borderRadius: BorderRadius.circular(5.r), + border: Border.all( + width: 0.5, + color: Colors.black, + ), + ), + alignment: Alignment.center, + child: Text( + (index + 1).toString(), + style: TextStyle( + color: bloc.currentPageIndex == index + ? Colors.white + : Colors.black), + ), + ), + ), + ); + }), + ) + ], + ), + ), + ); + }); + + Widget _itemTransCard(int index) => + BlocBuilder(builder: (context, state) { + final bloc = BlocProvider.of(context); + Matrix4 matrix4 = Matrix4.identity(); + if (index == bloc.currentPageIndex.floor()) { + //当前的item + double currScale = + (1 - (bloc.currentPageIndex - index) * (1 - _scale)).toDouble(); + var currTrans = _cardHeight * (1 - currScale) / 2; + + matrix4 = Matrix4.diagonal3Values(1.0, currScale, 1.0) + ..setTranslationRaw(0.0, currTrans, 0.0); + } else if (index == bloc.currentPageIndex.floor() + 1) { + //右边的item + var currScale = + _scale + (bloc.currentPageIndex - index + 1) * (1 - _scale); + var currTrans = _cardHeight * (1 - currScale) / 2; + + matrix4 = Matrix4.diagonal3Values(1.0, currScale, 1.0) + ..setTranslationRaw(0.0, currTrans, 0.0); + } else if (index == bloc.currentPageIndex - 1) { + //左边 + var currScale = + (1 - (bloc.currentPageIndex - index) * (1 - _scale)).toDouble(); + var currTrans = _cardHeight * (1 - currScale) / 2; + + matrix4 = Matrix4.diagonal3Values(1.0, currScale, 1.0) + ..setTranslationRaw(0.0, currTrans, 0.0); + } else { + //其他，不在屏幕显示的item + matrix4 = Matrix4.diagonal3Values(1.0, _scale, 1.0) + ..setTranslationRaw(0.0, _cardHeight * (1 - _scale) / 2, 0.0); + } + CourseModuleEntity? model = bloc.listData[index]; + return Transform( + transform: matrix4, + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 10), + child: ModuleItemWidget( + model: model, + isSelected: bloc.currentPageIndex == index, + onClickEvent: () { + pushNamedAndRemoveUntil( + AppRouteName.courseUnit, (route) => route.isFirst, + arguments: {'courseModuleEntity': model}); + }, + ), + ), + ); + }); +} diff --git a/lib/pages/module/module_page.dart b/lib/pages/module/module_page.dart deleted file mode 100644 index dc29413..0000000 --- a/lib/pages/module/module_page.dart +++ /dev/null @@ -1,187 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_screenutil/flutter_screenutil.dart'; -import 'package:wow_english/common/extension/string_extension.dart'; -import 'package:wow_english/common/widgets/we_app_bar.dart'; -import 'package:wow_english/models/course_module_entity.dart'; -import 'package:wow_english/route/route.dart'; - -import 'bloc/module_bloc.dart'; -import 'widgets/module_item_widget.dart'; - -// 阶段（模块）列表页 -class ModulePage extends StatelessWidget { - const ModulePage({super.key, this.starPageIndex}); - - final int? starPageIndex; - - @override - Widget build(BuildContext context) { - return BlocProvider( - create: (context) => ModuleBloc( - starPageIndex ?? 0, - PageController(initialPage: starPageIndex ?? 0, viewportFraction: 0.3), - )..add(RequestDataEvent()), - child: _LessonPageView(), - ); - } -} - -class _LessonPageView extends StatelessWidget { - final double _cardHeight = 240.h; - - final double _scale = 0.8; - - @override - Widget build(BuildContext context) { - return BlocListener( - listener: (context, state) {}, - child: Scaffold( - appBar: WEAppBar( - leading: IconButton( - onPressed: () { - popPage(); - }, - icon: Image.asset( - 'back'.assetPng, - height: 43, - width: 43, - )), - // actions: [ - // IconButton( - // icon: Image.asset('shop'.assetPng), - // color: Colors.white, - // onPressed: () { - // showToast('购买'); - // }, - // ) - // ], - ), - body: _lessViewWidget(), - ), - ); - } - - Widget _lessViewWidget() => - BlocBuilder(builder: (context, state) { - final bloc = BlocProvider.of(context); - return Center( - child: SafeArea( - child: Column( - children: [ - SizedBox( - height: _cardHeight, - child: PageView.builder( - itemCount: bloc.listData.length, - controller: bloc.pageController, - onPageChanged: (int index) { - bloc.add(PageViewChangeIndexEvent(index)); - }, - itemBuilder: (context, index) => _itemTransCard(index)), - ), - 32.verticalSpace, - SizedBox( - height: 32.h, - width: 66.w * bloc.listData.length, - child: ListView.builder( - itemCount: bloc.listData.length, - scrollDirection: Axis.horizontal, - itemBuilder: (BuildContext context, int index) { - return Container( - height: 32.h, - width: 66.w, - padding: const EdgeInsets.symmetric(horizontal: 5), - child: GestureDetector( - onTap: () { - if (index == bloc.currentPageIndex) { - return; - } - int mill = (index - bloc.currentPageIndex) > 0 - ? 100 * (index - bloc.currentPageIndex) - : 100 * (bloc.currentPageIndex - index); - bloc.pageController.animateToPage(index, - duration: Duration(milliseconds: mill), - curve: Curves.ease); - }, - child: Container( - height: bloc.currentPageIndex == index ? 32 : 20, - decoration: BoxDecoration( - color: bloc.currentPageIndex == index - ? Colors.red - : Colors.white, - borderRadius: BorderRadius.circular(5.r), - border: Border.all( - width: 0.5, - color: Colors.black, - ), - ), - alignment: Alignment.center, - child: Text( - (index + 1).toString(), - style: TextStyle( - color: bloc.currentPageIndex == index - ? Colors.white - : Colors.black), - ), - ), - ), - ); - }), - ) - ], - ), - ), - ); - }); - - Widget _itemTransCard(int index) => - BlocBuilder(builder: (context, state) { - final bloc = BlocProvider.of(context); - Matrix4 matrix4 = Matrix4.identity(); - if (index == bloc.currentPageIndex.floor()) { - //当前的item - double currScale = - (1 - (bloc.currentPageIndex - index) * (1 - _scale)).toDouble(); - var currTrans = _cardHeight * (1 - currScale) / 2; - - matrix4 = Matrix4.diagonal3Values(1.0, currScale, 1.0) - ..setTranslationRaw(0.0, currTrans, 0.0); - } else if (index == bloc.currentPageIndex.floor() + 1) { - //右边的item - var currScale = - _scale + (bloc.currentPageIndex - index + 1) * (1 - _scale); - var currTrans = _cardHeight * (1 - currScale) / 2; - - matrix4 = Matrix4.diagonal3Values(1.0, currScale, 1.0) - ..setTranslationRaw(0.0, currTrans, 0.0); - } else if (index == bloc.currentPageIndex - 1) { - //左边 - var currScale = - (1 - (bloc.currentPageIndex - index) * (1 - _scale)).toDouble(); - var currTrans = _cardHeight * (1 - currScale) / 2; - - matrix4 = Matrix4.diagonal3Values(1.0, currScale, 1.0) - ..setTranslationRaw(0.0, currTrans, 0.0); - } else { - //其他，不在屏幕显示的item - matrix4 = Matrix4.diagonal3Values(1.0, _scale, 1.0) - ..setTranslationRaw(0.0, _cardHeight * (1 - _scale) / 2, 0.0); - } - CourseModuleEntity? model = bloc.listData[index]; - return Transform( - transform: matrix4, - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 10), - child: ModuleItemWidget( - model: model, - isSelected: bloc.currentPageIndex == index, - onClickEvent: () { - pushNamedAndRemoveUntil( - AppRouteName.courseUnit, (route) => route.isFirst, - arguments: {'courseModuleEntity': model}); - }, - ), - ), - ); - }); -} diff --git a/lib/pages/shop/exchane/exchange_lesson_page.dart b/lib/pages/shop/exchane/exchange_lesson_page.dart index e640eec..531c99f 100644 --- a/lib/pages/shop/exchane/exchange_lesson_page.dart +++ b/lib/pages/shop/exchane/exchange_lesson_page.dart @@ -6,6 +6,7 @@ import 'package:wow_english/common/widgets/textfield_customer_widget.dart'; import 'package:wow_english/pages/shop/exchane/widegts/exchange_result_dialog.dart'; import 'package:wow_english/route/route.dart'; +import '../../../common/widgets/we_app_bar.dart'; import 'bloc/exchange_lesson_bloc.dart'; class ExchangeLessonPage extends StatelessWidget { @@ -29,102 +30,102 @@ class _ExchangeLessonPage extends StatelessWidget { showDialog( context: context, barrierDismissible: !state.result, - builder: (context){ + builder: (context) { return ExChangeResultDialog( - resultType:state.result, - onTap:(){ + resultType: state.result, + onTap: () { popPage(); - } - ); - }); + }); + }); } }, child: _exchangeLessonPageView(), ); } - Widget _exchangeLessonPageView() => BlocBuilder(builder: (context, state) { + Widget _exchangeLessonPageView() => + BlocBuilder( + builder: (context, state) { final bloc = BlocProvider.of(context); return Scaffold( - resizeToAvoidBottomInset: false, - body: Container( - color: Colors.white, - child: Column( - mainAxisAlignment: MainAxisAlignment.center, + resizeToAvoidBottomInset: false, + body: Stack( children: [ - 10.5.verticalSpace, - Padding( - padding: EdgeInsets.symmetric(horizontal: 15.w), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.start, + Container( + color: Colors.white, + child: Column( + mainAxisAlignment: MainAxisAlignment.center, children: [ - IconButton( - icon: Image.asset( - 'back_around'.assetPng, - width: 40, - height: 40, + 10.5.verticalSpace, + Padding( + padding: EdgeInsets.symmetric(horizontal: 15.w), + child: Center( + child: Image.asset( + 'wow_ex_lesson'.assetPng, + width: 139.w, + height: 81.h, + ), + ), + ), + Expanded( + child: Padding( + padding: EdgeInsets.symmetric(horizontal: 135.w), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + TextFieldCustomerWidget( + height: 55.h, + hitText: '请输入兑换码', + bgImageName: 'Input_layer_up', + textInputType: TextInputType.emailAddress, + controller: bloc.codeNumberController, + onChangeValue: (String value) { + bloc.add(CodeNumberChangeEvent()); + }, + ), + 21.5.verticalSpace, + GestureDetector( + onTap: () { + if (bloc.checkCode) { + bloc.add(CheckCodeEvent()); + } + }, + child: Container( + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage(bloc.checkCode + ? 'ex_sure'.assetPng + : 'ex_dis'.assetPng), + fit: BoxFit.fill), + ), + padding: EdgeInsets.symmetric( + horizontal: 27.w, vertical: 14.h), + child: Text( + '兑换', + style: TextStyle( + fontSize: 16.sp, color: Colors.white), + ), + ), + ) + ], + ), ), - color: Colors.white, - onPressed: () { - Navigator.pop(context); - }, ), Image.asset( - 'wow_ex_lesson'.assetPng, - width: 139.w, - height: 81.h, + 'bottom_grass'.assetPng, ), - SizedBox.fromSize(size: const Size(40.0, 40.0)) ], ), ), - Expanded( - child: Padding( - padding: EdgeInsets.symmetric(horizontal: 135.w), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - TextFieldCustomerWidget( - height: 55.h, - hitText: '请输入兑换码', - bgImageName: 'Input_layer_up', - textInputType: TextInputType.emailAddress, - controller: bloc.codeNumberController, - onChangeValue: (String value) { - bloc.add(CodeNumberChangeEvent()); - }, - ), - 21.5.verticalSpace, - GestureDetector( - onTap: () { - if (bloc.checkCode) { - bloc.add(CheckCodeEvent()); - } - }, - child: Container( - decoration: BoxDecoration( - image: DecorationImage( - image: AssetImage(bloc.checkCode ? 'ex_sure'.assetPng : 'ex_dis'.assetPng), - fit: BoxFit.fill), - ), - padding: EdgeInsets.symmetric(horizontal: 27.w, vertical: 14.h), - child: Text( - '兑换', - style: TextStyle(fontSize: 16.sp, color: Colors.white), - ), - ), - ) - ], - ), + const Positioned( + top: 0, + left: 0, + right: 0, + child: WEAppBar( + backgroundColor: Colors.transparent, ), ), - Image.asset( - 'bottom_grass'.assetPng, - ), ], - ), - ), - ); + )); }); } diff --git a/lib/pages/tab/tab_page.dart b/lib/pages/tab/tab_page.dart index 70ad7e7..b547bff 100644 --- a/lib/pages/tab/tab_page.dart +++ b/lib/pages/tab/tab_page.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:wow_english/pages/module/module_page.dart'; +import 'package:wow_english/pages/module/course_module_page.dart'; import '../unit/view.dart'; import 'blocs/tab_bloc.dart'; @@ -10,7 +10,7 @@ class TabPage extends StatelessWidget { final _pages =const [ UnitPage(), - ModulePage() + CourseModulePage() ]; final _tabIcons = const [ diff --git a/lib/route/route.dart b/lib/route/route.dart index eecdf7f..8fddf58 100644 --- a/lib/route/route.dart +++ b/lib/route/route.dart @@ -11,7 +11,7 @@ import 'package:wow_english/pages/listen/listen_page.dart'; import 'package:wow_english/pages/login/forgetpwd/forget_password_home_page.dart'; import 'package:wow_english/pages/login/loginpage/login_page.dart'; import 'package:wow_english/pages/login/setpwd/set_pwd_page.dart'; -import 'package:wow_english/pages/module/module_page.dart'; +import 'package:wow_english/pages/module/course_module_page.dart'; import 'package:wow_english/pages/practice/topic_picture_page.dart'; import 'package:wow_english/pages/repeatafter/repeat_after_page.dart'; import 'package:wow_english/pages/repeataftercontent/repeat_after_content_page.dart'; @@ -115,7 +115,7 @@ class AppRouter { return CupertinoPageRoute( builder: (_) => const ForgetPasswordHomePage()); case AppRouteName.courseModule: - return CupertinoPageRoute(builder: (_) => const ModulePage()); + return CupertinoPageRoute(builder: (_) => const CourseModulePage()); case AppRouteName.courseUnit: CourseModuleEntity courseModuleEntity = CourseModuleEntity(); if (settings.arguments != null) { -- libgit2 0.22.2