log out

Author: designDo

lib/app_theme.dart

@@ -176,7 +176,9 @@ class AppTheme {
     return TextStyle(
         fontWeight: fontWeight,
         fontSize: fontSize,
-        color: isDark() ? Colors.white : Colors.black.withOpacity(0.5),
+        color: isDark()
+            ? Colors.white.withOpacity(0.5)
+            : Colors.black.withOpacity(0.5),
         fontFamily: fontFamliy);
   }
 

lib/mine/mine_screen.dart

@@ -24,7 +24,11 @@ class _MineScreenState extends State<MineScreen> {
         return Stack(
           children: [
             ListView(physics: ClampingScrollPhysics(), children: [
-              UserInfoView(),
+              UserInfoView(
+                callback: () {
+                  setState(() {});
+                },
+              ),
               HabitsTotalView(),
               UserProView(),
               EnterView(),
@@ -33,11 +37,12 @@ class _MineScreenState extends State<MineScreen> {
               )
             ]),
             GestureDetector(
-              onTap: () {
-                Navigator.of(context)
+              onTap: () async {
+                await Navigator.of(context)
                     .push(CupertinoPageRoute(builder: (context) {
                   return SettingsScreen();
                 }));
+                setState(() {});
               },
               child: Container(
                 alignment: Alignment.centerRight,

lib/mine/mine_screen_views.dart

@@ -6,11 +6,18 @@ import 'package:timefly/app_theme.dart';
 import 'package:timefly/blocs/habit/habit_bloc.dart';
 import 'package:timefly/blocs/habit/habit_state.dart';
 import 'package:timefly/login/login_page.dart';
+import 'package:timefly/mine/settings_screen.dart';
 import 'package:timefly/models/habit.dart';
+import 'package:timefly/models/user.dart';
 
 class UserInfoView extends StatelessWidget {
+  final VoidCallback callback;
+
+  const UserInfoView({Key key, this.callback}) : super(key: key);
+
   @override
   Widget build(BuildContext context) {
+    User user = SessionUtils.sharedInstance().currentUser;
     return Container(
       margin: EdgeInsets.only(
           left: 16, top: MediaQuery.of(context).padding.top + 16),
@@ -29,10 +36,28 @@ class UserInfoView extends StatelessWidget {
           SizedBox(
             width: 16,
           ),
-          Text(
-            '亚索',
-            style: AppTheme.appTheme
-                .headline1(fontWeight: FontWeight.bold, fontSize: 22),
+          GestureDetector(
+            onTap: () async {
+              if (user == null) {
+                await Navigator.of(context)
+                    .push(CupertinoPageRoute(builder: (context) {
+                  return LoginPage();
+                }));
+                return;
+              }
+              if (user.username == null || user.username.isEmpty) {
+                await Navigator.of(context)
+                    .push(CupertinoPageRoute(builder: (context) {
+                  return SettingsScreen();
+                }));
+                callback();
+              }
+            },
+            child: Text(
+              '${(user == null || user.username == null || user.username.isEmpty) ? '编辑名字' : user.username}',
+              style: AppTheme.appTheme
+                  .headline1(fontWeight: FontWeight.bold, fontSize: 22),
+            ),
           )
         ],
       ),

lib/mine/settings_screen.dart

@@ -8,6 +8,7 @@ import 'package:timefly/blocs/theme/theme_bloc.dart';
 import 'package:timefly/blocs/theme/theme_event.dart';
 import 'package:timefly/blocs/theme/theme_state.dart';
 import 'package:timefly/models/user.dart';
+import 'package:timefly/utils/flash_helper.dart';
 import 'package:timefly/utils/system_util.dart';
 import 'package:timefly/widget/custom_edit_field.dart';
 
@@ -70,6 +71,30 @@ class _SettingsScreenState extends State<SettingsScreen> {
                       shared.setString(COLOR_MODE, colorMode.toString());
                     },
                   ),
+                  GestureDetector(
+                    onTap: () {
+                      SessionUtils.sharedInstance().logout();
+                      Navigator.of(context).pop();
+                    },
+                    child: Container(
+                      alignment: Alignment.center,
+                      margin: EdgeInsets.only(
+                          left: 32, right: 32, top: 48, bottom: 32),
+                      height: 55,
+                      width: 220,
+                      decoration: BoxDecoration(
+                          boxShadow: AppTheme.appTheme.coloredBoxShadow(),
+                          gradient: AppTheme.appTheme.containerGradient(),
+                          borderRadius: BorderRadius.all(Radius.circular(35))),
+                      child: Text(
+                        '退出',
+                        style: AppTheme.appTheme.headline1(
+                            textColor: Colors.white,
+                            fontSize: 18,
+                            fontWeight: FontWeight.w600),
+                      ),
+                    ),
+                  ),
                   SizedBox(
                     height: 100,
                   )
@@ -165,6 +190,10 @@ class _ChangeUserInfoViewState extends State<ChangeUserInfoView> {
             },
             onCompleted: () async {
               FocusScope.of(context).requestFocus(FocusNode());
+              if (userName.isEmpty) {
+                FlashHelper.toast(context, '请输入名字');
+                return;
+              }
               User user = SessionUtils.sharedInstance().currentUser;
               BmobUser bmobUser = BmobUser();
               bmobUser.objectId = user.id;