Merge branch 'develop' into dev/yisheng

* develop: Update: README.md history update: auto doc's update up up up 更新日志 fix:rename refactor:rename file refactor:modified db fix:fluttetToast backHome
2025-05-17 21:05:56 +08:00 · 2019-01-25 19:56:57 +08:00
parent 6770a8c21f 518c5499c7
commit 947a8556ad
14 changed files with 75 additions and 88 deletions
--- a/README.md
+++ b/README.md
@ -80,4 +80,65 @@ flutter优点主要包括：
 Powered by [阿里拍卖前端团队](https://github.com/alibaba-paimai-frontend)<img src="https://img.alicdn.com/tfs/TB1foEhAMHqK1RjSZJnXXbNLpXa-166-166.png" width=20 height=20>


+## 更新日志

+#### 2019-1-24
+  - [x] 功能：更新小部件的图标
+  - [x] 功能：添加CupertinoTimerPickerDemo
+  - [x] 调试：消除警告
+  - [x] 修复：关于手册图标更换
+  - [x] 添加：文案描述
+  - [x] 添加：CupertinoPicker，CupertinoPopupSurface
+#### 2019-1-23
+  - [x] 修复: 导航栏home返回报错
+  - [x] 修复：收集错误
+  - [x] 添加：CupertinoNavigationBar CupertinoPageRoute CupertinoPageScaffold
+#### 2019-1-22
+  - [x] 功能：在Allsimon拉请求中添加英文简介
+#### 2019-1-21
+  - [x] 功能：Cupertino的子项
+#### 2019-1-20
+  - [x] 功能：CupertinoSwitch演示
+  - [x] 功能：为搜索列表加入图标
+  - [x] 功能：CupertinoSliverRefreshControl演示
+  - [x] 功能：CupertinoSliverNavigationBar演示
+#### 2019-1-18
+  - [x] 更新：SharedPreferences保存数据和android设备布局溢出
+  - [x] 功能：添加CupertinoScrollbar演示
+  - [x] 功能：第四页暂时用欢迎页替代。后期再开发
+#### 2019-1-17
+  - [x] 添加：+许可证
+#### 2019-1-16
+  - [x] 转换：将README翻译为En语言环境
+  - [x] 功能：CupertinoScrollbar演示
+#### 2019-1-14
+  - [x] 添加：增加手册页面
+  - [x] 功能：文字演示
+  - [x] 重构：修改过的图标
+  - [x] 重构：文档，文章，组件收藏，新增webView
+  - [x] 重构：修改过的演示
+  - [x] 重构：代码视图
+  - [x] 更新：版本 和readme.md
+  - [x] 修改：添加代码视图
+  - [x] 功能：添加搜索历史记录板
+  - [x] 修改：列出加标头错误
+#### 2019-1-15
+  - [x] 功能：welcomepage
+#### 2019-1-13
+  - [x] 添加：一些输入描述
+  - [x] 功能：加入GridPaper＆SliverGrid
+  - [x] 重构：修改db
+  - [x] 重构：删除数据库 TabBarView
+  - [x] 添加：网格视图
+  - [x] 修改：checkbosListTile 错误
+  - [x] 修改：自动提示文案
+  - [x] 功能：增加免责声明，声明组件，自动弹出，左上角入口
+  - [x] 重构：整理数据库初始逻辑，判断数据库完整性，判断是否存在已知的cat，widget，collection 三张表。
+  - [x] 修复：DialogDemo，无法关闭的问题
+#### 2019-1-12
+  - [x] 修复：icon没有，但内容有的，组件，给补充了icon
+  - [x] 修改：1.整理文件 2.修正分析
+  - [x] 更新：flutter_rookie_book => flutter_go
+  - [x] 更新：更新SearchInput文件名=> search_input
+  - [x] 修改：文件名称的大小写规范
+  - [x] 修改：修正bottomNavigationBar iconButton警告
--- a/assets/app.db
+++ b/assets/app.db
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
-	<string>菜鸟App</string>
+	<string>Flutter Go</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
--- a/lib/common/widget-demo.dart
+++ b/lib/common/widget-demo.dart
@ -1,74 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:url_launcher/url_launcher.dart';
-
-class WidgetDemo extends StatelessWidget {
-  final Widget child;
-  final String docUrl;
-  final String title;
-  final String codeUrl;
-
-  WidgetDemo(
-      {Key key,
-      @required this.title,
-      @required this.child,
-      @required this.codeUrl,
-      @required this.docUrl})
-      : super(key: key);
-
-  void _launchURL(String url) async {
-    if (await canLaunch(url)) {
-      await launch(url);
-    } else {
-      throw 'Could not launch $url';
-    }
-  }
-
-  @override
-  Widget build(BuildContext context,[bottomNaviBar]) {
-    return Scaffold(
-      appBar: new AppBar(
-        title: Text(title),
-        actions: <Widget>[
-          new IconButton(
-            tooltip: 'widget doc',
-            onPressed: (){
-              _launchURL(docUrl);
-            },
-            icon: Icon(Icons.library_books),
-          ),
-          new IconButton(
-            tooltip: 'github code',
-            onPressed: (){
-              _launchURL(codeUrl);
-            },
-            icon: Icon(Icons.code),
-          ),
-          new IconButton(
-            tooltip: 'goBack home',
-            onPressed: (){
-              Navigator.popUntil(context, ModalRoute.withName('/'));
-            },
-            icon: Icon(Icons.home),
-          ),
-        ],
-      ),
-      body: new Container(
-        padding: const EdgeInsets.symmetric(vertical: 10.0, horizontal: 15.0),
-        child: ListView(
-            shrinkWrap: true,
-            padding: const EdgeInsets.all(0.0),
-            children: <Widget>[
-              Column(
-                children: <Widget>[
-                  SizedBox(
-                    height: 10.0,
-                  ),
-                  child,
-                ],
-              ),
-            ])
-        ),
-      bottomNavigationBar: (bottomNaviBar is Widget)?bottomNaviBar:null
-      );
-  }
-}
--- a/lib/common/widget_demo.dart
+++ b/lib/common/widget_demo.dart
@ -10,8 +10,8 @@ import '../components/markdown.dart';
 import '../model/collection.dart';
 import '../widgets/index.dart';
 import 'package:fluttertoast/fluttertoast.dart';
-import '../event/event-bus.dart';
-import '../event/event-model.dart';
+import '../event/event_bus.dart';
+import '../event/event_model.dart';
 import 'dart:core';

 class WidgetDemo extends StatefulWidget {
@ -42,7 +42,7 @@ class _WidgetDemoState extends State<WidgetDemo> {
  String _router = '';

  void showInSnackBar(String value) {
-    Fluttertoast.showToast(
+    Fluttertoast.instance.showToast(
        msg: value,
        toastLength: Toast.LENGTH_SHORT,
        gravity: ToastGravity.CENTER,
--- a/lib/event/event_bus.dart
+++ b/lib/event/event_bus.dart
--- a/lib/event/event_model.dart
+++ b/lib/event/event_model.dart
--- a/lib/views/collection_page.dart
+++ b/lib/views/collection_page.dart
@ -8,8 +8,8 @@ import 'package:flutter/material.dart';
 import '../model/collection.dart';
 import '../routers/application.dart';
 import '../routers/routers.dart';
-import '../event/event-bus.dart';
-import '../event/event-model.dart';
+import '../event/event_bus.dart';
+import '../event/event_model.dart';
 import 'package:event_bus/event_bus.dart';

 class CollectionPage extends StatefulWidget {
--- a/lib/views/web_view_page.dart
+++ b/lib/views/web_view_page.dart
@ -7,8 +7,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_webview_plugin/flutter_webview_plugin.dart';
 import '../model/collection.dart';
-import '../event/event-bus.dart';
-import '../event/event-model.dart';
+import '../event/event_bus.dart';
+import '../event/event_model.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'dart:core';

@ -27,7 +27,7 @@ class _WebViewPageState extends State<WebViewPage> {
  CollectionControlModel _collectionControl = new CollectionControlModel();

  void showInSnackBar(String value) {
-    Fluttertoast.showToast(
+    Fluttertoast.instance.showToast(
        msg: value,
        toastLength: Toast.LENGTH_SHORT,
        gravity: ToastGravity.CENTER,
--- a/lib/widgets/components/Menu/CheckedPopupMenuItem/demo.dart
+++ b/lib/widgets/components/Menu/CheckedPopupMenuItem/demo.dart
@ -27,7 +27,7 @@ class _CheckedPopupMenuItemDemoState extends State<CheckedPopupMenuItemDemo> {
  }

  void showInSnackBar(String value){
-    Fluttertoast.showToast(
+    Fluttertoast.instance.showToast(
        msg: value,
        toastLength: Toast.LENGTH_SHORT,
        gravity: ToastGravity.CENTER,
--- a/lib/widgets/components/Menu/PopupMenuButton/demo.dart
+++ b/lib/widgets/components/Menu/PopupMenuButton/demo.dart
@ -24,7 +24,7 @@ class _PopupMenuButtonDemoState extends State<PopupMenuButtonDemo> {
  }

    void showInSnackBar(String value) {
-    Fluttertoast.showToast(
+    Fluttertoast.instance.showToast(
        msg: value,
        toastLength: Toast.LENGTH_SHORT,
        gravity: ToastGravity.CENTER,
--- a/lib/widgets/components/Menu/PopupMenuDivider/demo.dart
+++ b/lib/widgets/components/Menu/PopupMenuDivider/demo.dart
@ -13,7 +13,7 @@ class PopupMenuDividerDemo extends StatelessWidget {


    void showInSnackBar(String value) {
-    Fluttertoast.showToast(
+    Fluttertoast.instance.showToast(
        msg: value,
        toastLength: Toast.LENGTH_SHORT,
        gravity: ToastGravity.CENTER,
--- a/lib/widgets/themes/Material/MaterialColor/demo.dart
+++ b/lib/widgets/themes/Material/MaterialColor/demo.dart
@ -204,7 +204,7 @@ class ColorDemo extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return Container(
-      height: 1000.0,
+      height: 400.0,
      child: DefaultTabController(
        length: allPalettes.length,
        child: Scaffold(
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -25,7 +25,7 @@ dependencies:
  sqflite: ^0.12.1
  flutter_markdown: ^0.2.0
  url_launcher: ^4.0.1
-  fluttertoast: ^2.2.2
+  fluttertoast: ^2.2.7
  # 本地存储、收藏功能
  shared_preferences: ^0.4.3
  dio: ^1.0.6