From 8e12d18437a09b7ca5ead24ef57d8d14be2045f8 Mon Sep 17 00:00:00 2001 From: laiiihz Date: Mon, 2 Nov 2020 14:13:46 +0800 Subject: [PATCH] fix home draw display --- assets/user/ic_kefu.png | Bin 0 -> 2240 bytes assets/user/ic_person.png | Bin 0 -> 1728 bytes assets/user/ic_setup.png | Bin 0 -> 2307 bytes lib/mock_models/users/user_info_model.dart | 4 + lib/provider/user_provider.dart | 8 + lib/ui/home/personal_draw.dart | 183 +++++++++++---------- pubspec.yaml | 1 + 7 files changed, 108 insertions(+), 88 deletions(-) create mode 100644 assets/user/ic_kefu.png create mode 100644 assets/user/ic_person.png create mode 100644 assets/user/ic_setup.png create mode 100644 lib/mock_models/users/user_info_model.dart diff --git a/assets/user/ic_kefu.png b/assets/user/ic_kefu.png new file mode 100644 index 0000000000000000000000000000000000000000..a53514a099a1bbf0f5c518385eb1b25ef525eccf GIT binary patch literal 2240 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 + + ///设置用户登陆 setisSigned (bool state){ _isSigned=state; notifyListeners(); } + + + } \ No newline at end of file diff --git a/lib/ui/home/personal_draw.dart b/lib/ui/home/personal_draw.dart index 3bb7a89..a8457af 100644 --- a/lib/ui/home/personal_draw.dart +++ b/lib/ui/home/personal_draw.dart @@ -1,3 +1,4 @@ +import 'package:aku_community_manager/const/resource.dart'; import 'package:aku_community_manager/provider/user_provider.dart'; import 'package:aku_community_manager/style/app_style.dart'; import 'package:aku_community_manager/ui/login/login_page.dart'; @@ -18,27 +19,30 @@ class PersonalDraw extends StatefulWidget { } class _PersonalDrawState extends State { - Widget _myListTile(IconData iconData, String text, {VoidCallback onPressed}) { + Widget _myListTile(String path, String text, {VoidCallback onPressed}) { return AkuButton( onPressed: onPressed, child: Container( - width: double.infinity, height: 96.w, - padding: EdgeInsets.only(left: 32.w, top: 28.w, bottom: 28.w), - child: Row(children: [ - Icon( - iconData, - size: 40.w, - ), - SizedBox(width: 16.w), - Text( - text, - style: TextStyle( - color: AppStyle.primaryTextColor, - fontSize: 28.sp, + padding: EdgeInsets.only(left: 32.w), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Image.asset( + path, + width: 40.w, + height: 40.w, ), - ), - ]), + SizedBox(width: 16.w), + Text( + text, + style: TextStyle( + color: AppStyle.primaryTextColor, + fontSize: 28.sp, + ), + ), + ], + ), ), ); } @@ -46,83 +50,86 @@ class _PersonalDrawState extends State { @override Widget build(BuildContext context) { final userProvider = Provider.of(context); - return Drawer( - child: ListView( - children: [ - SizedBox( - height: 80.w - 40.w + ScreenUtil().statusBarHeight, - ), - //leading - Container( - margin: EdgeInsets.only(bottom: 80.w), - width: double.infinity, - child: Row( - children: [ - SizedBox(width: 32.w), - //头像按钮 - AkuRoundButton( - height: 72.w, - onPressed: () {}, - child: CircleAvatar( - radius: 36.w, - backgroundColor: Colors.grey, - child: userProvider.isSigned ? null : null, + return SizedBox( + width: 465.w, + child: Drawer( + child: ListView( + children: [ + SizedBox( + height: 80.w - 40.w + ScreenUtil().statusBarHeight, + ), + //leading + Container( + margin: EdgeInsets.only(bottom: 80.w), + width: double.infinity, + child: Row( + children: [ + SizedBox(width: 32.w), + //头像按钮 + AkuRoundButton( + height: 72.w, + onPressed: () {}, + child: CircleAvatar( + radius: 36.w, + backgroundColor: Colors.grey, + child: userProvider.isSigned ? null : null, + ), ), - ), - SizedBox(width: 24.w), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - //登录按钮 - InkWell( - onTap: () {}, - child: userProvider.isSigned - ? Text( - '李大海', - style: TextStyle( - color: AppStyle.primaryTextColor, - fontSize: 28.sp, - fontWeight: FontWeight.bold), - ) - : Text('登录', + SizedBox(width: 24.w), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + //登录按钮 + InkWell( + onTap: () {}, + child: userProvider.isSigned + ? Text( + '李大海', + style: TextStyle( + color: AppStyle.primaryTextColor, + fontSize: 28.sp, + fontWeight: FontWeight.bold), + ) + : Text('登录', + style: TextStyle( + color: AppStyle.primaryTextColor, + fontSize: 28.sp, + fontWeight: FontWeight.bold)), + ), + InkWell( + onTap: () {}, + child: Row( + children: [ + Icon(Icons.location_on_outlined, size: 33.w), + Text( + '深圳华悦茂峰', style: TextStyle( color: AppStyle.primaryTextColor, - fontSize: 28.sp, - fontWeight: FontWeight.bold)), - ), - InkWell( - onTap: () {}, - child: Row( - children: [ - Icon(Icons.location_on_outlined, size: 33.w), - Text( - '深圳华悦茂峰', - style: TextStyle( - color: AppStyle.primaryTextColor, - fontSize: 24.sp), - ), - ], + fontSize: 24.sp), + ), + ], + ), ), - ), - ], - ), - ], + ], + ), + ], + ), + ), + _myListTile( + R.ASSETS_USER_IC_PERSON_PNG, + '个人信息', + onPressed: () { + userProvider.isSigned + ? Get.to(UserInfoPage()) + : Get.to(LoginPage()); + }, ), - ), - _myListTile( - Icons.contact_page, - '个人信息', - onPressed: () { - userProvider.isSigned - ? Get.to(UserInfoPage()) - : Get.to(LoginPage()); - }, - ), - _myListTile(Icons.supervised_user_circle, '联系客服'), - _myListTile(Icons.settings, '设置', onPressed: () { - Get.to(SettingsPage()); - }), - ], + _myListTile(R.ASSETS_USER_IC_KEFU_PNG, '联系客服'), + _myListTile(R.ASSETS_USER_IC_SETUP_PNG, '设置', onPressed: () { + Get.to(SettingsPage()); + }), + ], + ), ), ); } diff --git a/pubspec.yaml b/pubspec.yaml index 874766e..d441c23 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -68,6 +68,7 @@ flutter: assets: - assets/ - assets/home/ + - assets/user/ # To add assets to your application, add an assets section, like this: # assets: # - images/a_dot_burr.jpeg