diff --git a/lib/pages/module/course_module_page.dart b/lib/pages/module/course_module_page.dart index d0ea049..6289434 100644 --- a/lib/pages/module/course_module_page.dart +++ b/lib/pages/module/course_module_page.dart @@ -1,7 +1,6 @@ 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'; diff --git a/lib/pages/unit/widget/home_tab_header_widget.dart b/lib/pages/unit/widget/home_tab_header_widget.dart index 465f8c9..3dc6223 100644 --- a/lib/pages/unit/widget/home_tab_header_widget.dart +++ b/lib/pages/unit/widget/home_tab_header_widget.dart @@ -53,42 +53,6 @@ class HomeTabHeaderWidget extends StatelessWidget { ), ), ), - // GestureDetector( - // onTap: () => actionTap?.call(HeaderActionType.user), - // child: Container( - // decoration: BoxDecoration( - // border: Border.all( - // width: 1.0, - // color: const Color(0xFF140C10), - // ), - // borderRadius: BorderRadius.circular(21), - // ), - // child: CircleAvatar( - // radius: 21, - // backgroundImage: ImageUtil.getImageProviderOnDefault(UserUtil.getUser()?.avatarUrl), - // ), - // ), - // ), - // GestureDetector( - // onTap: () { - // if (actionTap != null) { - // actionTap!(HeaderActionType.user); - // } - // }, - // child: Container( - // margin: const EdgeInsets.only(left: 7), - // padding: const EdgeInsets.all(4.0), - // decoration: BoxDecoration( - // color: Colors.white, - // borderRadius: BorderRadius.circular(2), - // border: Border.all(width: 1.0, color: const Color(0xFF140C10), style: BorderStyle.solid), - // ), - // child: Text( - // UserUtil.getUser()?.name ?? '未登录', - // style: TextStyle(color: const Color(0xFF333333), fontSize: 16.sp), - // ), - // ), - // ), 20.horizontalSpace, Expanded( child: Text( @@ -97,36 +61,37 @@ class HomeTabHeaderWidget extends StatelessWidget { textAlign: TextAlign.left, style: const TextStyle(color: Colors.white, fontSize: 30.0), )), - // IconButton( - // onPressed: () { - // if (actionTap != null) { - // actionTap!(HeaderActionType.video); - // } - // }, - // icon: Image.asset('video'.assetPng)), - IconButton( - onPressed: () { + GestureDetector( + onTap: () { if (actionTap != null) { actionTap!(HeaderActionType.phase); - } - }, - icon: Image.asset('home'.assetPng)), - IconButton( - onPressed: () { - if (actionTap != null) { - actionTap!(HeaderActionType.listen); - } + }; }, - icon: Image.asset('listen'.assetPng)), + child: Image(image: AssetImage('home'.assetPng), + width: 36.0.w, height: 36.0.h, fit: BoxFit.contain) + ), + 8.horizontalSpace, + GestureDetector( + onTap: () { + if (actionTap != null) { + actionTap!(HeaderActionType.listen); + }; + }, + child: Image(image: AssetImage('listen'.assetPng), + width: 36.0.w, height: 36.0.h, fit: BoxFit.contain) + ), + 8.horizontalSpace, Offstage( offstage: AppConfigHelper.shouldHidePay(), - child: IconButton( - onPressed: () { + child: GestureDetector( + onTap: () { if (actionTap != null) { actionTap!(HeaderActionType.shop); - } + }; }, - icon: Image.asset('shop'.assetPng)), + child: Image(image: AssetImage('shop'.assetPng), + width: 36.0.w, height: 36.0.h, fit: BoxFit.contain) + ), ), ScreenUtil().bottomBarHeight.horizontalSpace, ],