Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:alibaba/flutter-common-widgets-a…
Browse files Browse the repository at this point in the history
…pp into develop
  • Loading branch information
hanxu317317 committed Jan 29, 2019
2 parents 12544b0 + acfe8f6 commit 573a85a
Show file tree
Hide file tree
Showing 207 changed files with 549 additions and 786 deletions.
62 changes: 62 additions & 0 deletions CHANGE-LOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
## 更新日志

#### 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警告
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,5 +79,3 @@ flutter优点主要包括:

Powered by [阿里拍卖前端团队](https://github.com/alibaba-paimai-frontend)<img src="https://img.alicdn.com/tfs/TB1foEhAMHqK1RjSZJnXXbNLpXa-166-166.png" width=20 height=20>



2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
FlutterApplication and put your custom class here. -->
<application
android:name="io.flutter.app.FlutterApplication"
android:label="菜鸟手册"
android:label="flutter go"
android:icon="@drawable/logo">
<activity
android:name=".MainActivity"
Expand Down
Binary file modified assets/app.db
Binary file not shown.
4 changes: 0 additions & 4 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
333E5DAE7FC10AC69FEC26C0 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DDA792F029EDD7A11295D192 /* libPods-Runner.a */; };
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */ = {isa = PBXBuildFile; fileRef = 2D5378251FAA1A9400D5DBA9 /* flutter_assets */; };
3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; };
Expand Down Expand Up @@ -41,7 +40,6 @@
1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
2D5378251FAA1A9400D5DBA9 /* flutter_assets */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flutter_assets; path = Flutter/flutter_assets; sourceTree = SOURCE_ROOT; };
3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -92,7 +90,6 @@
children = (
3B80C3931E831B6300D905FE /* App.framework */,
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
9740EEBA1CF902C7004384FC /* Flutter.framework */,
9740EEB21CF90195004384FC /* Debug.xcconfig */,
7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
Expand Down Expand Up @@ -209,7 +206,6 @@
files = (
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
);
Expand Down
2 changes: 1 addition & 1 deletion ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
29 changes: 0 additions & 29 deletions lib/common/Style.dart

This file was deleted.

8 changes: 0 additions & 8 deletions lib/common/event_bus.dart

This file was deleted.

74 changes: 0 additions & 74 deletions lib/common/widget-demo.dart

This file was deleted.

2 changes: 1 addition & 1 deletion lib/components/cate_card.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import '../model/cat.dart';
import '../common/widget_name_to_icon.dart';
import '../resources/widget_name_to_icon.dart';
import '../components/widget_item_container.dart';

class CateCard extends StatefulWidget {
Expand Down
File renamed without changes.
99 changes: 0 additions & 99 deletions lib/components/comp_list.dart

This file was deleted.

5 changes: 2 additions & 3 deletions lib/components/disclaimer_msg.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
* Time: 下午9:19
* email: [email protected]
*/

import 'package:flutter/material.dart';
import 'package:shared_preferences/shared_preferences.dart';

//import 'package:flutter_rookie_book/model/collection_general.dart';
//import 'package:flutter_rookie_book/model/collection_general.dart';
import 'dart:async';

const disclaimerText1 =
'\r\r\r\r\r\r本APP属于个人的非赢利性开源项目,以供开源社区使用,凡本APP转载的所有的文章 、图片、音频、视频文件等资料的版权归版权所有人所有,本APP采用的非本站原创文章及图片等内容无法一一和版权者联系,如果本网所选内容的文章作者及编辑认为其作品不宜上网供大家浏览,或不应无偿使用请及时用电子邮件或电话通知我们,以迅速采取适当措施,避免给双方造成不必要的经济损失。';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* @Last Modified time: 2019-01-14 14:42:00
*/
import 'package:flutter/material.dart';
import 'example_code_parser.dart';
import 'syntax_highlighter.dart';
import 'package:flutter_go/utils/example_code_parser.dart';
import 'package:flutter_go/utils/syntax_highlighter.dart';

class FullScreenCodeDialog extends StatefulWidget {
const FullScreenCodeDialog({this.filePath});
Expand Down
1 change: 1 addition & 0 deletions lib/components/list_refresh.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
* tartget: FlatButton 的示例
*/
import 'package:flutter/material.dart';
import 'dart:async';

class ListRefresh extends StatefulWidget {
final renderItem;
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/components/markdown.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter_markdown/flutter_markdown.dart' as md;
import '../common/high_light_code.dart';
import 'package:flutter_go/utils/high_light_code.dart';
import 'package:flutter/material.dart';

/// 使用方法
Expand Down
Loading

0 comments on commit 573a85a

Please sign in to comment.