user info link click

Author: CarGuo

lib/common/utils/CommonUtils.dart

@@ -136,6 +136,14 @@ class CommonUtils {
     }
   }
 
+  static launchOutURL(String url) async {
+    if (await canLaunch(url)) {
+      await launch(url);
+    } else {
+      Fluttertoast.showToast(msg: GSYStrings.option_web_launcher_error + ": " + url);
+    }
+  }
+
   static Future<Null> showLoadingDialog(BuildContext context) {
     return showDialog(
         context: context,

lib/widget/GSYCommonOptionWidget.dart

@@ -1,9 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:fluttertoast/fluttertoast.dart';
 import 'package:gsy_github_app_flutter/common/style/GSYStyle.dart';
 import 'package:gsy_github_app_flutter/common/utils/CommonUtils.dart';
-import 'package:url_launcher/url_launcher.dart';
 import 'package:share/share.dart';
 
 /**
@@ -40,19 +37,12 @@ class GSYCommonOptionWidget extends StatelessWidget {
     return list;
   }
 
-  _launchURL() async {
-    if (await canLaunch(control.url)) {
-      await launch(control.url);
-    } else {
-      Fluttertoast.showToast(msg: GSYStrings.option_web_launcher_error + ": " + control.url);
-    }
-  }
 
   @override
   Widget build(BuildContext context) {
     List<GSYOptionModel> list = [
       new GSYOptionModel(GSYStrings.option_web, GSYStrings.option_web, (model) {
-        _launchURL();
+        CommonUtils.launchOutURL(control.url);
       }),
       new GSYOptionModel(GSYStrings.option_copy, GSYStrings.option_copy, (model) {
         CommonUtils.copy(control.url ?? "");

lib/widget/UserHeader.dart

@@ -163,7 +163,7 @@ class UserHeaderItem extends StatelessWidget {
                             ///用户组织
                             new GSYIConText(
                               GSYICons.USER_ITEM_COMPANY,
-                              userInfo.company == null ? GSYStrings.nothing_now : userInfo.company,
+                              userInfo.company ?? GSYStrings.nothing_now,
                               GSYConstant.subLightSmallText,
                               Color(GSYColors.subLightTextColor),
                               10.0,
@@ -173,7 +173,7 @@ class UserHeaderItem extends StatelessWidget {
                             ///用户位置
                             new GSYIConText(
                               GSYICons.USER_ITEM_LOCATION,
-                              userInfo.location == null ? GSYStrings.nothing_now : userInfo.location,
+                              userInfo.location ?? GSYStrings.nothing_now,
                               GSYConstant.subLightSmallText,
                               Color(GSYColors.subLightTextColor),
                               10.0,
@@ -187,13 +187,26 @@ class UserHeaderItem extends StatelessWidget {
                   new Container(
 
                       ///用户博客
-                      child: new GSYIConText(
-                        GSYICons.USER_ITEM_LINK,
-                        userInfo.blog == null ? GSYStrings.nothing_now : userInfo.blog,
-                        GSYConstant.subLightSmallText,
-                        Color(GSYColors.subLightTextColor),
-                        10.0,
-                        padding: 3.0,
+                      child: new RawMaterialButton(
+                        onPressed: () {
+                          if (userInfo.blog != null) {
+                            CommonUtils.launchOutURL(userInfo.blog);
+                          }
+                        },
+                        materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                        padding: const EdgeInsets.all(0.0),
+                        constraints: const BoxConstraints(minWidth: 0.0, minHeight: 0.0),
+                        child: new GSYIConText(
+                          GSYICons.USER_ITEM_LINK,
+                          userInfo.blog ?? GSYStrings.nothing_now,
+                          TextStyle(
+                            color: (userInfo.blog == null) ? Color(GSYColors.subLightTextColor) : Color(GSYColors.actionBlue),
+                            fontSize: GSYConstant.smallTextSize,
+                          ),
+                          Color(GSYColors.subLightTextColor),
+                          10.0,
+                          padding: 3.0,
+                        ),
                       ),
                       margin: new EdgeInsets.only(top: 6.0, bottom: 2.0),
                       alignment: Alignment.topLeft),