修改bug

.flutter-plugins-dependencies

@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/connectivity-0.4.8+2/","dependencies":[]},{"name":"fluttertoast","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-3.1.3/","dependencies":[]},{"name":"install_apk_plugin","path":"/Users/yuzo/yuzo/flutter/workspace/OpenGit_Flutter/flutter_common_lib/install_apk_plugin/","dependencies":[]},{"name":"package_info","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.0+17/","dependencies":[]},{"name":"path_provider","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.7/","dependencies":[]},{"name":"permission_handler","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/permission_handler-3.3.0/","dependencies":[]},{"name":"share","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/share-0.6.4/","dependencies":[]},{"name":"shared_preferences","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.7/","dependencies":[]},{"name":"sqflite","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.0/","dependencies":[]},{"name":"url_launcher","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher-5.4.5/","dependencies":[]},{"name":"webview_flutter","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/webview_flutter-0.3.20+2/","dependencies":[]}],"android":[{"name":"connectivity","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/connectivity-0.4.8+2/","dependencies":[]},{"name":"fluttertoast","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-3.1.3/","dependencies":[]},{"name":"install_apk_plugin","path":"/Users/yuzo/yuzo/flutter/workspace/OpenGit_Flutter/flutter_common_lib/install_apk_plugin/","dependencies":[]},{"name":"package_info","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.0+17/","dependencies":[]},{"name":"path_provider","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.7/","dependencies":[]},{"name":"permission_handler","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/permission_handler-3.3.0/","dependencies":[]},{"name":"share","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/share-0.6.4/","dependencies":[]},{"name":"shared_preferences","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.7/","dependencies":[]},{"name":"sqflite","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.0/","dependencies":[]},{"name":"url_launcher","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher-5.4.5/","dependencies":[]},{"name":"webview_flutter","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/webview_flutter-0.3.20+2/","dependencies":[]}],"macos":[{"name":"connectivity_macos","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/connectivity_macos-0.1.0+2/","dependencies":[]},{"name":"path_provider_macos","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_macos-0.0.4+1/","dependencies":[]},{"name":"shared_preferences_macos","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_macos-0.0.1+7/","dependencies":[]},{"name":"sqflite","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.0/","dependencies":[]},{"name":"url_launcher_macos","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_macos-0.0.1+5/","dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"shared_preferences_web","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_web-0.1.2+4/","dependencies":[]},{"name":"url_launcher_web","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_web-0.1.1+2/","dependencies":[]}]},"dependencyGraph":[{"name":"connectivity","dependencies":["connectivity_macos"]},{"name":"connectivity_macos","dependencies":[]},{"name":"fluttertoast","dependencies":[]},{"name":"install_apk_plugin","dependencies":[]},{"name":"package_info","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos"]},{"name":"path_provider_macos","dependencies":[]},{"name":"permission_handler","dependencies":[]},{"name":"share","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_macos"]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"webview_flutter","dependencies":[]}],"date_created":"2020-04-27 10:57:54.421491","version":"1.15.21-pre.11"}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/connectivity-0.4.8+2/","dependencies":[]},{"name":"fluttertoast","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-3.1.3/","dependencies":[]},{"name":"install_apk_plugin","path":"/Users/yuzo/yuzo/flutter/workspace/OpenGit_Flutter/flutter_common_lib/install_apk_plugin/","dependencies":[]},{"name":"package_info","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.0+17/","dependencies":[]},{"name":"path_provider","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.7/","dependencies":[]},{"name":"permission_handler","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/permission_handler-3.3.0/","dependencies":[]},{"name":"share","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/share-0.6.4/","dependencies":[]},{"name":"shared_preferences","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.7/","dependencies":[]},{"name":"sqflite","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.0/","dependencies":[]},{"name":"url_launcher","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher-5.4.5/","dependencies":[]},{"name":"webview_flutter","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/webview_flutter-0.3.21/","dependencies":[]}],"android":[{"name":"connectivity","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/connectivity-0.4.8+2/","dependencies":[]},{"name":"fluttertoast","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/fluttertoast-3.1.3/","dependencies":[]},{"name":"install_apk_plugin","path":"/Users/yuzo/yuzo/flutter/workspace/OpenGit_Flutter/flutter_common_lib/install_apk_plugin/","dependencies":[]},{"name":"package_info","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/package_info-0.4.0+17/","dependencies":[]},{"name":"path_provider","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider-1.6.7/","dependencies":[]},{"name":"permission_handler","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/permission_handler-3.3.0/","dependencies":[]},{"name":"share","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/share-0.6.4/","dependencies":[]},{"name":"shared_preferences","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences-0.5.7/","dependencies":[]},{"name":"sqflite","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.0/","dependencies":[]},{"name":"url_launcher","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher-5.4.5/","dependencies":[]},{"name":"webview_flutter","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/webview_flutter-0.3.21/","dependencies":[]}],"macos":[{"name":"connectivity_macos","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/connectivity_macos-0.1.0+2/","dependencies":[]},{"name":"path_provider_macos","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/path_provider_macos-0.0.4+1/","dependencies":[]},{"name":"shared_preferences_macos","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_macos-0.0.1+7/","dependencies":[]},{"name":"sqflite","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/sqflite-1.3.0/","dependencies":[]},{"name":"url_launcher_macos","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_macos-0.0.1+5/","dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"shared_preferences_web","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/shared_preferences_web-0.1.2+4/","dependencies":[]},{"name":"url_launcher_web","path":"/Users/yuzo/yuzo/flutter/flutter/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_web-0.1.1+2/","dependencies":[]}]},"dependencyGraph":[{"name":"connectivity","dependencies":["connectivity_macos"]},{"name":"connectivity_macos","dependencies":[]},{"name":"fluttertoast","dependencies":[]},{"name":"install_apk_plugin","dependencies":[]},{"name":"package_info","dependencies":[]},{"name":"path_provider","dependencies":["path_provider_macos"]},{"name":"path_provider_macos","dependencies":[]},{"name":"permission_handler","dependencies":[]},{"name":"share","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"sqflite","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_macos"]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"webview_flutter","dependencies":[]}],"date_created":"2020-04-29 16:10:32.684729","version":"1.15.21-pre.11"}

README.md

@@ -119,6 +119,13 @@ flutter install
 
     1. 优化bloc架构；
     2. 增加足迹页面；
+
+## 1.5.0版本
+
+    1. 首页改版；
+    2. 个人、组织资料详情页改版；
+    3. 项目详情页增加topic；
+    4. 个人、组织资料详情页增加Hero动画；
 
 ## 学习历程
 
@@ -191,7 +198,7 @@ UI层我们主要使用的是material组件库，对Scaffold 、 AppBar 进行
 
 扫码下载
 
-![](https://raw.githubusercontent.com/Yuzopro/image/master/flutter/flutter_opengit_3.png)
+![](https://user-gold-cdn.xitu.io/2020/4/29/171c395d5cb15f02?imageView2/2/w/480/h/480/q/85/interlace/1)
 
 ## IOS需要自行下载代码运行。（效果是一致的）
 
@@ -227,6 +234,8 @@ UI层我们主要使用的是material组件库，对Scaffold 、 AppBar 进行
 
 - [Github-trending-api](https://github.com/huchenme/github-trending-api)
 
+- [WanAndroid-api](https://www.wanandroid.com/blog/show/2)
+
 ## 关于作者
 
 - [个人博客](https://yuzopro.github.io/)
@@ -242,7 +251,7 @@ UI层我们主要使用的是material组件库，对Scaffold 、 AppBar 进行
 
 如果觉得好？请打赏下作者😀
 
-<img src="https://raw.githubusercontent.com/Yuzopro/image/master/flutter/weixin_pay.jpeg" width="260px"/>
+<img src="https://user-gold-cdn.xitu.io/2020/4/29/171c3931f90b0905?w=1080&h=1080&f=jpeg&s=50798" width="260px"/>
 
 ## 默认条款
 

assets/data/home_data.json

@@ -0,0 +1,86 @@
+{
+  "recommend": [
+    {
+      "title": "opengit_flutter",
+      "subTitle": "基于flutter开发的Github客户端",
+      "tag": "Flutter",
+      "name": "yuzopro",
+      "repo": "opengit_flutter",
+      "url": "",
+      "type": 1,
+      "image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1588070900098&di=3ba47a6d1303002fcc049e1bc4815d5e&imgtype=0&src=http%3A%2F%2Fpic4.zhimg.com%2Fv2-29650a2de5543135da189ab250d79b8d_1200x500.jpg"
+    },
+    {
+      "title": "opengit_kotlin",
+      "subTitle": "基于Jetpack开发的Github客户端",
+      "tag": "Jetpack/Kotlin",
+      "name": "yuzopro",
+      "repo": "opengit_kotlin",
+      "url": "",
+      "type": 1,
+      "image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1588070900098&di=3ba47a6d1303002fcc049e1bc4815d5e&imgtype=0&src=http%3A%2F%2Fpic4.zhimg.com%2Fv2-29650a2de5543135da189ab250d79b8d_1200x500.jpg"
+    },
+    {
+      "title": "flutter",
+      "subTitle": "Flutter是谷歌的移动UI框架，可以快速在Android和Ios上构建高质量的原生用户界面。",
+      "tag": "Android/Ios/Dart",
+      "name": "flutter",
+      "repo": "flutter",
+      "url": "",
+      "type": 1,
+      "image": "https://cdn.jsdelivr.net/gh/flutterchina/[email protected]/images/flutter-mark-square-100.png"
+    },
+    {
+      "title": "FlutterUnit",
+      "subTitle": "Flutter集录指南App",
+      "tag": "Flutter",
+      "name": "toly1994328",
+      "repo": "FlutterUnit",
+      "url": "",
+      "type": 1,
+      "image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1588070900098&di=3ba47a6d1303002fcc049e1bc4815d5e&imgtype=0&src=http%3A%2F%2Fpic4.zhimg.com%2Fv2-29650a2de5543135da189ab250d79b8d_1200x500.jpg"
+    }
+  ],
+  "other": [
+    {
+      "title": "Flutter开发一个GitHub客户端及学习总结",
+      "subTitle": "OpenGit开发过程经验分享",
+      "tag": "OpenGit/Github客户端/Flutter",
+      "name": "",
+      "repo": "",
+      "url": "https://juejin.im/post/5d16167b5188255c442d18bd",
+      "type": 2,
+      "image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1588070900098&di=3ba47a6d1303002fcc049e1bc4815d5e&imgtype=0&src=http%3A%2F%2Fpic4.zhimg.com%2Fv2-29650a2de5543135da189ab250d79b8d_1200x500.jpg"
+    },
+    {
+      "title": "Flutter中文网",
+      "subTitle": "最好的flutter中文教程",
+      "tag": "Flutter",
+      "name": "",
+      "repo": "",
+      "url": "https://flutterchina.club/",
+      "type": 2,
+      "image": "https://cdn.jsdelivr.net/gh/flutterchina/[email protected]/images/flutter-mark-square-100.png"
+    },
+    {
+      "title": "掘金Flutter社区",
+      "subTitle": "掘金flutter文章汇总",
+      "tag": "Flutter",
+      "name": "",
+      "repo": "",
+      "url": "",
+      "type": 3,
+      "image": "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1588070737744&di=67901ca4e4f4bc3a4dd73e9fed46013f&imgtype=0&src=http%3A%2F%2Fww1.sinaimg.cn%2Fbmiddle%2F005SiNxyjw1ez2kcj4awzj30sg0sg76b.jpg"
+    },
+    {
+      "title": "Yuzo",
+      "subTitle": "OpenGit开发作者",
+      "tag": "Github人物",
+      "name": "yuzopro",
+      "repo": "",
+      "url": "",
+      "type": 4,
+      "image": "https://avatars2.githubusercontent.com/u/47881647?v=4"
+    }
+  ]
+}

lib/bean/home_banner_bean.dart

@@ -0,0 +1,58 @@
+import 'package:json_annotation/json_annotation.dart';
+
+part 'home_banner_bean.g.dart';
+
+@JsonSerializable()
+class HomeBannerBean extends Object {
+  List<Data> data;
+
+  int errorCode;
+
+  String errorMsg;
+
+  HomeBannerBean(
+    this.data,
+    this.errorCode,
+    this.errorMsg,
+  );
+
+  factory HomeBannerBean.fromJson(Map<String, dynamic> srcJson) =>
+      _$HomeBannerBeanFromJson(srcJson);
+
+  Map<String, dynamic> toJson() => _$HomeBannerBeanToJson(this);
+}
+
+@JsonSerializable()
+class Data extends Object {
+  String desc;
+
+  int id;
+
+  String imagePath;
+
+  int isVisible;
+
+  int order;
+
+  String title;
+
+  int type;
+
+  String url;
+
+  Data(
+    this.desc,
+    this.id,
+    this.imagePath,
+    this.isVisible,
+    this.order,
+    this.title,
+    this.type,
+    this.url,
+  );
+
+  factory Data.fromJson(Map<String, dynamic> srcJson) =>
+      _$DataFromJson(srcJson);
+
+  Map<String, dynamic> toJson() => _$DataToJson(this);
+}

lib/bean/home_bean.dart

@@ -0,0 +1,7 @@
+import 'package:open_git/bean/home_banner_bean.dart';
+import 'package:open_git/bean/home_item_bean.dart';
+
+class HomeBean {
+  List<Data> banner;
+  HomeItemBean itemBean;
+}