diff --git a/lib/mine/mine_page.dart b/lib/mine/mine_page.dart index b819c370..84eb733b 100644 --- a/lib/mine/mine_page.dart +++ b/lib/mine/mine_page.dart @@ -498,7 +498,7 @@ class _MinePage extends State with AutomaticKeepAliveClientMixin { Text( S.of(context).kaquan, style: TextStyle( - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, fontSize: 16.sp, color: Color(0xFF353535), ), @@ -541,7 +541,7 @@ class _MinePage extends State with AutomaticKeepAliveClientMixin { Text( S.of(context).dingdan, style: TextStyle( - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, fontSize: 16.sp, color: Color(0xFF353535), ), @@ -589,7 +589,7 @@ class _MinePage extends State with AutomaticKeepAliveClientMixin { S.of(context).denglu, style: TextStyle( fontSize: 16.sp, - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, color: Color(0xFF353535), ), ) @@ -635,7 +635,7 @@ class _MinePage extends State with AutomaticKeepAliveClientMixin { S.of(context).weidengluxinxi, style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0xFF2F2F2F), ), ) @@ -643,7 +643,7 @@ class _MinePage extends State with AutomaticKeepAliveClientMixin { userinfo == null ? "" : "NO.${userinfo.vipNo}", style: TextStyle( fontSize: 12.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0xFF2F2F2F), ), ), diff --git a/lib/setting/about_page.dart b/lib/setting/about_page.dart index 3da7bfb1..d3e22b5a 100644 --- a/lib/setting/about_page.dart +++ b/lib/setting/about_page.dart @@ -6,6 +6,7 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:huixiang/generated/l10n.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:huixiang/utils/bridge.dart'; +import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:package_info/package_info.dart'; @@ -69,7 +70,7 @@ class _AboutPage extends State { S.of(context).guojiankangyoujishenghuo, style: TextStyle( fontSize: 16.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0xffB2B2B2), ), ), @@ -130,7 +131,7 @@ class _AboutPage extends State { style: TextStyle( color: Colors.black, fontSize: 12.sp, - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, ), ), SizedBox( @@ -146,7 +147,7 @@ class _AboutPage extends State { style: TextStyle( color: Colors.black, fontSize: 12.sp, - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, ), ), ), @@ -178,7 +179,7 @@ class _AboutPage extends State { style: TextStyle( fontSize: 16.sp, color: Color(0xFF353535), - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, ), ), ), @@ -214,7 +215,7 @@ class _AboutPage extends State { child: Text( left, style: TextStyle( - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, fontSize: 16.sp, color: Color(0xFF353535), ), @@ -225,7 +226,7 @@ class _AboutPage extends State { right, style: TextStyle( fontSize: 16.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0xFF727272), ), ), @@ -254,7 +255,7 @@ class _AboutPage extends State { child: Text( text, style: TextStyle( - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, fontSize: 16.sp, color: Color(0xFF353535), ), diff --git a/lib/setting/help_feedback_page.dart b/lib/setting/help_feedback_page.dart index f6279baf..8bfc9949 100644 --- a/lib/setting/help_feedback_page.dart +++ b/lib/setting/help_feedback_page.dart @@ -6,6 +6,7 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart'; import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/retrofit/data/base_data.dart'; import 'package:huixiang/retrofit/retrofit_api.dart'; +import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:huixiang/view_widget/round_button.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -93,7 +94,7 @@ class _HelpFeedbackPage extends State { child: Text( S.of(context).changjianwenti, style: TextStyle( - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, color: Color(0xFF353535), fontSize: 16.sp, ), @@ -150,7 +151,7 @@ class _HelpFeedbackPage extends State { backgroup: Color(0xFF32A060), textColor: Colors.white, fontSize: 16.sp, - fontWeight: FontWeight.bold, + fontWeight: MyFontWeight.semi_bold, ), ), ), @@ -215,7 +216,7 @@ class _HelpFeedbackPage extends State { hintText: S.of(context).fankuilizi, hintStyle: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0xffA29E9E), ), ), @@ -267,7 +268,7 @@ class _HelpFeedbackPage extends State { hintText: S.of(context).qingshuruyouxiaoshoujihaoma, hintStyle: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0xffA29E9E), ), ), @@ -298,7 +299,7 @@ class _HelpFeedbackPage extends State { cnt, style: TextStyle( fontSize: 14.sp, - fontWeight: FontWeight.w400, + fontWeight: MyFontWeight.regular, color: Color(0xff8B8B8B), ), ), diff --git a/lib/setting/setting_page.dart b/lib/setting/setting_page.dart index 10ae2fed..1b81ff8c 100644 --- a/lib/setting/setting_page.dart +++ b/lib/setting/setting_page.dart @@ -6,6 +6,7 @@ import 'package:huixiang/generated/l10n.dart'; import 'package:huixiang/main.dart'; import 'package:huixiang/utils/event_type.dart'; import 'package:huixiang/utils/flutter_utils.dart'; +import 'package:huixiang/utils/font_weight.dart'; import 'package:huixiang/utils/min.dart'; import 'package:huixiang/view_widget/my_appbar.dart'; import 'package:huixiang/view_widget/round_button.dart'; @@ -70,7 +71,7 @@ class _SettingPage extends State { child: Text( S.of(context).shezhi, style: TextStyle( - fontWeight: FontWeight.w500, + fontWeight: MyFontWeight.medium, color: Color(0xFF353535), fontSize: 16.sp, ),