From d60786fa26132360814b37df12551fac7d5fa9d7 Mon Sep 17 00:00:00 2001 From: toly <1981462002@qq.com> Date: Sat, 20 Mar 2021 09:05:59 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/app/api/category_api.dart | 13 ++- lib/app/res/style/shape/techno_shape.dart | 1 - lib/blocs/category/category_bloc.dart | 4 +- .../category_widget/category_widget_bloc.dart | 2 +- lib/blocs/detail/detail_bloc.dart | 2 +- lib/blocs/global/global_bloc.dart | 2 +- lib/blocs/like/like_bloc.dart | 2 +- lib/blocs/search/search_bloc.dart | 2 +- lib/blocs/search/search_event.dart | 3 +- lib/blocs/widgets/widgets_bloc.dart | 3 +- lib/model/category_model.dart | 2 +- lib/model/github/g/github_user.g.dart | 46 +++++----- lib/model/github/github_user.dart | 92 +++++++++---------- lib/model/github/issue.dart | 30 +++--- lib/model/widget_model.dart | 2 +- .../app_storage.dart | 0 .../po => repositories/bean}/category_po.dart | 0 .../po => repositories/bean}/node_po.dart | 0 .../po => repositories/bean}/widget_po.dart | 0 .../dao/category_dao.dart | 2 +- .../dao/local_storage.dart | 0 .../dao/node_dao.dart | 6 +- .../dao/widget_dao.dart | 5 +- .../{itf => rep}/category_repository.dart | 2 +- .../impl/catagory_db_repository.dart | 15 ++- .../{ => rep}/impl/widget_db_repository.dart | 11 ++- .../{itf => rep}/widget_repository.dart | 2 +- lib/user_system/api/user_api.dart | 18 ++-- lib/user_system/bloc/authentic/bloc.dart | 2 +- lib/user_system/bloc/authentic/event.dart | 4 +- .../flutter/no_div_expansion_tile.dart | 2 - .../project/nav}/unit_bottom_bar.dart | 55 ++++++----- lib/views/pages/app/bloc_wrapper.dart | 20 ++-- lib/views/pages/app/unit_navigation.dart | 19 +++- .../pages/category/sync/async_button.dart | 2 +- .../pages/category/sync/upload_button.dart | 2 +- .../pages/data_manage/data_manage_page.dart | 2 +- lib/views/pages/issues_point/issue_item.dart | 2 +- .../pages/issues_point/issues_detail.dart | 4 +- lib/views/pages/search/app_search_bar.dart | 2 +- lib/views/pages/search/serach_page.dart | 2 +- lib/views/pages/splash/splash_bottom.dart | 15 +-- lib/views/pages/splash/unit_splash.dart | 4 +- .../widget_detail/category_end_drawer.dart | 2 +- lib/views/pages/widget_home/home_page.dart | 2 +- lib/views/pages/widget_home/toly_app_bar.dart | 11 ++- .../CustomMultiChildLayout/node1_base.dart | 2 - .../ListBody/node1_base.dart | 1 - .../ListWheelViewport/node2_perspective.dart | 2 - .../ListWheelViewport/node3_magnifier.dart | 2 - .../ListWheelViewport/node4_opacity.dart | 2 - .../ProxyWidget/LayoutId/node1_base.dart | 2 - .../ProxyWidget/SliderTheme/node1_base.dart | 2 - .../ColorFiltered/node1_base.dart | 1 - .../CustomPaint/node2_bezier.dart | 2 +- .../RepaintBoundary/main.dart | 2 - .../RepaintBoundary/node1_base.dart | 2 +- .../Sliver/SliverAnimatedList/node1_base.dart | 2 - .../SliverLayoutBuilder/node1_base.dart | 4 +- .../DraggableScrollableSheet/node1_base.dart | 4 - .../node1_base.dart | 4 - .../RawKeyboardListener/node1_base.dart | 1 - .../StatefulBuilder/node1_base.dart | 1 - .../StatefulWidget/TextField/node1_base.dart | 1 - .../TextField/node2_cursor.dart | 1 - .../node1_base.dart | 4 - .../SimpleDialog/node1_base.dart | 1 - .../StatelessWidget/Theme/node1_base.dart | 4 +- 68 files changed, 233 insertions(+), 233 deletions(-) rename lib/{storage => repositories}/app_storage.dart (100%) rename lib/{storage/po => repositories/bean}/category_po.dart (100%) rename lib/{storage/po => repositories/bean}/node_po.dart (100%) rename lib/{storage/po => repositories/bean}/widget_po.dart (100%) rename lib/{storage => repositories}/dao/category_dao.dart (99%) rename lib/{storage => repositories}/dao/local_storage.dart (100%) rename lib/{storage => repositories}/dao/node_dao.dart (91%) rename lib/{storage => repositories}/dao/widget_dao.dart (96%) rename lib/repositories/{itf => rep}/category_repository.dart (95%) rename lib/repositories/{ => rep}/impl/catagory_db_repository.dart (93%) rename lib/repositories/{ => rep}/impl/widget_db_repository.dart (87%) rename lib/repositories/{itf => rep}/widget_repository.dart (90%) rename lib/views/{pages/app => components/project/nav}/unit_bottom_bar.dart (78%) diff --git a/lib/app/api/category_api.dart b/lib/app/api/category_api.dart index 38c7b86..93868d6 100644 --- a/lib/app/api/category_api.dart +++ b/lib/app/api/category_api.dart @@ -9,26 +9,29 @@ import 'package:flutter_unit/app/utils/http_utils/result_bean.dart'; class CategoryApi { static Future> uploadCategoryData( {String data, String likeData}) async { + String errorMsg = ""; + var result = await HttpUtil.getInstance().client.post( PathUnit.categoryDataSync, data: {"data": data, "likeData": likeData}).catchError((err) { - return ResultBean.error('请求错误: ${err.toString()}'); + errorMsg =err.toString(); }); if (result.data != null) { return ResultBean.fromData(result.data); } - return ResultBean.error('请求错误'); + return ResultBean.error('请求错误: $errorMsg'); } static Future> getCategoryData() async { - + String errorMsg = ""; var result = await HttpUtil.getInstance() .client .get(PathUnit.categoryData) .catchError((err) { - return ResultBean.error('请求错误: ${err.toString()}'); + errorMsg =err.toString(); + }); // 获取的数据非空且 status = true @@ -41,7 +44,7 @@ class CategoryApi { } } - return ResultBean.error('请求错误'); + return ResultBean.error('请求错误: $errorMsg'); } } diff --git a/lib/app/res/style/shape/techno_shape.dart b/lib/app/res/style/shape/techno_shape.dart index 5b1889c..ab1c329 100644 --- a/lib/app/res/style/shape/techno_shape.dart +++ b/lib/app/res/style/shape/techno_shape.dart @@ -81,7 +81,6 @@ class TechnoShapeBorder extends ShapeBorder { @override ShapeBorder scale(double t) { - // TODO: implement scale return null; } } diff --git a/lib/blocs/category/category_bloc.dart b/lib/blocs/category/category_bloc.dart index 23c57cb..f8ef1b8 100644 --- a/lib/blocs/category/category_bloc.dart +++ b/lib/blocs/category/category_bloc.dart @@ -4,8 +4,8 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/res/style/unit_color.dart'; import 'package:flutter_unit/app/utils/color_utils.dart'; import 'package:flutter_unit/model/category_model.dart'; -import 'package:flutter_unit/repositories/itf/category_repository.dart'; -import 'package:flutter_unit/storage/po/category_po.dart'; +import 'package:flutter_unit/repositories/bean/category_po.dart'; +import 'package:flutter_unit/repositories/rep/category_repository.dart'; import 'category_event.dart'; import 'category_state.dart'; diff --git a/lib/blocs/category_widget/category_widget_bloc.dart b/lib/blocs/category_widget/category_widget_bloc.dart index 288cd5c..de5ee92 100644 --- a/lib/blocs/category_widget/category_widget_bloc.dart +++ b/lib/blocs/category_widget/category_widget_bloc.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/blocs/category/category_bloc.dart'; import 'package:flutter_unit/blocs/category/category_event.dart'; -import 'package:flutter_unit/repositories/itf/category_repository.dart'; +import 'package:flutter_unit/repositories/rep/category_repository.dart'; import 'category_widget_event.dart'; import 'category_widget_state.dart'; diff --git a/lib/blocs/detail/detail_bloc.dart b/lib/blocs/detail/detail_bloc.dart index 2025d72..c477b7b 100644 --- a/lib/blocs/detail/detail_bloc.dart +++ b/lib/blocs/detail/detail_bloc.dart @@ -1,7 +1,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/model/widget_model.dart'; -import 'package:flutter_unit/repositories/itf/widget_repository.dart'; +import 'package:flutter_unit/repositories/rep/widget_repository.dart'; import 'detail_event.dart'; import 'detail_state.dart'; diff --git a/lib/blocs/global/global_bloc.dart b/lib/blocs/global/global_bloc.dart index 97cb9b1..13953ba 100644 --- a/lib/blocs/global/global_bloc.dart +++ b/lib/blocs/global/global_bloc.dart @@ -1,7 +1,7 @@ import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_unit/storage/app_storage.dart'; import 'package:flutter_unit/app/res/cons.dart'; import 'package:flutter_unit/app/res/sp.dart'; +import 'package:flutter_unit/repositories/app_storage.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'global_event.dart'; diff --git a/lib/blocs/like/like_bloc.dart b/lib/blocs/like/like_bloc.dart index 4c100fb..2072b76 100644 --- a/lib/blocs/like/like_bloc.dart +++ b/lib/blocs/like/like_bloc.dart @@ -1,7 +1,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flutter_unit/repositories/itf/widget_repository.dart'; +import 'package:flutter_unit/repositories/rep/widget_repository.dart'; import 'like_event.dart'; import 'like_state.dart'; diff --git a/lib/blocs/search/search_bloc.dart b/lib/blocs/search/search_bloc.dart index c9e2328..27309f7 100644 --- a/lib/blocs/search/search_bloc.dart +++ b/lib/blocs/search/search_bloc.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:flutter_unit/repositories/itf/widget_repository.dart'; +import 'package:flutter_unit/repositories/rep/widget_repository.dart'; import 'search_event.dart'; import 'search_state.dart'; diff --git a/lib/blocs/search/search_event.dart b/lib/blocs/search/search_event.dart index 0f6a466..c14bff1 100644 --- a/lib/blocs/search/search_event.dart +++ b/lib/blocs/search/search_event.dart @@ -1,6 +1,5 @@ - -import 'package:flutter_unit/storage/dao/widget_dao.dart'; +import 'package:flutter_unit/repositories/dao/widget_dao.dart'; abstract class SearchEvent{//事件基 const SearchEvent(); diff --git a/lib/blocs/widgets/widgets_bloc.dart b/lib/blocs/widgets/widgets_bloc.dart index de50f16..d624c23 100644 --- a/lib/blocs/widgets/widgets_bloc.dart +++ b/lib/blocs/widgets/widgets_bloc.dart @@ -2,7 +2,8 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/model/enums.dart'; -import 'package:flutter_unit/repositories/itf/widget_repository.dart'; +import 'package:flutter_unit/repositories/rep/widget_repository.dart'; + import 'widgets_event.dart'; import 'widgets_state.dart'; diff --git a/lib/model/category_model.dart b/lib/model/category_model.dart index c2a985e..da1f3ef 100644 --- a/lib/model/category_model.dart +++ b/lib/model/category_model.dart @@ -1,7 +1,7 @@ import 'package:equatable/equatable.dart'; import 'package:flutter/material.dart'; import 'package:flutter_unit/app/utils/color_utils.dart'; -import 'package:flutter_unit/storage/po/category_po.dart'; +import 'package:flutter_unit/repositories/bean/category_po.dart'; import 'package:intl/intl.dart'; /// create by 张风捷特烈 on 2020-04-21 diff --git a/lib/model/github/g/github_user.g.dart b/lib/model/github/g/github_user.g.dart index 3e9dfb7..96866eb 100644 --- a/lib/model/github/g/github_user.g.dart +++ b/lib/model/github/g/github_user.g.dart @@ -55,22 +55,22 @@ GithubUser _$UserFromJson(Map json) { Map _$UserToJson(GithubUser instance) => { 'login': instance.login, 'id': instance.id, - 'node_id': instance.node_id, - 'avatar_url': instance.avatar_url, - 'gravatar_id': instance.gravatar_id, + 'node_id': instance.nodeId, + 'avatar_url': instance.avatarUrl, + 'gravatar_id': instance.gravatarId, 'url': instance.url, - 'html_url': instance.html_url, - 'followers_url': instance.followers_url, - 'following_url': instance.following_url, - 'gists_url': instance.gists_url, - 'starred_url': instance.starred_url, - 'subscriptions_url': instance.subscriptions_url, - 'organizations_url': instance.organizations_url, - 'repos_url': instance.repos_url, - 'events_url': instance.events_url, - 'received_events_url': instance.received_events_url, + 'html_url': instance.htmlUrl, + 'followers_url': instance.followersUrl, + 'following_url': instance.followingUrl, + 'gists_url': instance.gistsUrl, + 'starred_url': instance.starredUrl, + 'subscriptions_url': instance.subscriptionsUrl, + 'organizations_url': instance.organizationsUrl, + 'repos_url': instance.reposUrl, + 'events_url': instance.eventsUrl, + 'received_events_url': instance.receivedEventsUrl, 'type': instance.type, - 'site_admin': instance.site_admin, + 'site_admin': instance.siteAdmin, 'name': instance.name, 'company': instance.company, 'blog': instance.blog, @@ -78,16 +78,16 @@ Map _$UserToJson(GithubUser instance) => { 'email': instance.email, 'starred': instance.starred, 'bio': instance.bio, - 'public_repos': instance.public_repos, - 'public_gists': instance.public_gists, + 'public_repos': instance.publicRepos, + 'public_gists': instance.publicGists, 'followers': instance.followers, 'following': instance.following, - 'created_at': instance.created_at?.toIso8601String(), - 'updated_at': instance.updated_at?.toIso8601String(), - 'private_gists': instance.private_gists, - 'total_private_repos': instance.total_private_repos, - 'owned_private_repos': instance.owned_private_repos, - 'disk_usage': instance.disk_usage, + 'created_at': instance.createdAt?.toIso8601String(), + 'updated_at': instance.updatedAt?.toIso8601String(), + 'private_gists': instance.privateGists, + 'total_private_repos': instance.totalPrivateRepos, + 'owned_private_repos': instance.ownedPrivateRepos, + 'disk_usage': instance.diskUsage, 'collaborators': instance.collaborators, - 'two_factor_authentication': instance.two_factor_authentication, + 'two_factor_authentication': instance.twoFactorAuthentication, }; diff --git a/lib/model/github/github_user.dart b/lib/model/github/github_user.dart index 5ece15b..1558c03 100644 --- a/lib/model/github/github_user.dart +++ b/lib/model/github/github_user.dart @@ -8,22 +8,22 @@ class GithubUser { GithubUser( this.login, this.id, - this.node_id, - this.avatar_url, - this.gravatar_id, + this.nodeId, + this.avatarUrl, + this.gravatarId, this.url, - this.html_url, - this.followers_url, - this.following_url, - this.gists_url, - this.starred_url, - this.subscriptions_url, - this.organizations_url, - this.repos_url, - this.events_url, - this.received_events_url, + this.htmlUrl, + this.followersUrl, + this.followingUrl, + this.gistsUrl, + this.starredUrl, + this.subscriptionsUrl, + this.organizationsUrl, + this.reposUrl, + this.eventsUrl, + this.receivedEventsUrl, this.type, - this.site_admin, + this.siteAdmin, this.name, this.company, this.blog, @@ -31,37 +31,37 @@ class GithubUser { this.email, this.starred, this.bio, - this.public_repos, - this.public_gists, + this.publicRepos, + this.publicGists, this.followers, this.following, - this.created_at, - this.updated_at, - this.private_gists, - this.total_private_repos, - this.owned_private_repos, - this.disk_usage, + this.createdAt, + this.updatedAt, + this.privateGists, + this.totalPrivateRepos, + this.ownedPrivateRepos, + this.diskUsage, this.collaborators, - this.two_factor_authentication); + this.twoFactorAuthentication); String login; int id; - String node_id; - String avatar_url; - String gravatar_id; + String nodeId; + String avatarUrl; + String gravatarId; String url; - String html_url; - String followers_url; - String following_url; - String gists_url; - String starred_url; - String subscriptions_url; - String organizations_url; - String repos_url; - String events_url; - String received_events_url; + String htmlUrl; + String followersUrl; + String followingUrl; + String gistsUrl; + String starredUrl; + String subscriptionsUrl; + String organizationsUrl; + String reposUrl; + String eventsUrl; + String receivedEventsUrl; String type; - bool site_admin; + bool siteAdmin; String name; String company; String blog; @@ -69,18 +69,18 @@ class GithubUser { String email; String starred; String bio; - int public_repos; - int public_gists; + int publicRepos; + int publicGists; int followers; int following; - DateTime created_at; - DateTime updated_at; - int private_gists; - int total_private_repos; - int owned_private_repos; - int disk_usage; + DateTime createdAt; + DateTime updatedAt; + int privateGists; + int totalPrivateRepos; + int ownedPrivateRepos; + int diskUsage; int collaborators; - bool two_factor_authentication; + bool twoFactorAuthentication; factory GithubUser.fromJson(Map json) => _$UserFromJson(json); diff --git a/lib/model/github/issue.dart b/lib/model/github/issue.dart index 38c636d..62634e8 100644 --- a/lib/model/github/issue.dart +++ b/lib/model/github/issue.dart @@ -4,30 +4,30 @@ import 'package:flutter_unit/model/github/github_user.dart'; part 'g/issue.g.dart'; class Issue extends Equatable { - int id; - int number; - String title; - String state; - bool locked; + final int id; + final int number; + final String title; + final String state; + final bool locked; - int commentNum; + final int commentNum; - DateTime createdAt; + final DateTime createdAt; - DateTime updatedAt; + final DateTime updatedAt; - DateTime closedAt; - String body; + final DateTime closedAt; + final String body; - String bodyHtml; + final String bodyHtml; - GithubUser user; + final GithubUser user; - String repoUrl; + final String repoUrl; - String htmlUrl; + final String htmlUrl; - GithubUser closeBy; + final GithubUser closeBy; Issue( this.id, diff --git a/lib/model/widget_model.dart b/lib/model/widget_model.dart index c232d08..c3f67c3 100644 --- a/lib/model/widget_model.dart +++ b/lib/model/widget_model.dart @@ -3,7 +3,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter_unit/app/utils/convert.dart'; import 'package:flutter_unit/model/enums.dart'; import 'package:flutter_unit/app/res/cons.dart'; -import 'package:flutter_unit/storage/po/widget_po.dart'; +import 'package:flutter_unit/repositories/bean/widget_po.dart'; /// create by 张风捷特烈 on 2020-03-04 /// contact me by email 1981462002@qq.com diff --git a/lib/storage/app_storage.dart b/lib/repositories/app_storage.dart similarity index 100% rename from lib/storage/app_storage.dart rename to lib/repositories/app_storage.dart diff --git a/lib/storage/po/category_po.dart b/lib/repositories/bean/category_po.dart similarity index 100% rename from lib/storage/po/category_po.dart rename to lib/repositories/bean/category_po.dart diff --git a/lib/storage/po/node_po.dart b/lib/repositories/bean/node_po.dart similarity index 100% rename from lib/storage/po/node_po.dart rename to lib/repositories/bean/node_po.dart diff --git a/lib/storage/po/widget_po.dart b/lib/repositories/bean/widget_po.dart similarity index 100% rename from lib/storage/po/widget_po.dart rename to lib/repositories/bean/widget_po.dart diff --git a/lib/storage/dao/category_dao.dart b/lib/repositories/dao/category_dao.dart similarity index 99% rename from lib/storage/dao/category_dao.dart rename to lib/repositories/dao/category_dao.dart index 8ce9542..f3274f3 100644 --- a/lib/storage/dao/category_dao.dart +++ b/lib/repositories/dao/category_dao.dart @@ -2,7 +2,7 @@ import 'package:sqflite/sqflite.dart'; import '../app_storage.dart'; -import '../po/category_po.dart'; +import '../bean/category_po.dart'; //""" diff --git a/lib/storage/dao/local_storage.dart b/lib/repositories/dao/local_storage.dart similarity index 100% rename from lib/storage/dao/local_storage.dart rename to lib/repositories/dao/local_storage.dart diff --git a/lib/storage/dao/node_dao.dart b/lib/repositories/dao/node_dao.dart similarity index 91% rename from lib/storage/dao/node_dao.dart rename to lib/repositories/dao/node_dao.dart index c8e3990..3e0ae9e 100644 --- a/lib/storage/dao/node_dao.dart +++ b/lib/repositories/dao/node_dao.dart @@ -1,6 +1,8 @@ -import 'package:flutter_unit/storage/app_storage.dart'; +import 'package:flutter_unit/repositories/bean/node_po.dart'; + +import '../app_storage.dart'; + -import '../po/node_po.dart'; class NodeDao { diff --git a/lib/storage/dao/widget_dao.dart b/lib/repositories/dao/widget_dao.dart similarity index 96% rename from lib/storage/dao/widget_dao.dart rename to lib/repositories/dao/widget_dao.dart index 3390ae4..02e61e9 100644 --- a/lib/storage/dao/widget_dao.dart +++ b/lib/repositories/dao/widget_dao.dart @@ -1,7 +1,8 @@ -import 'package:flutter_unit/storage/app_storage.dart'; + import 'package:flutter_unit/model/enums.dart'; -import '../po/widget_po.dart'; +import '../app_storage.dart'; +import '../bean/widget_po.dart'; class WidgetDao { diff --git a/lib/repositories/itf/category_repository.dart b/lib/repositories/rep/category_repository.dart similarity index 95% rename from lib/repositories/itf/category_repository.dart rename to lib/repositories/rep/category_repository.dart index ff17af9..49d3f5a 100644 --- a/lib/repositories/itf/category_repository.dart +++ b/lib/repositories/rep/category_repository.dart @@ -1,6 +1,6 @@ import 'package:flutter_unit/model/category_model.dart'; import 'package:flutter_unit/model/widget_model.dart'; -import 'package:flutter_unit/storage/po/category_po.dart'; +import 'package:flutter_unit/repositories/bean/category_po.dart'; /// create by 张风捷特烈 on 2020-04-21 /// contact me by email 1981462002@qq.com diff --git a/lib/repositories/impl/catagory_db_repository.dart b/lib/repositories/rep/impl/catagory_db_repository.dart similarity index 93% rename from lib/repositories/impl/catagory_db_repository.dart rename to lib/repositories/rep/impl/catagory_db_repository.dart index eedc3a6..934912a 100644 --- a/lib/repositories/impl/catagory_db_repository.dart +++ b/lib/repositories/rep/impl/catagory_db_repository.dart @@ -3,11 +3,16 @@ import 'dart:convert'; import 'package:flutter_unit/model/category_model.dart'; import 'package:flutter_unit/model/widget_model.dart'; -import 'package:flutter_unit/repositories/itf/category_repository.dart'; -import 'package:flutter_unit/storage/app_storage.dart'; -import 'package:flutter_unit/storage/dao/category_dao.dart'; -import 'package:flutter_unit/storage/po/category_po.dart'; -import 'package:flutter_unit/storage/po/widget_po.dart'; +import 'package:flutter_unit/repositories/bean/category_po.dart'; +import 'package:flutter_unit/repositories/bean/widget_po.dart'; +import 'package:flutter_unit/repositories/dao/category_dao.dart'; +import 'package:flutter_unit/repositories/rep/category_repository.dart'; + +import '../../app_storage.dart'; + + + + /// create by 张风捷特烈 on 2020-04-21 /// contact me by email 1981462002@qq.com diff --git a/lib/repositories/impl/widget_db_repository.dart b/lib/repositories/rep/impl/widget_db_repository.dart similarity index 87% rename from lib/repositories/impl/widget_db_repository.dart rename to lib/repositories/rep/impl/widget_db_repository.dart index 775d809..8aa3bf3 100644 --- a/lib/repositories/impl/widget_db_repository.dart +++ b/lib/repositories/rep/impl/widget_db_repository.dart @@ -1,13 +1,14 @@ -import 'package:flutter_unit/storage/app_storage.dart'; +import 'package:flutter_unit/repositories/app_storage.dart'; +import 'package:flutter_unit/repositories/bean/widget_po.dart'; +import 'package:flutter_unit/repositories/dao/node_dao.dart'; +import 'package:flutter_unit/repositories/dao/widget_dao.dart'; import 'package:flutter_unit/model/enums.dart'; -import 'package:flutter_unit/storage/dao/node_dao.dart'; -import 'package:flutter_unit/storage/po/widget_po.dart'; -import 'package:flutter_unit/storage/dao/widget_dao.dart'; import 'package:flutter_unit/model/node_model.dart'; import 'package:flutter_unit/model/widget_model.dart'; -import 'package:flutter_unit/repositories/itf/widget_repository.dart'; +import 'package:flutter_unit/repositories/rep/widget_repository.dart'; + /// create by 张风捷特烈 on 2020-03-03 /// contact me by email 1981462002@qq.com diff --git a/lib/repositories/itf/widget_repository.dart b/lib/repositories/rep/widget_repository.dart similarity index 90% rename from lib/repositories/itf/widget_repository.dart rename to lib/repositories/rep/widget_repository.dart index 5c0bbe0..c28dbd8 100644 --- a/lib/repositories/itf/widget_repository.dart +++ b/lib/repositories/rep/widget_repository.dart @@ -1,7 +1,7 @@ import 'package:flutter_unit/model/enums.dart'; -import 'package:flutter_unit/storage/dao/widget_dao.dart'; import 'package:flutter_unit/model/node_model.dart'; import 'package:flutter_unit/model/widget_model.dart'; +import 'package:flutter_unit/repositories/dao/widget_dao.dart'; /// create by 张风捷特烈 on 2020-03-03 /// contact me by email 1981462002@qq.com diff --git a/lib/user_system/api/user_api.dart b/lib/user_system/api/user_api.dart index 7f878f5..03dee88 100644 --- a/lib/user_system/api/user_api.dart +++ b/lib/user_system/api/user_api.dart @@ -9,43 +9,45 @@ import 'package:flutter_unit/user_system/model/user.dart'; class UserApi { static Future> register({String email, String code}) async { + String errorMsg = ""; var result = await HttpUtil.getInstance().client.post(PathUnit.register, data: {"email": email, "activeCode": code}).catchError((err) { - return ResultBean.error('请求错误: ${err.toString()}'); + errorMsg = err.toString(); }); if (result.data != null) { return ResultBean.fromData(result.data); } - return ResultBean.error('请求错误'); + return ResultBean.error('请求错误: $errorMsg'); } - static Future> login({String username, String password}) async { + static Future> login( + {String username, String password}) async { + String errorMsg = ""; var result = await HttpUtil.getInstance().client.post(PathUnit.login, data: {"username": username, "password": password}).catchError((err) { - return ResultBean.error('请求错误: ${err.toString()}'); + errorMsg = err.toString(); }); if (result.data != null) { - if(result.data['status']){ + if (result.data['status']) { return ResultBean( msg: result.data['msg'], data: User.fromJson(result.data['data']), status: result.data['status'], ); - }else{ + } else { return ResultBean( msg: result.data['msg'], data: null, status: false, ); } - } - return ResultBean.error('请求错误'); + return ResultBean.error('请求错误: $errorMsg'); } } diff --git a/lib/user_system/bloc/authentic/bloc.dart b/lib/user_system/bloc/authentic/bloc.dart index b8a5a0f..365b1de 100644 --- a/lib/user_system/bloc/authentic/bloc.dart +++ b/lib/user_system/bloc/authentic/bloc.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:bloc/bloc.dart'; import 'package:flutter_unit/app/utils/http_utils/http_util.dart'; -import 'package:flutter_unit/storage/dao/local_storage.dart'; +import 'package:flutter_unit/repositories/dao/local_storage.dart'; import 'package:flutter_unit/user_system/model/user.dart'; import 'package:jwt_decoder/jwt_decoder.dart'; diff --git a/lib/user_system/bloc/authentic/event.dart b/lib/user_system/bloc/authentic/event.dart index e4d9b57..974a60a 100644 --- a/lib/user_system/bloc/authentic/event.dart +++ b/lib/user_system/bloc/authentic/event.dart @@ -13,7 +13,9 @@ abstract class AuthEvent extends Equatable { List get props => []; } -class AppStarted extends AuthEvent {} +class AppStarted extends AuthEvent { + const AppStarted(); +} class LoginOver extends AuthEvent { final String token; diff --git a/lib/views/components/flutter/no_div_expansion_tile.dart b/lib/views/components/flutter/no_div_expansion_tile.dart index 4cb93ff..6dcbbe5 100644 --- a/lib/views/components/flutter/no_div_expansion_tile.dart +++ b/lib/views/components/flutter/no_div_expansion_tile.dart @@ -93,7 +93,6 @@ class _NoBorderExpansionTileState extends State with Sing AnimationController _controller; Animation _iconTurns; Animation _heightFactor; - Animation _borderColor; Animation _headerColor; Animation _iconColor; Animation _backgroundColor; @@ -106,7 +105,6 @@ class _NoBorderExpansionTileState extends State with Sing _controller = AnimationController(duration: _kExpand, vsync: this); _heightFactor = _controller.drive(_easeInTween); _iconTurns = _controller.drive(_halfTween.chain(_easeInTween)); - _borderColor = _controller.drive(_borderColorTween.chain(_easeOutTween)); _headerColor = _controller.drive(_headerColorTween.chain(_easeInTween)); _iconColor = _controller.drive(_iconColorTween.chain(_easeInTween)); _backgroundColor = _controller.drive(_backgroundColorTween.chain(_easeOutTween)); diff --git a/lib/views/pages/app/unit_bottom_bar.dart b/lib/views/components/project/nav/unit_bottom_bar.dart similarity index 78% rename from lib/views/pages/app/unit_bottom_bar.dart rename to lib/views/components/project/nav/unit_bottom_bar.dart index e907897..6c5d615 100644 --- a/lib/views/pages/app/unit_bottom_bar.dart +++ b/lib/views/components/project/nav/unit_bottom_bar.dart @@ -7,13 +7,23 @@ import 'package:flutter_unit/views/components/permanent/feedback_widget.dart'; /// contact me by email 1981462002@qq.com /// 说明: 自定义底部导航栏 +typedef IndexTapCallback = void Function(int); +typedef IndexLongTapCallback = void Function(BuildContext, int); + class UnitBottomBar extends StatefulWidget { final Color color; - final Function(int) onItemClick; - UnitBottomBar( - {this.color = Colors.blue, - @required this.onItemClick}); + // item 点击事件 + final IndexTapCallback onItemTap; + + // item 长按事件 + final IndexLongTapCallback onItemLongTap; + + UnitBottomBar({ + this.color = Colors.blue, + @required this.onItemTap, + this.onItemLongTap, + }); @override _UnitBottomBarState createState() => _UnitBottomBarState(); @@ -76,8 +86,8 @@ class _UnitBottomBarState extends State { height: SizeUnit.bottom_nav_height, child: Icon( TolyIcon.icon_layout, - size: iconSize(0), - color: iconColor(0), + size: getIconSizeByPosition(0), + color: getIconColorByPosition(0), )), ), ), @@ -89,8 +99,8 @@ class _UnitBottomBarState extends State { padding: paddingR, child: Icon( TolyIcon.dingzhi1, - size: iconSize(1), - color: iconColor(1), + size: getIconSizeByPosition(1), + color: getIconColorByPosition(1), )), ), ), @@ -119,22 +129,22 @@ class _UnitBottomBarState extends State { height: SizeUnit.bottom_nav_height, child: Icon( TolyIcon.icon_collect, - size: iconSize(2), - color: iconColor(2), + size: getIconSizeByPosition(2), + color: getIconColorByPosition(2), )), ), ), Expanded( child: FeedbackWidget( onPressed: () => _updateIndex(3), - onLongPressed: () => _onLongPress(context, 1), + onLongPressed: () => _onLongPress(context, 3), child: Container( padding: paddingR, height: SizeUnit.bottom_nav_height, child: Icon( TolyIcon.yonghu, - size: iconSize(3), - color: iconColor(3), + size: getIconSizeByPosition(3), + color: getIconColorByPosition(3), )), ), ), @@ -143,26 +153,25 @@ class _UnitBottomBarState extends State { ), ); - double iconSize(int position) => _position == position + double getIconSizeByPosition(int position) => _position == position ? SizeUnit.active_bottom_nav_icon : SizeUnit.default_bottom_nav_icon; - Color iconColor(int position) => + Color getIconColorByPosition(int position) => _position == position ? widget.color : Colors.white; void _updateIndex(int index) { setState(() { _position = index; - widget.onItemClick(_position); + if (widget.onItemTap != null) { + widget.onItemTap(_position); + } }); } -} -_onLongPress(BuildContext context, int i) { - if (i == 0) { - Scaffold.of(context).openDrawer(); - } - if (i == 1) { - Scaffold.of(context).openEndDrawer(); + void _onLongPress(BuildContext context, int index) { + if (widget.onItemLongTap != null) { + widget.onItemLongTap(context, index); + } } } diff --git a/lib/views/pages/app/bloc_wrapper.dart b/lib/views/pages/app/bloc_wrapper.dart index 64d93aa..d875881 100644 --- a/lib/views/pages/app/bloc_wrapper.dart +++ b/lib/views/pages/app/bloc_wrapper.dart @@ -1,21 +1,22 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; +import 'package:flutter_unit/repositories/app_storage.dart'; +import 'package:flutter_unit/repositories/rep/impl/catagory_db_repository.dart'; +import 'package:flutter_unit/repositories/rep/impl/widget_db_repository.dart'; +import 'package:flutter_unit/repositories/rep/widget_repository.dart'; import 'package:flutter_unit/user_system/bloc/authentic/bloc.dart'; import 'package:flutter_unit/user_system/bloc/authentic/event.dart'; import 'package:flutter_unit/user_system/bloc/login/bloc.dart'; import 'package:flutter_unit/user_system/bloc/register/bloc.dart'; import 'package:flutter_unit/model/enums.dart'; import 'package:flutter_unit/blocs/bloc_exp.dart'; -import 'package:flutter_unit/repositories/impl/catagory_db_repository.dart'; -import 'package:flutter_unit/repositories/impl/widget_db_repository.dart'; -import 'package:flutter_unit/repositories/itf/widget_repository.dart'; -import 'package:flutter_unit/storage/app_storage.dart'; + /// create by 张风捷特烈 on 2020/4/28 /// contact me by email 1981462002@qq.com /// 说明: Bloc提供器包裹层 -final storage = AppStorage(); +final AppStorage storage = AppStorage(); class BlocWrapper extends StatefulWidget { final Widget child; @@ -30,7 +31,7 @@ class _BlocWrapperState extends State { final WidgetRepository repository = WidgetDbRepository(storage); final categoryBloc = CategoryBloc(repository: CategoryDbRepository(storage)); - final authBloc = AuthenticBloc()..add(AppStarted()); + final authBloc = AuthenticBloc()..add(const AppStarted()); @override Widget build(BuildContext context) { @@ -39,7 +40,7 @@ class _BlocWrapperState extends State { providers: [ //Bloc提供器 BlocProvider( - create: (_) => GlobalBloc(storage)..add(EventInitApp())), + create: (_) => GlobalBloc(storage)..add(const EventInitApp())), BlocProvider( create: (_) => WidgetsBloc(repository: repository) @@ -56,15 +57,20 @@ class _BlocWrapperState extends State { ..add(EventLoadLikeData())), BlocProvider(create: (_) => RegisterBloc()), + BlocProvider( create: (_) => LoginBloc(authenticBloc: authBloc)), + BlocProvider(create: (_) => authBloc), + BlocProvider( create: (_) => CategoryWidgetBloc(categoryBloc: categoryBloc)), BlocProvider( create: (_) => SearchBloc(repository: repository)), + BlocProvider(create: (_) => PointBloc()), + BlocProvider(create: (_) => PointCommentBloc()), ], child: widget.child); } diff --git a/lib/views/pages/app/unit_navigation.dart b/lib/views/pages/app/unit_navigation.dart index f53dd09..e7929ab 100644 --- a/lib/views/pages/app/unit_navigation.dart +++ b/lib/views/pages/app/unit_navigation.dart @@ -2,8 +2,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/router/unit_router.dart'; import 'package:flutter_unit/blocs/bloc_exp.dart'; +import 'package:flutter_unit/views/components/project/nav/unit_bottom_bar.dart'; import 'package:flutter_unit/views/components/project/overlay_tool_wrapper.dart'; -import 'package:flutter_unit/views/pages/app/unit_bottom_bar.dart'; import 'package:flutter_unit/views/pages/category/collect_page.dart'; import 'package:flutter_unit/views/pages/category/home_right_drawer.dart'; import 'package:flutter_unit/painter_system/gallery_unit.dart'; @@ -80,11 +80,14 @@ class _UnitNavigationState extends State { // 由于 bottomNavigationBar 颜色需要随 点击头部栏 状态而改变， // 使用 BlocBuilder 构建 - BlocBuilder _buildBottomNav(BuildContext context) => + Widget _buildBottomNav(BuildContext context) => BlocBuilder( builder: (_, state) => UnitBottomBar( color: state.color, - onItemClick: _onTapBottomNav)); + onItemTap: _onTapBottomNav, + onItemLongTap: _onItemLongTap, + + )); // 点击底部按钮事件，切换页面 _onTapBottomNav(int index) { @@ -93,4 +96,14 @@ class _UnitNavigationState extends State { BlocProvider.of(context).add(EventLoadLikeData()); } } + + // 两侧 + void _onItemLongTap(BuildContext context , int index) { + if (index == 0) { + Scaffold.of(context).openDrawer(); + } + if (index == 3) { + Scaffold.of(context).openEndDrawer(); + } + } } diff --git a/lib/views/pages/category/sync/async_button.dart b/lib/views/pages/category/sync/async_button.dart index e9aaa9e..d586086 100644 --- a/lib/views/pages/category/sync/async_button.dart +++ b/lib/views/pages/category/sync/async_button.dart @@ -9,7 +9,7 @@ import 'package:flutter_unit/app/utils/http_utils/result_bean.dart'; import 'package:flutter_unit/blocs/bloc_exp.dart'; import 'package:flutter_unit/blocs/category/category_bloc.dart'; import 'package:flutter_unit/model/category_model.dart'; -import 'package:flutter_unit/repositories/itf/category_repository.dart'; +import 'package:flutter_unit/repositories/rep/category_repository.dart'; import 'package:flutter_unit/views/components/permanent/feedback_widget.dart'; /// create by 张风捷特烈 on 2021/2/24 diff --git a/lib/views/pages/category/sync/upload_button.dart b/lib/views/pages/category/sync/upload_button.dart index 6543e7f..e94a112 100644 --- a/lib/views/pages/category/sync/upload_button.dart +++ b/lib/views/pages/category/sync/upload_button.dart @@ -8,7 +8,7 @@ import 'package:flutter_unit/app/res/toly_icon.dart'; import 'package:flutter_unit/app/utils/http_utils/result_bean.dart'; import 'package:flutter_unit/blocs/category/category_bloc.dart'; import 'package:flutter_unit/model/category_model.dart'; -import 'package:flutter_unit/repositories/itf/category_repository.dart'; +import 'package:flutter_unit/repositories/rep/category_repository.dart'; import 'package:flutter_unit/views/components/permanent/feedback_widget.dart'; /// create by 张风捷特烈 on 2021/2/24 diff --git a/lib/views/pages/data_manage/data_manage_page.dart b/lib/views/pages/data_manage/data_manage_page.dart index f02df12..85c4f36 100644 --- a/lib/views/pages/data_manage/data_manage_page.dart +++ b/lib/views/pages/data_manage/data_manage_page.dart @@ -10,7 +10,7 @@ import 'package:flutter_unit/app/utils/Toast.dart'; import 'package:flutter_unit/app/utils/http_utils/result_bean.dart'; import 'package:flutter_unit/blocs/bloc_exp.dart'; import 'package:flutter_unit/model/category_model.dart'; -import 'package:flutter_unit/repositories/itf/category_repository.dart'; +import 'package:flutter_unit/repositories/rep/category_repository.dart'; import 'package:flutter_unit/user_system/component/authentic_widget.dart'; import 'package:sqflite/sqflite.dart'; import 'package:path/path.dart' as path; diff --git a/lib/views/pages/issues_point/issue_item.dart b/lib/views/pages/issues_point/issue_item.dart index faec35d..dd00487 100644 --- a/lib/views/pages/issues_point/issue_item.dart +++ b/lib/views/pages/issues_point/issue_item.dart @@ -65,7 +65,7 @@ class IssueItem extends StatelessWidget { return Row( children: [ CircleImage( - image: NetworkImage(issue.user.avatar_url), + image: NetworkImage(issue.user.avatarUrl), size: 40, borderSize: 2, ), diff --git a/lib/views/pages/issues_point/issues_detail.dart b/lib/views/pages/issues_point/issues_detail.dart index 96615e8..b197cd2 100644 --- a/lib/views/pages/issues_point/issues_detail.dart +++ b/lib/views/pages/issues_point/issues_detail.dart @@ -80,7 +80,7 @@ class IssueTitle extends StatelessWidget { color: Colors.blue.withAlpha(22), child: ListTile( dense: true, - leading: CircleImage(size:40,borderSize:1,image: NetworkImage(issue.user.avatar_url),), + leading: CircleImage(size:40,borderSize:1,image: NetworkImage(issue.user.avatarUrl),), title: Text(issue.user.login), subtitle:Row( children: [ @@ -127,7 +127,7 @@ class IssueCommentWidget extends StatelessWidget { color: Colors.blue.withAlpha(22), child: ListTile( dense: true, - leading: CircleImage(size:40,borderSize:1,image: NetworkImage(comment.user.avatar_url),), + leading: CircleImage(size:40,borderSize:1,image: NetworkImage(comment.user.avatarUrl),), title: Text(comment.user.login), subtitle:Row( children: [ diff --git a/lib/views/pages/search/app_search_bar.dart b/lib/views/pages/search/app_search_bar.dart index 23acf1b..56ed07f 100644 --- a/lib/views/pages/search/app_search_bar.dart +++ b/lib/views/pages/search/app_search_bar.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/blocs/bloc_exp.dart'; -import 'package:flutter_unit/storage/dao/widget_dao.dart'; +import 'package:flutter_unit/repositories/dao/widget_dao.dart'; class AppSearchBar extends StatefulWidget { diff --git a/lib/views/pages/search/serach_page.dart b/lib/views/pages/search/serach_page.dart index 9b6d1e8..dd3324d 100644 --- a/lib/views/pages/search/serach_page.dart +++ b/lib/views/pages/search/serach_page.dart @@ -3,9 +3,9 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/router/unit_router.dart'; import 'package:flutter_unit/app/res/toly_icon.dart'; import 'package:flutter_unit/blocs/bloc_exp.dart'; +import 'package:flutter_unit/repositories/dao/widget_dao.dart'; import 'package:flutter_unit/views/components/permanent/circle.dart'; import 'package:flutter_unit/views/components/project/default/loading_shower.dart'; -import 'package:flutter_unit/storage/dao/widget_dao.dart'; import 'package:flutter_unit/model/widget_model.dart'; import 'package:flutter_unit/views/components/project/items/widget/techno_widget_list_item.dart'; import 'package:flutter_unit/views/pages/search/app_search_bar.dart'; diff --git a/lib/views/pages/splash/splash_bottom.dart b/lib/views/pages/splash/splash_bottom.dart index 3313866..9fee644 100644 --- a/lib/views/pages/splash/splash_bottom.dart +++ b/lib/views/pages/splash/splash_bottom.dart @@ -1,6 +1,5 @@ import 'dart:async'; import 'package:flutter/material.dart'; -import 'package:flutter_unit/app/res/style/gap_unit.dart'; import 'package:flutter_unit/app/res/style/unit_text_style.dart'; class SplashBottom extends StatefulWidget { @@ -33,18 +32,14 @@ class _SplashBottomState extends State { return AnimatedOpacity( duration: animTime, opacity: _animStart ? 1.0 : 0.0, - child: Row( - children: [ - Image.asset(logoPath, height: 20, width: 20), - GapUnit.W5, - Wrap( + child: Wrap( direction: Axis.vertical, + alignment: WrapAlignment.center, + crossAxisAlignment: WrapCrossAlignment.center, children: [ - const Text("张风捷特烈技术支持", style: TStyleUnit.splashShadows), - const Text("@编程之王 2021", style: TStyleUnit.splashShadows), + const Text("Power By 张风捷特烈", style: TStyleUnit.splashShadows), + const Text("· 2021 · @编程之王 ", style: TStyleUnit.splashShadows), ], - ), - ], )); } } diff --git a/lib/views/pages/splash/unit_splash.dart b/lib/views/pages/splash/unit_splash.dart index b217139..e93b2ea 100644 --- a/lib/views/pages/splash/unit_splash.dart +++ b/lib/views/pages/splash/unit_splash.dart @@ -2,8 +2,6 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_unit/app/res/str_unit.dart'; -import 'package:flutter_unit/app/res/style/gap_unit.dart'; -import 'package:flutter_unit/app/res/style/unit_text_style.dart'; import 'package:flutter_unit/app/router/unit_router.dart'; import 'package:flutter_unit/views/pages/splash/splash_bottom.dart'; import 'unit_paint.dart'; @@ -75,7 +73,7 @@ class _UnitSplashState extends State with TickerProviderStateMixin { _buildFlutterUnitText(winH, winW), _buildHead(), Positioned( - bottom: 20, + bottom: 15, child: SplashBottom()) ], ), diff --git a/lib/views/pages/widget_detail/category_end_drawer.dart b/lib/views/pages/widget_detail/category_end_drawer.dart index 84a43b2..3fa0d9c 100644 --- a/lib/views/pages/widget_detail/category_end_drawer.dart +++ b/lib/views/pages/widget_detail/category_end_drawer.dart @@ -2,11 +2,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_unit/app/res/style/unit_text_style.dart'; import 'package:flutter_unit/blocs/bloc_exp.dart'; +import 'package:flutter_unit/repositories/rep/category_repository.dart'; import 'package:flutter_unit/views/components/permanent/circle.dart'; import 'package:flutter_unit/views/components/permanent/panel.dart'; import 'package:flutter_unit/model/category_model.dart'; import 'package:flutter_unit/model/widget_model.dart'; -import 'package:flutter_unit/repositories/itf/category_repository.dart'; import 'package:flutter_unit/views/components/project/unit_drawer_header.dart'; /// create by 张风捷特烈 on 2020-04-22 diff --git a/lib/views/pages/widget_home/home_page.dart b/lib/views/pages/widget_home/home_page.dart index cad7e89..7c1c264 100644 --- a/lib/views/pages/widget_home/home_page.dart +++ b/lib/views/pages/widget_home/home_page.dart @@ -122,7 +122,7 @@ class _HomePageState extends State }, ); - _switchTab(int index, Color color) { + _switchTab(int index) { BlocProvider.of(context) .add(EventTabTap(Convert.toFamily(index))); } diff --git a/lib/views/pages/widget_home/toly_app_bar.dart b/lib/views/pages/widget_home/toly_app_bar.dart index f540171..7a2d60e 100644 --- a/lib/views/pages/widget_home/toly_app_bar.dart +++ b/lib/views/pages/widget_home/toly_app_bar.dart @@ -1,9 +1,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_unit/views/components/permanent/circle.dart'; + class TolyAppBar extends StatefulWidget { final double maxHeight; - final Function(int, Color) onItemClick; + final Function(int) onItemClick; @override _TolyAppBarState createState() => _TolyAppBarState(); @@ -52,12 +53,12 @@ class _TolyAppBarState extends State @override void initState() { + super.initState(); _controller = AnimationController( duration: const Duration(milliseconds: 300), vsync: this) ..addListener(_render) ..addStatusListener(_listenStatus); _selectIndex = widget.defaultIndex; - super.initState(); } void _render() { @@ -102,7 +103,7 @@ class _TolyAppBarState extends State color: _selectIndex == colors.indexOf(color) ? Colors.transparent : Color(colors[_selectIndex]), - offset: Offset(1, 1), + offset: const Offset(1, 1), blurRadius: 2) ], color: Color(color), borderRadius: _kBorderRadius), height: widget.maxHeight + 20, @@ -113,7 +114,7 @@ class _TolyAppBarState extends State ), ); - _onTap(int color) { + void _onTap(int color) { if (_selectIndex == colors.indexOf(color)) return; clicked = true; setState(() { @@ -121,7 +122,7 @@ class _TolyAppBarState extends State _controller.forward(); _selectIndex = colors.indexOf(color); if (widget.onItemClick != null) - widget.onItemClick(_selectIndex, Color(color)); + widget.onItemClick(_selectIndex); }); } diff --git a/lib/views/widgets/MultiChildRenderObjectWidget/CustomMultiChildLayout/node1_base.dart b/lib/views/widgets/MultiChildRenderObjectWidget/CustomMultiChildLayout/node1_base.dart index 10961cb..95d83f3 100644 --- a/lib/views/widgets/MultiChildRenderObjectWidget/CustomMultiChildLayout/node1_base.dart +++ b/lib/views/widgets/MultiChildRenderObjectWidget/CustomMultiChildLayout/node1_base.dart @@ -1,5 +1,3 @@ -import 'dart:io'; - import 'package:flutter/material.dart'; /// create by 张风捷特烈 on 2020/6/6 diff --git a/lib/views/widgets/MultiChildRenderObjectWidget/ListBody/node1_base.dart b/lib/views/widgets/MultiChildRenderObjectWidget/ListBody/node1_base.dart index dde5f66..65086b2 100644 --- a/lib/views/widgets/MultiChildRenderObjectWidget/ListBody/node1_base.dart +++ b/lib/views/widgets/MultiChildRenderObjectWidget/ListBody/node1_base.dart @@ -1,4 +1,3 @@ -import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; diff --git a/lib/views/widgets/Other/ListWheelViewport/node2_perspective.dart b/lib/views/widgets/Other/ListWheelViewport/node2_perspective.dart index 120ee55..fc9f260 100644 --- a/lib/views/widgets/Other/ListWheelViewport/node2_perspective.dart +++ b/lib/views/widgets/Other/ListWheelViewport/node2_perspective.dart @@ -1,5 +1,3 @@ -import 'dart:math'; - import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; diff --git a/lib/views/widgets/Other/ListWheelViewport/node3_magnifier.dart b/lib/views/widgets/Other/ListWheelViewport/node3_magnifier.dart index 1a3d377..1248f0f 100644 --- a/lib/views/widgets/Other/ListWheelViewport/node3_magnifier.dart +++ b/lib/views/widgets/Other/ListWheelViewport/node3_magnifier.dart @@ -1,5 +1,3 @@ -import 'dart:math'; - import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; diff --git a/lib/views/widgets/Other/ListWheelViewport/node4_opacity.dart b/lib/views/widgets/Other/ListWheelViewport/node4_opacity.dart index 620e7b2..a467b1d 100644 --- a/lib/views/widgets/Other/ListWheelViewport/node4_opacity.dart +++ b/lib/views/widgets/Other/ListWheelViewport/node4_opacity.dart @@ -1,5 +1,3 @@ -import 'dart:math'; - import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; diff --git a/lib/views/widgets/ProxyWidget/LayoutId/node1_base.dart b/lib/views/widgets/ProxyWidget/LayoutId/node1_base.dart index b4215aa..1bd5ee7 100644 --- a/lib/views/widgets/ProxyWidget/LayoutId/node1_base.dart +++ b/lib/views/widgets/ProxyWidget/LayoutId/node1_base.dart @@ -1,5 +1,3 @@ -import 'dart:io'; - import 'package:flutter/material.dart'; /// create by 张风捷特烈 on 2020/6/6 diff --git a/lib/views/widgets/ProxyWidget/SliderTheme/node1_base.dart b/lib/views/widgets/ProxyWidget/SliderTheme/node1_base.dart index 217daa9..b9108c9 100644 --- a/lib/views/widgets/ProxyWidget/SliderTheme/node1_base.dart +++ b/lib/views/widgets/ProxyWidget/SliderTheme/node1_base.dart @@ -1,5 +1,3 @@ -import 'dart:math'; - import 'package:flutter/material.dart'; /// create by 张风捷特烈 on 2020-04-12 diff --git a/lib/views/widgets/SingleChildRenderObjectWidget/ColorFiltered/node1_base.dart b/lib/views/widgets/SingleChildRenderObjectWidget/ColorFiltered/node1_base.dart index ad612f1..496ba3e 100644 --- a/lib/views/widgets/SingleChildRenderObjectWidget/ColorFiltered/node1_base.dart +++ b/lib/views/widgets/SingleChildRenderObjectWidget/ColorFiltered/node1_base.dart @@ -44,7 +44,6 @@ class _CustomColorFilteredState extends State { ]), ], ); - ; } Widget _buildChild(m) => Container( diff --git a/lib/views/widgets/SingleChildRenderObjectWidget/CustomPaint/node2_bezier.dart b/lib/views/widgets/SingleChildRenderObjectWidget/CustomPaint/node2_bezier.dart index c903f32..fdc124b 100644 --- a/lib/views/widgets/SingleChildRenderObjectWidget/CustomPaint/node2_bezier.dart +++ b/lib/views/widgets/SingleChildRenderObjectWidget/CustomPaint/node2_bezier.dart @@ -29,7 +29,7 @@ class _PlayBezier3PageState extends State { } void _initPoints() { - _pos = List(); + _pos = []; _pos.add(Offset(0, 0)); _pos.add(Offset(60, -60)); _pos.add(Offset(-90, -90)); diff --git a/lib/views/widgets/SingleChildRenderObjectWidget/RepaintBoundary/main.dart b/lib/views/widgets/SingleChildRenderObjectWidget/RepaintBoundary/main.dart index f214419..05ca9f7 100644 --- a/lib/views/widgets/SingleChildRenderObjectWidget/RepaintBoundary/main.dart +++ b/lib/views/widgets/SingleChildRenderObjectWidget/RepaintBoundary/main.dart @@ -3,8 +3,6 @@ /// 说明: import 'package:flutter/material.dart'; - -import 'node1_base.dart'; import 'node2_save.dart'; diff --git a/lib/views/widgets/SingleChildRenderObjectWidget/RepaintBoundary/node1_base.dart b/lib/views/widgets/SingleChildRenderObjectWidget/RepaintBoundary/node1_base.dart index 2cf57af..abd4c46 100644 --- a/lib/views/widgets/SingleChildRenderObjectWidget/RepaintBoundary/node1_base.dart +++ b/lib/views/widgets/SingleChildRenderObjectWidget/RepaintBoundary/node1_base.dart @@ -39,7 +39,7 @@ class _TempPlayBezier3PageState extends State { } void _initPoints() { - _pos = List(); + _pos = []; _pos.add(Offset(0, 0)); _pos.add(Offset(60, -60)); _pos.add(Offset(-90, -90)); diff --git a/lib/views/widgets/Sliver/SliverAnimatedList/node1_base.dart b/lib/views/widgets/Sliver/SliverAnimatedList/node1_base.dart index 5115e8a..be69ccc 100644 --- a/lib/views/widgets/Sliver/SliverAnimatedList/node1_base.dart +++ b/lib/views/widgets/Sliver/SliverAnimatedList/node1_base.dart @@ -1,5 +1,3 @@ -import 'dart:math'; - import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; diff --git a/lib/views/widgets/Sliver/SliverLayoutBuilder/node1_base.dart b/lib/views/widgets/Sliver/SliverLayoutBuilder/node1_base.dart index cacd904..274de28 100644 --- a/lib/views/widgets/Sliver/SliverLayoutBuilder/node1_base.dart +++ b/lib/views/widgets/Sliver/SliverLayoutBuilder/node1_base.dart @@ -1,8 +1,8 @@ -import 'dart:math'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/src/rendering/sliver.dart'; +import 'package:flutter/rendering.dart'; + /// create by 张风捷特烈 on 2020/9/21 /// contact me by email 1981462002@qq.com diff --git a/lib/views/widgets/StatefulWidget/DraggableScrollableSheet/node1_base.dart b/lib/views/widgets/StatefulWidget/DraggableScrollableSheet/node1_base.dart index 0060d27..9d0d290 100644 --- a/lib/views/widgets/StatefulWidget/DraggableScrollableSheet/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/DraggableScrollableSheet/node1_base.dart @@ -1,9 +1,5 @@ -import 'dart:math'; - import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter/src/rendering/sliver.dart'; /// create by 张风捷特烈 on 2020/9/21 /// contact me by email 1981462002@qq.com diff --git a/lib/views/widgets/StatefulWidget/GlowingOverscrollIndicator/node1_base.dart b/lib/views/widgets/StatefulWidget/GlowingOverscrollIndicator/node1_base.dart index c5f62e4..5fab499 100644 --- a/lib/views/widgets/StatefulWidget/GlowingOverscrollIndicator/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/GlowingOverscrollIndicator/node1_base.dart @@ -1,9 +1,5 @@ -import 'dart:math'; - import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter/src/rendering/sliver.dart'; /// create by 张风捷特烈 on 2020/9/21 /// contact me by email 1981462002@qq.com diff --git a/lib/views/widgets/StatefulWidget/RawKeyboardListener/node1_base.dart b/lib/views/widgets/StatefulWidget/RawKeyboardListener/node1_base.dart index 846ce4f..5dc1495 100644 --- a/lib/views/widgets/StatefulWidget/RawKeyboardListener/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/RawKeyboardListener/node1_base.dart @@ -1,5 +1,4 @@ import 'package:flutter/cupertino.dart'; -import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; diff --git a/lib/views/widgets/StatefulWidget/StatefulBuilder/node1_base.dart b/lib/views/widgets/StatefulWidget/StatefulBuilder/node1_base.dart index 32b37cd..9725373 100644 --- a/lib/views/widgets/StatefulWidget/StatefulBuilder/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/StatefulBuilder/node1_base.dart @@ -1,5 +1,4 @@ import 'package:flutter/cupertino.dart'; -import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; /// create by 张风捷特烈 on 2020/9/21 diff --git a/lib/views/widgets/StatefulWidget/TextField/node1_base.dart b/lib/views/widgets/StatefulWidget/TextField/node1_base.dart index 9c8bcf4..ae14934 100644 --- a/lib/views/widgets/StatefulWidget/TextField/node1_base.dart +++ b/lib/views/widgets/StatefulWidget/TextField/node1_base.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; /// create by 张风捷特烈 on 2020/4/30 /// contact me by email 1981462002@qq.com /// 说明: diff --git a/lib/views/widgets/StatefulWidget/TextField/node2_cursor.dart b/lib/views/widgets/StatefulWidget/TextField/node2_cursor.dart index 4725093..3e75a79 100644 --- a/lib/views/widgets/StatefulWidget/TextField/node2_cursor.dart +++ b/lib/views/widgets/StatefulWidget/TextField/node2_cursor.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; /// create by 张风捷特烈 on 2020-03-29 /// contact me by email 1981462002@qq.com diff --git a/lib/views/widgets/StatelessWidget/DraggableScrollableActuator/node1_base.dart b/lib/views/widgets/StatelessWidget/DraggableScrollableActuator/node1_base.dart index bb260c5..710ea96 100644 --- a/lib/views/widgets/StatelessWidget/DraggableScrollableActuator/node1_base.dart +++ b/lib/views/widgets/StatelessWidget/DraggableScrollableActuator/node1_base.dart @@ -1,9 +1,5 @@ -import 'dart:math'; - import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; -import 'package:flutter/src/rendering/sliver.dart'; /// create by 张风捷特烈 on 2020/9/21 /// contact me by email 1981462002@qq.com diff --git a/lib/views/widgets/StatelessWidget/SimpleDialog/node1_base.dart b/lib/views/widgets/StatelessWidget/SimpleDialog/node1_base.dart index 8012540..f566d99 100644 --- a/lib/views/widgets/StatelessWidget/SimpleDialog/node1_base.dart +++ b/lib/views/widgets/StatelessWidget/SimpleDialog/node1_base.dart @@ -1,4 +1,3 @@ -import 'dart:math'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; diff --git a/lib/views/widgets/StatelessWidget/Theme/node1_base.dart b/lib/views/widgets/StatelessWidget/Theme/node1_base.dart index 9162886..f90f146 100644 --- a/lib/views/widgets/StatelessWidget/Theme/node1_base.dart +++ b/lib/views/widgets/StatelessWidget/Theme/node1_base.dart @@ -18,12 +18,12 @@ class TextThemeDemo extends StatelessWidget { "headline: ": queryData.headline, "title: ": queryData.title, "subhead: ": queryData.subhead, - "subtitle: ": queryData.body1, + "body1: ": queryData.body1, "body2: ": queryData.body2, "button: ": queryData.button, "overline: ": queryData.overline, "subtitle: ": queryData.subtitle, - "button: ": queryData.caption, + "caption: ": queryData.caption, "display1: ": queryData.display1, "display2: ": queryData.display2, "display3: ": queryData.display3,