From 98f3a025193a6f3cefff0ba205b756695e42b29d Mon Sep 17 00:00:00 2001 From: Navin Sharma Date: Tue, 14 Jan 2020 12:38:00 +0530 Subject: [PATCH 1/8] Update README.md --- example/README.md | 80 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 70 insertions(+), 10 deletions(-) diff --git a/example/README.md b/example/README.md index e9446893..ab1fe3fc 100644 --- a/example/README.md +++ b/example/README.md @@ -1,16 +1,76 @@ -# getflutter_example +

+ + Get Flutter + +

-A new Flutter project. +[**GetFlutter**](https://www.getflutter.dev) is 100% open source UI library build to make flutter development easier than ever and reuse 1000+ pre-build widget in any Flutter Web or Mobile app development. -## Getting Started +[**NOTE**] Our library will also work on flutter web but still flutter web is in Beta release so some rendering problem may occur and hence we will update our library as flutter comes with stable release on Web. -This project is a starting point for a Flutter application. +## Table of contents -A few resources to get you started if this is your first Flutter project: +- [Quick start](#quick-start) +- [Features](#features) +- [Screenshot](#screenshot) +- [Demo](#demo) +- [Contributing](#contributing) +- [Bugs and feature requests](#bugs-and-feature-requests) +- [Documentation](#documentation) +- [Copyright and license](#copyright-and-license) -- [Lab: Write your first Flutter app](https://flutter.dev/docs/get-started/codelab) -- [Cookbook: Useful Flutter samples](https://flutter.dev/docs/cookbook) +## Quick start -For help getting started with Flutter, view our -[online documentation](https://flutter.dev/docs), which offers tutorials, -samples, guidance on mobile development, and a full API reference. +Read the [Getting started page](https://docs.getflutter.dev) +Forum [Support and discussion ](https://forum.getflutter.dev) + +## Features +In this beta release we are going to launch the library with following components : + + #### Button | Badge | Avatar | Image | Card | Carousel | Tile | Tab | Typography + + + ## Screenshot +

+ + Get Flutter + + + + +

+ + ## Demo + + + ## Contributing + + GetFlutter is **100% free** and **open source**. We encourage and support an active, healthy community that accepts contributions from the public – including you! + + * If you are a developer, feel free to check out the source and submit pull requests. + * Dig into [**CONTRIBUTING.MD**](CONTRIBUTING.md), which covers submitting bugs, requesting new features, preparing your code for a pull request, etc. + * Please don't forget to **like**, **follow**, and **star our repo**! Join our growing [community](http://forum.getflutter.dev) to keep up to date with the latest Get Flutter development. + * Not sure what to work on? [**We've got lots ideas.**](https://roadmap.getflutter.dev) + + + ## Bugs-and-feature-requests + + + ## Documentation + + [**Installation Guide**](https://docs.getflutter.dev) + + +### Social Media + +Twitter: + +Facebook: + +Linkedin: + +Instagram: + + + ## Copyright-and-license + Code and documentation copyright 2017-2020 the [GETFLUTTER Authors](https://www.getflutter.dev) and [PIETECH SOLUTION PVT LTD.](https://pietechsolution.com) Code released under the [MIT License]. Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/). From fdc278f47f7dae02001cbc8e056b5204d9387ec8 Mon Sep 17 00:00:00 2001 From: Sandip Kakadiya Date: Tue, 14 Jan 2020 14:46:16 +0530 Subject: [PATCH 2/8] changed warnings and changelog --- example/README.md | 80 ++++++++++++++++++++++++++++++++++++++------ example/pubspec.lock | 2 +- 2 files changed, 71 insertions(+), 11 deletions(-) diff --git a/example/README.md b/example/README.md index e9446893..ab1fe3fc 100644 --- a/example/README.md +++ b/example/README.md @@ -1,16 +1,76 @@ -# getflutter_example +

+ + Get Flutter + +

-A new Flutter project. +[**GetFlutter**](https://www.getflutter.dev) is 100% open source UI library build to make flutter development easier than ever and reuse 1000+ pre-build widget in any Flutter Web or Mobile app development. -## Getting Started +[**NOTE**] Our library will also work on flutter web but still flutter web is in Beta release so some rendering problem may occur and hence we will update our library as flutter comes with stable release on Web. -This project is a starting point for a Flutter application. +## Table of contents -A few resources to get you started if this is your first Flutter project: +- [Quick start](#quick-start) +- [Features](#features) +- [Screenshot](#screenshot) +- [Demo](#demo) +- [Contributing](#contributing) +- [Bugs and feature requests](#bugs-and-feature-requests) +- [Documentation](#documentation) +- [Copyright and license](#copyright-and-license) -- [Lab: Write your first Flutter app](https://flutter.dev/docs/get-started/codelab) -- [Cookbook: Useful Flutter samples](https://flutter.dev/docs/cookbook) +## Quick start -For help getting started with Flutter, view our -[online documentation](https://flutter.dev/docs), which offers tutorials, -samples, guidance on mobile development, and a full API reference. +Read the [Getting started page](https://docs.getflutter.dev) +Forum [Support and discussion ](https://forum.getflutter.dev) + +## Features +In this beta release we are going to launch the library with following components : + + #### Button | Badge | Avatar | Image | Card | Carousel | Tile | Tab | Typography + + + ## Screenshot +

+ + Get Flutter + + + + +

+ + ## Demo + + + ## Contributing + + GetFlutter is **100% free** and **open source**. We encourage and support an active, healthy community that accepts contributions from the public – including you! + + * If you are a developer, feel free to check out the source and submit pull requests. + * Dig into [**CONTRIBUTING.MD**](CONTRIBUTING.md), which covers submitting bugs, requesting new features, preparing your code for a pull request, etc. + * Please don't forget to **like**, **follow**, and **star our repo**! Join our growing [community](http://forum.getflutter.dev) to keep up to date with the latest Get Flutter development. + * Not sure what to work on? [**We've got lots ideas.**](https://roadmap.getflutter.dev) + + + ## Bugs-and-feature-requests + + + ## Documentation + + [**Installation Guide**](https://docs.getflutter.dev) + + +### Social Media + +Twitter: + +Facebook: + +Linkedin: + +Instagram: + + + ## Copyright-and-license + Code and documentation copyright 2017-2020 the [GETFLUTTER Authors](https://www.getflutter.dev) and [PIETECH SOLUTION PVT LTD.](https://pietechsolution.com) Code released under the [MIT License]. Docs released under [Creative Commons](https://creativecommons.org/licenses/by/3.0/). diff --git a/example/pubspec.lock b/example/pubspec.lock index ecbfb026..2b3be177 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -80,7 +80,7 @@ packages: path: ".." relative: true source: path - version: "0.0.1-pre.3" + version: "1.0.0-dev.1" image: dependency: transitive description: From ab915294ee7e04c4167d1d04fdacc3110ced9b8b Mon Sep 17 00:00:00 2001 From: Sandip Kakadiya Date: Tue, 14 Jan 2020 15:13:50 +0530 Subject: [PATCH 3/8] changed warnings and changelog --- CHANGELOG.md | 23 +++++++++---- lib/components/list_tile/gf_list_tile.dart | 40 +++++++++++----------- lib/components/tabs/gf_segment_tabs.dart | 1 - lib/components/tabs/gf_tabBar.dart | 1 - lib/components/tabs/gf_tabs.dart | 1 - pubspec.yaml | 4 +-- 6 files changed, 39 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06cf4071..feae506f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,17 +1,28 @@ # Changelog -## 0.0.1-pre.3 - 2014-01-14 + +## 1.0.0-dev.1 - 2014-01-14 ### Fixed +* Warnings and Hints + -* Corrected warnings and hits +## 0.0.1-pre.3 - 2014-01-14 + +### Fixed +* Warnings and Hints ### Added +* Changelog and Description -* Changelog and description -## 14.0.0 - 2042-10-06 +## 0.0.1-pre.2 - 2014-01-14 + +### Fixed +* Warnings and Hints -### Added -* Introduced animals into the world, we believe they're going to be a neat addition. \ No newline at end of file +## 0.0.1-pre.1 - 2014-01-13 + +### Added +* initial release with buttons, badge, card, list tile, avatar and many more components. \ No newline at end of file diff --git a/lib/components/list_tile/gf_list_tile.dart b/lib/components/list_tile/gf_list_tile.dart index 1d46fc40..58e59f8a 100644 --- a/lib/components/list_tile/gf_list_tile.dart +++ b/lib/components/list_tile/gf_list_tile.dart @@ -100,25 +100,25 @@ class GFListTile extends StatelessWidget { margin: padding, color: color, child: ListTile( - leading: avatar, - title: title, - subtitle: subTitle != null || description != null - ? Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - subTitle ?? Container(), - description ?? Container() - ], - ) - : Container(), - trailing: icon != null - ? Column( - children: [ - Padding( - padding: EdgeInsets.only(top: 16.0), child: icon) - ], - ) - : Container()), + leading: avatar, + title: title, + subtitle: subTitle != null || description != null + ? Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + subTitle ?? Container(), + description ?? Container() + ], + ) + : null, + trailing: icon != null + ? Column( + children: [ + Padding(padding: EdgeInsets.only(top: 16.0), child: icon) + ], + ) + : null, + ), ), showDivider ? Divider( @@ -128,7 +128,7 @@ class GFListTile extends StatelessWidget { indent: indent ?? dividerIndent, endIndent: endIndent ?? dividerEndIndent, ) - : Container() + : null ], ); } diff --git a/lib/components/tabs/gf_segment_tabs.dart b/lib/components/tabs/gf_segment_tabs.dart index 1f6119d8..4fc5805d 100644 --- a/lib/components/tabs/gf_segment_tabs.dart +++ b/lib/components/tabs/gf_segment_tabs.dart @@ -4,7 +4,6 @@ import 'package:flutter/rendering.dart'; import 'package:flutter/widgets.dart'; import 'package:getflutter/colors/gf_color.dart'; import 'package:getflutter/components/tabs/gf_tabBar.dart'; -import 'package:getflutter/colors/gf_color.dart'; /// Creates pills like structured tab bar. See [GFTabBar] /// [GFSegmentTabs] are best used as an alternative for [GFTabBar]. diff --git a/lib/components/tabs/gf_tabBar.dart b/lib/components/tabs/gf_tabBar.dart index f8a16835..f2978999 100644 --- a/lib/components/tabs/gf_tabBar.dart +++ b/lib/components/tabs/gf_tabBar.dart @@ -4,7 +4,6 @@ import 'package:flutter/rendering.dart'; import 'package:flutter/widgets.dart'; import 'package:getflutter/colors/gf_color.dart'; import 'package:getflutter/components/tabs/gf_tabBarView.dart'; -import 'package:getflutter/colors/gf_color.dart'; /// A material design widget that displays a horizontal row of tabs. /// diff --git a/lib/components/tabs/gf_tabs.dart b/lib/components/tabs/gf_tabs.dart index a480db2e..1936234f 100644 --- a/lib/components/tabs/gf_tabs.dart +++ b/lib/components/tabs/gf_tabs.dart @@ -5,7 +5,6 @@ import 'package:flutter/widgets.dart'; import 'package:getflutter/colors/gf_color.dart'; import 'package:getflutter/components/tabs/gf_tabBarView.dart'; import 'package:getflutter/components/tabs/gf_tabBar.dart'; -import 'package:getflutter/colors/gf_color.dart'; /// Creates a default tab for the given [child] widget. /// diff --git a/pubspec.yaml b/pubspec.yaml index c796eb6d..8a81f5ad 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: getflutter -description: GetFlutter is open source libraries that come with pre-build 1000+ UI components. We build this library to make flutter development faster and more enjoyable. You can customize the component as you will build own app without UI knowledge. -version: 0.0.1-pre.3 +description: GetFlutter is open source libraries that come with pre-build 1000+ UI components. It makes development faster & more enjoyable. You can customize the component as per your need. +version: 1.0.0-dev.1 #author: GetFlutter homepage: https://github.com/ionicfirebaseapp/getflutter From cc15e35cba9c1a5253e72ac2045121c20f8313f2 Mon Sep 17 00:00:00 2001 From: Vishal Kumar Date: Wed, 15 Jan 2020 11:57:28 +0530 Subject: [PATCH 4/8] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ab1fe3fc..e7009689 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@

-[**GetFlutter**](https://www.getflutter.dev) is 100% open source UI library build to make flutter development easier than ever and reuse 1000+ pre-build widget in any Flutter Web or Mobile app development. +[**GetFlutter**](https://www.getflutter.dev) is 100% a Flutter open source UI library that build to make flutter development easier than ever. GetFlutter has 1000+ pre-build widgets that you could reuse to build for both Flutter Web or Mobile app development. -[**NOTE**] Our library will also work on flutter web but still flutter web is in Beta release so some rendering problem may occur and hence we will update our library as flutter comes with stable release on Web. +[**NOTE**] Our library will also work on flutter web but since flutter didn't released stable version for Flutter web and it is still in Beta release so you might be get some rendering problem and hence we will update our library as flutter comes with the stable release for Flutter Web. ## Table of contents From 54d28e1f5e48725007b444c9514ae93dd55f8a6d Mon Sep 17 00:00:00 2001 From: Vishal Kumar Date: Wed, 15 Jan 2020 11:59:57 +0530 Subject: [PATCH 5/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e7009689..198e38cd 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ Facebook: Linkedin: -Instagram: +Instagram: ## Copyright-and-license From 4fba3bf532a9e45d5525ad6303dbf437297dbc19 Mon Sep 17 00:00:00 2001 From: Vishal Kumar Date: Wed, 15 Jan 2020 12:24:46 +0530 Subject: [PATCH 6/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 198e38cd..1034517c 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ In this beta release we are going to launch the library with following component ## Screenshot

- + Get Flutter From 9ff05eed6597f8ac412f2e1c2a8689c264ef5e5f Mon Sep 17 00:00:00 2001 From: Vishal Kumar Date: Wed, 15 Jan 2020 12:27:51 +0530 Subject: [PATCH 7/8] Update README.md --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 1034517c..23c2b2e0 100644 --- a/README.md +++ b/README.md @@ -34,9 +34,6 @@ In this beta release we are going to launch the library with following component

Get Flutter - - -

From f8a4e510d7b3c34d0bd69fe63097701a67626e77 Mon Sep 17 00:00:00 2001 From: deepikahr Date: Wed, 15 Jan 2020 14:06:43 +0530 Subject: [PATCH 8/8] description added in tabs and issue fixed in listtile --- .gitignore | 1 + example/lib/main.dart | 635 +++++++++++---------- lib/components/list_tile/gf_list_tile.dart | 30 +- lib/components/tabs/gf_segment_tabs.dart | 10 + lib/components/tabs/gf_tabBar.dart | 9 +- lib/components/tabs/gf_tabs.dart | 5 + 6 files changed, 349 insertions(+), 341 deletions(-) diff --git a/.gitignore b/.gitignore index 3132dc5f..1f62091d 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ .pub-cache/ .pub/ build/ +web/ # Android related **/android/**/gradle-wrapper.jar diff --git a/example/lib/main.dart b/example/lib/main.dart index 308f4568..c3c052cf 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -173,38 +173,38 @@ class _MyHomePageState extends State mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ - Container( - height: 130.0, - width: 105.0, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(8.0), - gradient: LinearGradient( - begin: FractionalOffset.bottomLeft, - end: FractionalOffset.topRight, - colors: [ - const Color(0x5a0b486b), - const Color(0xFFF56217), - ])), - ), - - GFCard( - content: Column( - children: [ - GFTypography( - text: 'IOS', - type: GFTypographyType.typo6, - ), - SizedBox( - height: 10, - ), - GFToggle( - onChanged: null, - value: null, - type: GFToggleType.ios, - ) - ], - ), - ), +// Container( +// height: 130.0, +// width: 105.0, +// decoration: BoxDecoration( +// borderRadius: BorderRadius.circular(8.0), +// gradient: LinearGradient( +// begin: FractionalOffset.bottomLeft, +// end: FractionalOffset.topRight, +// colors: [ +// const Color(0x5a0b486b), +// const Color(0xFFF56217), +// ])), +// ), +// +// GFCard( +// content: Column( +// children: [ +// GFTypography( +// text: 'IOS', +// type: GFTypographyType.typo6, +// ), +// SizedBox( +// height: 10, +// ), +// GFToggle( +// onChanged: null, +// value: null, +// type: GFToggleType.ios, +// ) +// ], +// ), +// ), // GFCard( // content: Container( @@ -214,11 +214,11 @@ class _MyHomePageState extends State // children: [ // Column( // children: [ - GFTypography( - text: 'GF Header Typo1', - type: GFTypographyType.typo1, -// showDivider: false, - ), +// GFTypography( +// text: 'GF Header Typo1', +// type: GFTypographyType.typo1, +//// showDivider: false, +// ), // GFTypography( // text: 'GF Header Typo2', // type: GFTypographyType.typo2, @@ -337,46 +337,50 @@ class _MyHomePageState extends State // icon: Icon(Icons.directions_bike), // ), -// GFListTile( -//// padding: EdgeInsets.all(8.0), -//// color: Colors.redAccent, -//// avatar: GFAvatar( -//// child: Text("tb"), -//// ), -// title: Text('title'), -//// subTitle: Text('subtitle'), -// icon: Text("99"), -//// dividerColor: Colors.blue, -//// dividerEndIndent: 20.0, -//// dividerHeight: 2.0, -//// dividerIndent: 30.0, -//// dividerThickness: 5.0, -// showDivider: false, -// ), - -// GFListTile( + GFListTile( +// padding: EdgeInsets.all(8.0), +// color: Colors.redAccent, // avatar: GFAvatar( -// shape: GFAvatarShape.standard, -// ), -// title: GFTypography( -// text: 'List tile', -// type: GFTypographyType.typo5, -// showDivider: false, -// ), -// subTitle: Text( -// 'Lorem ipsum', -// style: TextStyle(color: getGFColor(GFColor.dark)), +// child: Text("tb"), // ), -// description: Text( -// 'Dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ' -// 'sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ', -// style: TextStyle( -// fontSize: 13, color: getGFColor(GFColor.secondary))), -// showDivider: true, -// icon: GFIconButton( -// onPressed: null, -// type: GFType.transparent, -// icon: Icon(Icons.favorite_border), + title: Text('title'), + subTitle: Text('subtitle'), + description: Text('A page view that displays the widget which ' + 'corresponds to the currently selected tab. This widget is typically used in'), + icon: Text("99"), +// dividerColor: Colors.blue, +// dividerEndIndent: 20.0, +// dividerHeight: 2.0, +// dividerIndent: 30.0, +// dividerThickness: 5.0, +// showDivider: false, + ), + +// GFCard( +// title: GFListTile( +// avatar: GFAvatar( +// shape: GFAvatarShape.standard, +// ), +// title: GFTypography( +// text: 'List tile', +// type: GFTypographyType.typo5, +// showDivider: false, +// ), +// subTitle: Text( +// 'Lorem ipsum', +// style: TextStyle(color: getGFColor(GFColor.dark)), +// ), +// description: Text( +// 'Dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ' +// 'sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ', +// style: TextStyle( +// fontSize: 13, color: getGFColor(GFColor.secondary))), +// showDivider: false, +// icon: GFIconButton( +// onPressed: null, +// type: GFType.transparent, +// icon: Icon(Icons.favorite_border), +// ), // ), // ), // @@ -402,17 +406,17 @@ class _MyHomePageState extends State // ), // ), // - GFCard( - content: GFImageOverlay( - height: 200.0, - width: 200.0, - image: AssetImage("lib/assets/food.jpeg"), - boxFit: BoxFit.fill, - colorFilter: new ColorFilter.mode( - Colors.black.withOpacity(0.67), BlendMode.darken), - shape: BoxShape.circle, - ), - ), +// GFCard( +// content: GFImageOverlay( +// height: 200.0, +// width: 200.0, +// image: AssetImage("lib/assets/food.jpeg"), +// boxFit: BoxFit.fill, +// colorFilter: new ColorFilter.mode( +// Colors.black.withOpacity(0.67), BlendMode.darken), +// shape: BoxShape.circle, +// ), +// ), // // GFCard( // content: Container( @@ -428,34 +432,35 @@ class _MyHomePageState extends State // ))), // ), - GFButtonBadge( -// boxShadow: BoxShadow( -// color: Colors.pink, -// blurRadius: 2.0, -// spreadRadius: 1.0, -// offset: Offset.zero, +// GFButtonBadge( +//// boxShadow: BoxShadow( +//// color: Colors.pink, +//// blurRadius: 2.0, +//// spreadRadius: 1.0, +//// offset: Offset.zero, +//// ), +//// badgeBoxShadow: true, +// onPressed: () {}, +//// position: GFPosition.start, +//// borderSide: BorderSide(color: Colors.pink, width: 1.0, style: BorderStyle.solid), +//// borderShape: RoundedRectangleBorder(side: BorderSide(color: Colors.pink, width: 2.0, style: BorderStyle.solid), borderRadius: BorderRadius.zero), +// text: 'goodiesdxs', +//// color: GFColor.success, +//// textColor: GFColor.dark, +//// shape: GFButtonShape.pills, +//// type: GFType.outline2x, +//// size: GFSize.small, +// icon: GFBadge( +// child: Text("12"), +//// color: GFColor.dark, +//// shape: GFBadgeShape.circle, +//// size: GFSize.small, +//// border: BorderSide(color: Colors.pink, width: 1.0, style: BorderStyle.solid), +//// borderShape: RoundedRectangleBorder(), +//// textColor: GFColor.white, +//// textStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: 8.0), // ), -// badgeBoxShadow: true, - onPressed: () {}, -// position: GFPosition.start, -// borderSide: BorderSide(color: Colors.pink, width: 1.0, style: BorderStyle.solid), -// borderShape: RoundedRectangleBorder(side: BorderSide(color: Colors.pink, width: 2.0, style: BorderStyle.solid), borderRadius: BorderRadius.zero), - text: 'goodiesdxs', - color: GFColor.success, - textColor: GFColor.dark, - shape: GFButtonShape.pills, - type: GFType.outline2x, -// size: GFSize.small, - icon: GFBadge( - child: Text("12"), -// color: GFColor.dark, -// shape: GFBadgeShape.circle, -// size: GFSize.small, -// border: BorderSide(color: Colors.pink, width: 1.0, style: BorderStyle.solid), -// textColor: GFColor.white, -// textStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: 8.0), - ), - ), +// ), // GFSocialButton( // text: 'social goodies', @@ -547,82 +552,83 @@ class _MyHomePageState extends State // backgroundImage: NetworkImage("https://cdn.pixabay.com/photo/2017/12/03/18/04/christmas-balls-2995437_960_720.jpg"), // ), -// GFSegmentTabs( -// tabController: tabController, -// height: 36.0, -//// width: 180.0, -// initialIndex: 0, -// length: 3, -// tabs: [ -// Text( -// "Gelatin", -// ), -// Tab( -// child: Text( -// "Donuts", -// ), -// ), -// Tab( -// child: Text( -// "Pastry", -// ), -// ), -// ], -// tabBarColor: Colors.grey, -// indicatorSize: TabBarIndicatorSize.tab, -// indicatorColor: Colors.greenAccent, -// labelColor: Colors.greenAccent, -// unselectedLabelColor: Colors.white, -// indicator: BoxDecoration( -// color: Colors.black, -// border: Border(bottom: BorderSide(color: Colors.greenAccent, width: 2.0,),), -//// borderRadius: BorderRadius.circular(2.0) -// ), -// indicatorPadding: EdgeInsets.all(8.0), -// indicatorWeight: 2.0, -// border: Border.all(color: Colors.white, width: 2.0), + GFSegmentTabs( + tabController: tabController, + height: 36.0, +// width: 180.0, + initialIndex: 0, + length: 3, + tabs: [ + Text( + "Gelatin", + ), + Tab( + child: Text( + "Donuts", + ), + ), + Tab( + child: Text( + "Pastry", + ), + ), + ], + tabBarColor: Colors.grey, + indicatorSize: TabBarIndicatorSize.tab, + indicatorColor: Colors.greenAccent, + labelColor: Colors.greenAccent, + unselectedLabelColor: Colors.white, + indicator: BoxDecoration( + color: Colors.black, + border: Border(bottom: BorderSide(color: Colors.greenAccent, width: 2.0,),), // borderRadius: BorderRadius.circular(2.0) -// ), -// -// GFTabBarView( -// controller: tabController, -// height: 400.0, -// children: [ -// Container(color: Colors.red), -// Container(color: Colors.green), -// Container(color: Colors.blue) -// ] -// ), + ), + indicatorPadding: EdgeInsets.all(8.0), + indicatorWeight: 2.0, + border: Border.all(color: Colors.white, width: 2.0), + borderRadius: BorderRadius.circular(2.0) + ), - GFItemsCarousel( - rowCount: 3, - children: imageList.map( - (url) { - return Container( - margin: EdgeInsets.all(5.0), - child: ClipRRect( - borderRadius: BorderRadius.all(Radius.circular(5.0)), - child: - Image.network(url, fit: BoxFit.cover, width: 1000.0), - ), - ); - }, - ).toList(), + GFTabBarView( + controller: tabController, + height: 400.0, + children: [ + Container(color: Colors.red), + Container(color: Colors.green), + Container(color: Colors.blue) + ] ), + + +// GFItemsCarousel( +// rowCount: 3, +// children: imageList.map( +// (url) { +// return Container( +// margin: EdgeInsets.all(5.0), +// child: ClipRRect( +// borderRadius: BorderRadius.all(Radius.circular(5.0)), +// child: +// Image.network(url, fit: BoxFit.cover, width: 1000.0), +// ), +// ); +// }, +// ).toList(), +// ), // // GFCarousel( -// pagerSize: 12.0, -// activeIndicator: Colors.pink, -// passiveIndicator: Colors.pink.withOpacity(0.4), -// viewportFraction: 1.0, +//// pagerSize: 12.0, +//// activeIndicator: Colors.pink, +//// passiveIndicator: Colors.pink.withOpacity(0.4), +//// viewportFraction: 1.0, //// aspectRatio: 1.0, -// autoPlay: true, -// enlargeMainPage: true, -// pagination: true, +//// autoPlay: true, +//// enlargeMainPage: true, +//// pagination: true, // items: imageList.map( // (url) { // return Container( -// margin: EdgeInsets.only(bottom: 25.0, left: 12.0, right: 12.0, top: 12.0), +// margin: EdgeInsets.all(8.0), // child: ClipRRect( // borderRadius: BorderRadius.all(Radius.circular(5.0)), // child: Image.network( @@ -640,8 +646,8 @@ class _MyHomePageState extends State // }); // }, // ), -// -// + + // GFTabs( //// height: 100.0, //// tabBarHeight: 52.0, @@ -749,58 +755,58 @@ class _MyHomePageState extends State // }, // ), - GFCard( - boxFit: BoxFit.fill, - colorFilter: new ColorFilter.mode( - Colors.black.withOpacity(0.67), BlendMode.darken), - image: Image.asset( - "lib/assets/img.png", - fit: BoxFit.fitWidth, - width: 400.0, - ), -// imageOverlay: AssetImage("lib/assets/food.jpeg"), - titlePosition: GFPosition.end, - title: GFListTile( - avatar: GFAvatar( - child: Text("tb"), - ), - title: Text( - 'title', - style: TextStyle(color: Colors.grey), - ), - subTitle: Text( - 'subtitle', - style: TextStyle(color: Colors.grey), - ), - icon: GFIconButton( - onPressed: null, - icon: Icon(Icons.favorite_border), - type: GFType.transparent, - ), - ), - content: Text( - "Flutter Flutter is Google's mobile UI framework for crafting" - "Flutter Flutter is Google's mobile UI framework for crafting", - style: TextStyle(color: Colors.grey), - ), -// buttonBar: GFButtonBar( -// mainAxisSize: MainAxisSize.min, -// children: [ -// GFButton( -// onPressed: null, -// child: Text("favorite"), -// icon: Icon(Icons.favorite_border), -// type: GFType.transparent, -// ), -// GFButton( -// onPressed: null, -// child: Text("share"), -// icon: Icon(Icons.share), -// type: GFType.outline, -// ), -// ], +// GFCard( +// boxFit: BoxFit.fill, +// colorFilter: new ColorFilter.mode( +// Colors.black.withOpacity(0.67), BlendMode.darken), +// image: Image.asset( +// "lib/assets/img.png", +// fit: BoxFit.fitWidth, +// width: 400.0, // ), - ), +//// imageOverlay: AssetImage("lib/assets/food.jpeg"), +// titlePosition: GFPosition.end, +// title: GFListTile( +// avatar: GFAvatar( +// child: Text("tb"), +// ), +// title: Text( +// 'title', +// style: TextStyle(color: Colors.grey), +// ), +// subTitle: Text( +// 'subtitle', +// style: TextStyle(color: Colors.grey), +// ), +// icon: GFIconButton( +// onPressed: null, +// icon: Icon(Icons.favorite_border), +// type: GFType.transparent, +// ), +// ), +// content: Text( +// "Flutter Flutter is Google's mobile UI framework for crafting" +// "Flutter Flutter is Google's mobile UI framework for crafting", +// style: TextStyle(color: Colors.grey), +// ), +//// buttonBar: GFButtonBar( +//// mainAxisSize: MainAxisSize.min, +//// children: [ +//// GFButton( +//// onPressed: null, +//// child: Text("favorite"), +//// icon: Icon(Icons.favorite_border), +//// type: GFType.transparent, +//// ), +//// GFButton( +//// onPressed: null, +//// child: Text("share"), +//// icon: Icon(Icons.share), +//// type: GFType.outline, +//// ), +//// ], +//// ), +// ), // GFButtonBar( // mainAxisSize: MainAxisSize.min, @@ -922,11 +928,11 @@ class _MyHomePageState extends State // borderRadius: new BorderRadius.circular(5.0), //// border: Border.all(color: Colors.pink, width: 2.0), // ), - GFAvatar( +// GFAvatar( // radius: 20.0, // maxRadius: 50, - child: Text("de"), +// child: Text("de"), // backgroundColor: Colors.pink, // @@ -939,54 +945,53 @@ class _MyHomePageState extends State // size: GFSize.large, // // borderRadius: BorderRadius.circular(10.0), - ), - GFIconBadge( - child: +// ), + +// GFIconBadge( +// child: // GFIconButton( -// onPressed: null, +// onPressed: (){}, // icon: Icon(Icons.ac_unit), -// size: GFSize.large, +//// size: GFSize.large, // ), - GFAvatar( - child: Text("sefv"), - size: GFSize.small, - ), - counterChild: GFBadge( - text: '12', - -// color: GFColor.dark, -// -// shape: GFBadgeShape.circle, -// -// size: GFSize.small, // -// border: BorderSide(color: Colors.pink, width: 1.0, style: BorderStyle.solid), +// counterChild: GFBadge( +// text: '12', // -// textColor: GFColor.white, -// -// textStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: 8.0), -// -// borderShape: RoundedRectangleBorder(side: BorderSide(color: Colors.orange, width: 2.0, style: BorderStyle.solid), borderRadius: BorderRadius.zero), - ), - ), - GFIconButton( - onPressed: null, - icon: Icon(Icons.ac_unit), -// iconSize: 12.0, -// type: GFType.solid, -// shape: GFIconButtonShape.pills, -// size: GFSize.large, -// buttonBoxShadow: true, -// color: GFColor.warning, -// boxShadow: BoxShadow( -// color: Colors.pink, -// blurRadius: 2.0, -// spreadRadius: 1.0, -// offset: Offset.zero, +//// color: GFColor.dark, +//// +//// shape: GFBadgeShape.circle, +//// +//// size: GFSize.small, +//// +//// border: BorderSide(color: Colors.pink, width: 1.0, style: BorderStyle.solid), +//// +//// textColor: GFColor.white, +//// +//// textStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: 8.0), +//// +//// borderShape: RoundedRectangleBorder(side: BorderSide(color: Colors.orange, width: 2.0, style: BorderStyle.solid), borderRadius: BorderRadius.zero), // ), -// borderSide: BorderSide(color: Colors.pink, width: 1.0, style: BorderStyle.solid), -// borderShape: RoundedRectangleBorder(side: BorderSide(color: Colors.pink, width: 2.0, style: BorderStyle.solid), borderRadius: BorderRadius.zero), - ), +// ), + +// GFIconButton( +// onPressed: (){}, +// icon: Icon(Icons.ac_unit), +//// iconSize: 12.0, +//// type: GFType.solid, +//// shape: GFIconButtonShape.pills, +//// size: GFSize.large, +//// buttonBoxShadow: true, +//// color: GFColor.warning, +//// boxShadow: BoxShadow( +//// color: Colors.pink, +//// blurRadius: 2.0, +//// spreadRadius: 1.0, +//// offset: Offset.zero, +//// ), +//// borderSide: BorderSide(color: Colors.pink, width: 1.0, style: BorderStyle.solid), +//// borderShape: RoundedRectangleBorder(side: BorderSide(color: Colors.pink, width: 2.0, style: BorderStyle.solid), borderRadius: BorderRadius.zero), +// ), // // GFBadge( // text: '12', @@ -999,14 +1004,13 @@ class _MyHomePageState extends State // ), // // GFButton( -// type: GFType.solid, +// type: GFType.outline, // shape: GFButtonShape.pills, // text: 'goodies', -// onPressed: () { -// print('dddddddddd'); -// }, -// hoverColor: Colors.orange, -// focusColor: Colors.teal, +// icon: Icon(Icons.share), +// onPressed: () {}, +//// hoverColor: Colors.orange, +//// focusColor: Colors.teal, //// textStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: 8.0), //// size: GFSize.large, //// buttonBoxShadow: true, @@ -1016,12 +1020,12 @@ class _MyHomePageState extends State //// textColor: GFColor.secondary, //// icon: Icon(Icons.error, color: Colors.white,), //// position: GFIconPosition.start, -// boxShadow: BoxShadow( -// color: Colors.pink, -// blurRadius: 2.0, -// spreadRadius: 1.0, -// offset: Offset.zero, -// ), +//// boxShadow: BoxShadow( +//// color: Colors.pink, +//// blurRadius: 2.0, +//// spreadRadius: 1.0, +//// offset: Offset.zero, +//// ), //// borderSide: BorderSide(color: Colors.pink, width: 1.0, style: BorderStyle.solid), //// borderShape: RoundedRectangleBorder(side: BorderSide(color: Colors.pink, width: 2.0, style: BorderStyle.solid), borderRadius: BorderRadius.zero), // ), @@ -1033,42 +1037,43 @@ class _MyHomePageState extends State length: 3, controller: tabController, tabs: [ - GFButton( - onPressed: null, - child: Text("share"), - icon: Icon(Icons.share), - buttonBoxShadow: true, + Tab( + icon: Icon(Icons.directions_bike), + child: Text( + "Tab1", + ), ), Tab( - icon: Icon(Icons.error), + icon: Icon(Icons.directions_bus), child: Text( - "Orders", + "Tab2", ), ), Tab( + icon: Icon(Icons.directions_railway), child: Text( - "Pastry", + "Tab3", ), ), ], - indicatorColor: Colors.teal, -// indicatorSize: TabBarIndicatorSize.label, - labelColor: Colors.lightGreen, - labelPadding: EdgeInsets.all(8.0), - tabBarColor: Colors.blueGrey, - unselectedLabelColor: Colors.black, - labelStyle: TextStyle( - fontWeight: FontWeight.w500, - fontSize: 13.0, - color: Colors.deepOrange, - fontFamily: 'OpenSansBold', - ), - unselectedLabelStyle: TextStyle( - fontWeight: FontWeight.w500, - fontSize: 13.0, - color: Colors.black, - fontFamily: 'OpenSansBold', - ), +// indicatorColor: Colors.teal, +//// indicatorSize: TabBarIndicatorSize.label, +// labelColor: Colors.lightGreen, +// labelPadding: EdgeInsets.all(8.0), +// tabBarColor: Colors.blueGrey, +// unselectedLabelColor: Colors.black, +// labelStyle: TextStyle( +// fontWeight: FontWeight.w500, +// fontSize: 13.0, +// color: Colors.deepOrange, +// fontFamily: 'OpenSansBold', +// ), +// unselectedLabelStyle: TextStyle( +// fontWeight: FontWeight.w500, +// fontSize: 13.0, +// color: Colors.black, +// fontFamily: 'OpenSansBold', +// ), ), ); } diff --git a/lib/components/list_tile/gf_list_tile.dart b/lib/components/list_tile/gf_list_tile.dart index 1d46fc40..aed55c41 100644 --- a/lib/components/list_tile/gf_list_tile.dart +++ b/lib/components/list_tile/gf_list_tile.dart @@ -88,10 +88,6 @@ class GFListTile extends StatelessWidget { @override Widget build(BuildContext context) { - final double height = this.dividerHeight ?? 16.0; - final double thickness = this.dividerThickness ?? 0.0; - final double indent = this.dividerIndent ?? 0.0; - final double endIndent = this.dividerEndIndent ?? 0.0; return Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -111,24 +107,16 @@ class GFListTile extends StatelessWidget { ], ) : Container(), - trailing: icon != null - ? Column( - children: [ - Padding( - padding: EdgeInsets.only(top: 16.0), child: icon) - ], - ) - : Container()), + trailing: Padding(padding: EdgeInsets.only(top: 16.0), child: icon), + ), ), - showDivider - ? Divider( - height: height ?? dividerHeight, - thickness: thickness ?? dividerThickness, - color: dividerColor ?? Theme.of(context).dividerColor, - indent: indent ?? dividerIndent, - endIndent: endIndent ?? dividerEndIndent, - ) - : Container() + showDivider == true ? Divider( + height: dividerHeight == null ? 16.0 : dividerHeight, + thickness: dividerThickness == null ? 1.0 : dividerThickness, + color: dividerColor == null ? Theme.of(context).dividerColor : dividerColor, + indent: dividerIndent == null ? 0.0 : dividerIndent, + endIndent: dividerEndIndent == null ? 0.0 : dividerEndIndent, + ) : Container(height: 10.0,) ], ); } diff --git a/lib/components/tabs/gf_segment_tabs.dart b/lib/components/tabs/gf_segment_tabs.dart index 1f6119d8..ff358a73 100644 --- a/lib/components/tabs/gf_segment_tabs.dart +++ b/lib/components/tabs/gf_segment_tabs.dart @@ -149,9 +149,19 @@ class GFSegmentTabs extends StatefulWidget { /// and the length of the [TabBarView.children] list. final List tabs; + /// defines outer border of the tabs final Border border; + + /// defines outer border, border radius final BorderRadius borderRadius; + + /// This widget's selection and animation state. + /// + /// If [TabController] is not provided, then the value of [DefaultTabController.of] + /// will be used. final TabController tabController; + + /// defines width of the tab row final double width; @override diff --git a/lib/components/tabs/gf_tabBar.dart b/lib/components/tabs/gf_tabBar.dart index f8a16835..f7355e3d 100644 --- a/lib/components/tabs/gf_tabBar.dart +++ b/lib/components/tabs/gf_tabBar.dart @@ -32,7 +32,6 @@ class GFTabBar extends StatefulWidget { this.labelPadding, this.unselectedLabelColor, this.unselectedLabelStyle, - this.tabBarView, this.tabs, this.controller, }) : assert(length != null && length >= 0), @@ -146,10 +145,6 @@ class GFTabBar extends StatefulWidget { /// body2 definition is used. final TextStyle unselectedLabelStyle; - /// One widget per tab. - /// Its length must match the length of the [GFTabBar.tabs] - /// list, as well as the [controller]'s [GFTabBar.length]. - final GFTabBarView tabBarView; /// Typically a list of two or more [Tab] widgets. /// @@ -157,6 +152,10 @@ class GFTabBar extends StatefulWidget { /// and the length of the [TabBarView.children] list. final List tabs; + /// This widget's selection and animation state. + /// + /// If [TabController] is not provided, then the value of [DefaultTabController.of] + /// will be used. final TabController controller; @override diff --git a/lib/components/tabs/gf_tabs.dart b/lib/components/tabs/gf_tabs.dart index a480db2e..0bcf3311 100644 --- a/lib/components/tabs/gf_tabs.dart +++ b/lib/components/tabs/gf_tabs.dart @@ -163,8 +163,13 @@ class GFTabs extends StatefulWidget { /// and the length of the [TabBarView.children] list. final List tabs; + /// This widget's selection and animation state. + /// + /// If [TabController] is not provided, then the value of [DefaultTabController.of] + /// will be used. final TabController controller; + /// defines the tabBar height final double tabBarHeight; @override