Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.
73 changes: 37 additions & 36 deletions example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -553,41 +553,45 @@ class _MyHomePageState extends State<MyHomePage>
// ),

GFSegmentTabs(
tabController: tabController,
height: 36.0,
tabController: tabController,
height: 36.0,
// width: 180.0,
initialIndex: 0,
length: 3,
tabs: <Widget>[
Text(
"Gelatin",
),
Tab(
child: Text(
"Donuts",
initialIndex: 0,
length: 3,
tabs: <Widget>[
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,
Expand All @@ -596,9 +600,7 @@ class _MyHomePageState extends State<MyHomePage>
Container(color: Colors.red),
Container(color: Colors.green),
Container(color: Colors.blue)
]
),

]),

// GFItemsCarousel(
// rowCount: 3,
Expand Down Expand Up @@ -647,7 +649,6 @@ class _MyHomePageState extends State<MyHomePage>
// },
// ),


// GFTabs(
//// height: 100.0,
//// tabBarHeight: 52.0,
Expand Down Expand Up @@ -929,7 +930,7 @@ class _MyHomePageState extends State<MyHomePage>
//// border: Border.all(color: Colors.pink, width: 2.0),
// ),
// GFAvatar(
// radius: 20.0,
// radius: 20.0,
// maxRadius: 50,

// child: Text("de"),
Expand Down
2 changes: 1 addition & 1 deletion example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion example/test/widget_test.dart
Original file line number Diff line number Diff line change
@@ -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');
});
Expand Down
45 changes: 25 additions & 20 deletions lib/components/list_tile/gf_list_tile.dart
Original file line number Diff line number Diff line change
Expand Up @@ -88,35 +88,40 @@ class GFListTile extends StatelessWidget {

@override
Widget build(BuildContext context) {

return Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Container(
margin: padding,
color: color,
child: ListTile(
leading: avatar,
title: title,
subtitle: subTitle != null || description != null
? Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
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: <Widget>[
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,
)
],
);
}
Expand Down
2 changes: 0 additions & 2 deletions lib/components/tabs/gf_tabBar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -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.
///
Expand Down Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
homepage: https://github.com/ionicfirebaseapp/getflutter

Expand Down