Merge branch 'master' of https://github.com/XuYanci/tap_water

* 'master' of https://github.com/XuYanci/tap_water:
  [update][dev]update pr template
  [update][dev]update pr template.
  [update][dev]update pr template
  [update][dev]update pr template
  button居中，修改单击返回数据
  添加Function类型，完善代码规范
  btmNavbar map修改为item
  [!] 底部单击添加颜色变化，暴露tab单击事件，封装AppBar，底部tab通过传参数配置
  no message
  [+] tab配置通过传btmNavbar进行配置，优化按钮添加隐藏操作
  添加isButton判断是否带按钮
  调整文件结构，将Tabbar，TabbarItem 封装到单独的文件中
  [update][README]update README to add contributor info  iteatimeteam#8
  [update][flutter]update pull_request_template.

# Conflicts:
#	lib/TapWaterTabbar.dart

.github/pull_request_template.md

@@ -5,11 +5,17 @@
 
 ## CheckList
 
-
 Thanks for considering to this repository. Before you submit your issue, please confirm these boxes are checked.
 
 - [ ] I have read [《[EN]Style guide for Flutter repo [CN]Flutter项目代码规范、规约选型》](https://github.com/iteatimeteam/tap_water/issues/1).
-- [ ] 我遵守一下 Merge 规则：邀请群组中任意一人进行review，即可合并。让 reviewer 在 PR 所在页面写下review意见表示通过，即可合并。最简单写一句 LGTM 也可以。不按照本规则执行，自己 PR 自己 Merge 并引入问题，会被收回 Merge 权限。
+- [ ] [EN]I have added screenshots for main devices if this PR includes UI updates. [CN]UI改动，需要将主要设备截图，表明本此 PR 的 UI 改动。
+- [ ] [CN]我遵守以下 Merge 规则：PR 提交后，邀请群组中任意一人进行 review，即可合并。让 reviewer 在 PR 所在页面写下 review 意见表示通过，即可合并。最简单写一句 LGTM 也可以。不按照本规则执行，自己 PR 自己 Merge 并引入问题，会被收回 Merge 权限。如无 merge 权限，请联系 @ChenYilong 执行 merge 操作。
+
+##  screenshots
+
+ iPhoneX+ | iPhone (except for iPhoneX+) | android 
+ :-------------:|:-------------:|:-------------:
+![](http://ww2.sinaimg.cn/large/006tNc79gy1g544k1fcdjg30b20kzn2q.gif)  | ![](http://ww1.sinaimg.cn/large/006tNc79gy1g5bvpae0u8j30ku112dj9.jpg) | ![](http://ww3.sinaimg.cn/large/006tNc79gy1g5bv6com75j30ks11sjsh.jpg)
 
 
 

README.md

@@ -42,5 +42,6 @@ updated
 
  演示 |  主要代码贡献方及介绍
 :-------------:|:-------------:
-| ![](http://ww2.sinaimg.cn/large/006tNc79gy1g544k1fcdjg30b20kzn2q.gif) |  ![https://github.com/ChenYilong](https://avatars1.githubusercontent.com/u/13093607?s=400&v=4) </p>[**@DargonLee**]( https://github.com/DargonLee ) </p>[issue#11 TabBar基础版本，不带加号按钮]( https://github.com/iteatimeteam/tap_water/issues/11 ) 
+![](http://ww2.sinaimg.cn/large/006tNc79gy1g544k1fcdjg30b20kzn2q.gif) | <a href="https://github.com/DargonLee"><img src="https://avatars1.githubusercontent.com/u/13093607?s=400&v=4"></a> </p>[**@DargonLee**]( https://github.com/DargonLee ) </p>[《TabBar基础版本，不带加号按钮 issue#11》]( https://github.com/iteatimeteam/tap_water/issues/11) 
+![](http://ww2.sinaimg.cn/large/006tNc79gy1g5by04hgd9g30b20kz786.gif) | <a href="https://github.com/SuXiaoya"><img src="https://avatars1.githubusercontent.com/u/11497470?s=400&v=4"></a></p> [@苏筱雅]( https://github.com/SuXiaoya ) </p> [《TabBar 加号按钮未封装版本，带加号按钮 #8》]( https://github.com/iteatimeteam/tap_water/issues/8 ) 
 

ios/Runner.xcodeproj/project.pbxproj

@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		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 */; };
@@ -40,6 +41,7 @@
 		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>"; };
@@ -73,6 +75,7 @@
 			children = (
 				3B80C3931E831B6300D905FE /* App.framework */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
+				2D5378251FAA1A9400D5DBA9 /* flutter_assets */,
 				9740EEBA1CF902C7004384FC /* Flutter.framework */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -185,6 +188,7 @@
 			files = (
 				97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */,
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
+				2D5378261FAA1A9400D5DBA9 /* flutter_assets in Resources */,
 				9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,