diff --git a/CHANGELOG.md b/CHANGELOG.md index feae506f..d9b8506a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,18 @@ # Changelog +## 1.0.0-dev.3 - 2020-01-15 -## 1.0.0-dev.1 - 2014-01-14 +### Fixed +* ListTile issue. + + +## 1.0.0-dev.1 - 2020-01-14 ### Fixed * Warnings and Hints -## 0.0.1-pre.3 - 2014-01-14 +## 0.0.1-pre.3 - 2020-01-14 ### Fixed * Warnings and Hints @@ -16,13 +21,13 @@ * Changelog and Description -## 0.0.1-pre.2 - 2014-01-14 +## 0.0.1-pre.2 - 2020-01-14 ### Fixed * Warnings and Hints -## 0.0.1-pre.1 - 2014-01-13 +## 0.0.1-pre.1 - 2020-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/example/lib/main.dart b/example/lib/main.dart index c3c052cf..5234dea5 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -553,41 +553,45 @@ class _MyHomePageState extends State // ), GFSegmentTabs( - tabController: tabController, - height: 36.0, + tabController: tabController, + height: 36.0, // width: 180.0, - initialIndex: 0, - length: 3, - tabs: [ - Text( - "Gelatin", - ), - Tab( - child: Text( - "Donuts", + initialIndex: 0, + length: 3, + tabs: [ + Text( + "Gelatin", ), - ), - Tab( - child: Text( - "Pastry", + 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, + ), ), - ), - ], - 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), - borderRadius: BorderRadius.circular(2.0) - ), + ), + indicatorPadding: EdgeInsets.all(8.0), + indicatorWeight: 2.0, + border: Border.all(color: Colors.white, width: 2.0), + borderRadius: BorderRadius.circular(2.0)), GFTabBarView( controller: tabController, @@ -596,9 +600,7 @@ class _MyHomePageState extends State Container(color: Colors.red), Container(color: Colors.green), Container(color: Colors.blue) - ] - ), - + ]), // GFItemsCarousel( // rowCount: 3, @@ -647,7 +649,6 @@ class _MyHomePageState extends State // }, // ), - // GFTabs( //// height: 100.0, //// tabBarHeight: 52.0, @@ -929,7 +930,7 @@ class _MyHomePageState extends State //// border: Border.all(color: Colors.pink, width: 2.0), // ), // GFAvatar( - // radius: 20.0, + // radius: 20.0, // maxRadius: 50, // child: Text("de"), diff --git a/example/pubspec.lock b/example/pubspec.lock index 2b3be177..ab9c5288 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -80,7 +80,7 @@ packages: path: ".." relative: true source: path - version: "1.0.0-dev.1" + version: "1.0.0-dev.3" image: dependency: transitive description: diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart index 1ceafff3..9a32546b 100644 --- a/example/test/widget_test.dart +++ b/example/test/widget_test.dart @@ -1,5 +1,6 @@ +import 'package:flutter_test/flutter_test.dart'; -import 'package:flutter_test/flutter_test.dart';void main() { +void main() { testWidgets('Basic test', (WidgetTester tester) async { prints('Test paassed'); }); diff --git a/lib/components/list_tile/gf_list_tile.dart b/lib/components/list_tile/gf_list_tile.dart index aed55c41..b6b47e2b 100644 --- a/lib/components/list_tile/gf_list_tile.dart +++ b/lib/components/list_tile/gf_list_tile.dart @@ -88,7 +88,6 @@ class GFListTile extends StatelessWidget { @override Widget build(BuildContext context) { - return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -96,27 +95,33 @@ 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: Padding(padding: EdgeInsets.only(top: 16.0), child: icon), + leading: avatar, + title: title, + subtitle: subTitle != null || description != null + ? Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + subTitle ?? Container(), + description ?? Container() + ], + ) + : Container(), + trailing: Padding(padding: EdgeInsets.only(top: 16.0), child: icon), ), ), - 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,) + 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_tabBar.dart b/lib/components/tabs/gf_tabBar.dart index a38ba54a..bf9cda40 100644 --- a/lib/components/tabs/gf_tabBar.dart +++ b/lib/components/tabs/gf_tabBar.dart @@ -3,7 +3,6 @@ import 'package:flutter/foundation.dart'; 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'; /// A material design widget that displays a horizontal row of tabs. /// @@ -144,7 +143,6 @@ class GFTabBar extends StatefulWidget { /// body2 definition is used. final TextStyle unselectedLabelStyle; - /// Typically a list of two or more [Tab] widgets. /// /// The length of this list must match the [controller]'s [TabController.length] diff --git a/pubspec.yaml b/pubspec.yaml index 8a81f5ad..9e414623 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. It makes development faster & more enjoyable. You can customize the component as per your need. -version: 1.0.0-dev.1 +version: 1.0.0-dev.3 #author: GetFlutter homepage: https://github.com/ionicfirebaseapp/getflutter