183 Commits

Author SHA1 Message Date
3a33974140 Merge pull request #81 from Nealyang/master
refactor:rename file
2019-01-25 14:11:28 +08:00
9e95dea871 refactor:rename file 2019-01-25 14:10:25 +08:00
9acbc5e978 Merge pull request #79 from Nealyang/master
refactor:modified db
2019-01-25 11:12:31 +08:00
e3ef5c87fe refactor:modified db 2019-01-25 11:11:31 +08:00
e29e2b440f Merge pull request #78 from Nealyang/master
fix:fluttetToast backHome
2019-01-25 10:58:48 +08:00
c7cb69a0f6 fix:fluttetToast backHome 2019-01-25 10:57:48 +08:00
7ad4c102fb Merge pull request #77 from alibaba/dev/yisheng
Dev/yisheng
2019-01-24 20:19:07 +08:00
2a4c0a46c6 Merge branch 'develop' into dev/yisheng
* develop:
  feat(update: icons for  widget):
  feat(add CupertinoTimerPickerDemo):
2019-01-24 20:15:27 +08:00
d83b61c88f Modfiy: cupertinoColors 颜色,文案 2019-01-24 20:15:08 +08:00
5fc96f11dc Modfiy: cupertinoColors 颜色,文案 2019-01-24 20:12:00 +08:00
d7bf1408a0 Merge pull request #75 from hanxu317317/develop
Develop
2019-01-24 19:53:29 +08:00
5e18365e5b feat(update: icons for widget): 2019-01-24 19:48:29 +08:00
8cce840d1c Merge branch 'develop' of github.com:alibaba/flutter-common-widgets-app into develop 2019-01-24 19:17:06 +08:00
7642f96a8b feat(add CupertinoTimerPickerDemo): 2019-01-24 18:51:44 +08:00
665a0ebb17 Merge pull request #74 from alibaba/dev/yisheng
Dev/yisheng
2019-01-24 18:51:12 +08:00
8d91a1b36a Merge branch 'develop' into dev/yisheng
* develop:
  文案描述
  feat(CupertinoTabView demo):
  Update README-en.md
  feat(add English intro from Allsimon pull request):
  feat(add CupertinoTabScaffold):
  feat(add CupertinoTabBar demo):
  Update index.dart
  add license
  +LICENSE
  translate: translate the README to En locale
  update(version) and readme.md
2019-01-24 18:48:53 +08:00
e4c75b454f Debug:消除 warn 2019-01-24 18:47:50 +08:00
37382df7b3 Merge pull request #72 from hanxu317317/develop
Develop
2019-01-24 10:26:17 +08:00
6df252d26b Merge pull request #73 from alibaba/master
merge code
2019-01-24 10:25:51 +08:00
dbbeb076cc Merge branch 'develop' of github.com:alibaba/flutter-common-widgets-app into develop 2019-01-24 10:22:58 +08:00
fd040c648b Merge branch 'master' of github.com:alibaba/flutter-common-widgets-app into develop 2019-01-24 10:21:18 +08:00
e1684786dd Merge pull request #70 from alibaba/dev/yisheng
Modfiy:关于手册图标更换
2019-01-24 01:40:47 +08:00
e0abe48191 Merge branch 'develop' into dev/yisheng
* develop:
2019-01-24 01:37:56 +08:00
4e0b93be11 Modfiy:关于手册图标更换 2019-01-24 01:31:33 +08:00
836d39238e 文案描述
文案描述
2019-01-24 01:16:46 +08:00
9969d33cbe Merge pull request #69 from alibaba/dev/yisheng
add: CupertinoPicker,CupertinoPopupSurface
2019-01-24 01:12:55 +08:00
8bfa1c5ad1 add: CupertinoPicker,CupertinoPopupSurface 2019-01-24 01:09:33 +08:00
ed687196fc feat(CupertinoTabView demo): 2019-01-23 20:58:45 +08:00
fe4b0c62c1 Merge pull request #64 from Nealyang/master
fix:导航栏home返回报错
2019-01-23 14:39:20 +08:00
515325b36d fix:导航栏home返回报错 2019-01-23 14:38:37 +08:00
59e340ac0a Merge pull request #63 from Nealyang/master
fix:collection bug
2019-01-23 11:19:27 +08:00
6ef12a9659 fix:collection bug 2019-01-23 11:17:36 +08:00
01c72c9a3f Merge pull request #62 from alibaba/dev/yisheng
add:
2019-01-23 01:53:34 +08:00
e4e521e5ee add:
CupertinoNavigationBar
CupertinoPageRoute
CupertinoPageScaffold
2019-01-23 01:49:04 +08:00
30fc818342 Update README-en.md 2019-01-22 11:12:47 +08:00
d818b2dd78 Merge pull request #60 from hanxu317317/master
加入英文介绍
2019-01-22 11:12:01 +08:00
5148fc4b77 feat(add English intro from Allsimon pull request): 2019-01-22 11:08:43 +08:00
3e031c23ab Merge branch 'Allsimon-master' 2019-01-22 11:00:00 +08:00
824c50abcc Merge branch 'master' of https://github.com/Allsimon/flutter-go into Allsimon-master 2019-01-22 10:59:44 +08:00
e03e37671b Merge pull request #54 from code1986/master
Update index.dart
2019-01-22 10:54:04 +08:00
740691d7f7 feat(add CupertinoTabScaffold): 2019-01-21 13:23:29 +08:00
5306e75b23 Merge pull request #58 from alibaba/dev/yisheng
add:Cupertino
2019-01-21 11:38:44 +08:00
7d07e0d10f Merge branch 'develop' into dev/ys-2
* develop:
  feat(CupertinoSwitch demo):
  feat(为搜索列表加入icon)
  feat(CupertinoSliverRefreshControl demo)
  feat(CupertinoSliverNavigationBar demo):
  add(CupertinoSegmentedControl demo && CupertinoSlider demo)
  feat(add CupertinoScrollbar demo):
  feat(CupertinoScrollbar demo):
  temp

# Conflicts:
#	lib/widgets/themes/Cupertino/index.dart
#	lib/widgets/themes/index.dart
2019-01-21 11:31:58 +08:00
e7e2e6d6c2 Cupertino 的子项 2019-01-21 11:17:53 +08:00
65e38199b5 feat(add CupertinoTabBar demo): 2019-01-20 23:04:56 +08:00
5873912acc Merge pull request #56 from hanxu317317/develop
完善theme组件列表
2019-01-20 22:25:55 +08:00
d840088144 feat(CupertinoSwitch demo): 2019-01-20 22:18:44 +08:00
da964ef603 feat(为搜索列表加入icon) 2019-01-20 17:24:59 +08:00
346036cdb9 feat(CupertinoSliverRefreshControl demo)
CupertinoSliverRefreshControl demo与CupertinoSliverNavigationBar无差别, 所以二者路由引到同一个位置
2019-01-20 17:24:25 +08:00
f2b7ca5f74 Merge branch 'develop' of github.com:alibaba/flutter-common-widgets-app into develop 2019-01-20 16:25:43 +08:00