Skip to content

Commit 9178016

Browse files
Merge pull request #46 from Sandipkakadiya/review
Review
2 parents a456c55 + be04ede commit 9178016

File tree

7 files changed

+75
-65
lines changed

7 files changed

+75
-65
lines changed

CHANGELOG.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
# Changelog
22

3+
## 1.0.0-dev.3 - 2020-01-15
34

4-
## 1.0.0-dev.1 - 2014-01-14
5+
### Fixed
6+
* ListTile issue.
7+
8+
9+
## 1.0.0-dev.1 - 2020-01-14
510

611
### Fixed
712
* Warnings and Hints
813

914

10-
## 0.0.1-pre.3 - 2014-01-14
15+
## 0.0.1-pre.3 - 2020-01-14
1116

1217
### Fixed
1318
* Warnings and Hints
@@ -16,13 +21,13 @@
1621
* Changelog and Description
1722

1823

19-
## 0.0.1-pre.2 - 2014-01-14
24+
## 0.0.1-pre.2 - 2020-01-14
2025

2126
### Fixed
2227
* Warnings and Hints
2328

2429

25-
## 0.0.1-pre.1 - 2014-01-13
30+
## 0.0.1-pre.1 - 2020-01-13
2631

2732
### Added
2833
* initial release with buttons, badge, card, list tile, avatar and many more components.

example/lib/main.dart

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -553,41 +553,45 @@ class _MyHomePageState extends State<MyHomePage>
553553
// ),
554554

555555
GFSegmentTabs(
556-
tabController: tabController,
557-
height: 36.0,
556+
tabController: tabController,
557+
height: 36.0,
558558
// width: 180.0,
559-
initialIndex: 0,
560-
length: 3,
561-
tabs: <Widget>[
562-
Text(
563-
"Gelatin",
564-
),
565-
Tab(
566-
child: Text(
567-
"Donuts",
559+
initialIndex: 0,
560+
length: 3,
561+
tabs: <Widget>[
562+
Text(
563+
"Gelatin",
568564
),
569-
),
570-
Tab(
571-
child: Text(
572-
"Pastry",
565+
Tab(
566+
child: Text(
567+
"Donuts",
568+
),
569+
),
570+
Tab(
571+
child: Text(
572+
"Pastry",
573+
),
574+
),
575+
],
576+
tabBarColor: Colors.grey,
577+
indicatorSize: TabBarIndicatorSize.tab,
578+
indicatorColor: Colors.greenAccent,
579+
labelColor: Colors.greenAccent,
580+
unselectedLabelColor: Colors.white,
581+
indicator: BoxDecoration(
582+
color: Colors.black,
583+
border: Border(
584+
bottom: BorderSide(
585+
color: Colors.greenAccent,
586+
width: 2.0,
587+
),
573588
),
574-
),
575-
],
576-
tabBarColor: Colors.grey,
577-
indicatorSize: TabBarIndicatorSize.tab,
578-
indicatorColor: Colors.greenAccent,
579-
labelColor: Colors.greenAccent,
580-
unselectedLabelColor: Colors.white,
581-
indicator: BoxDecoration(
582-
color: Colors.black,
583-
border: Border(bottom: BorderSide(color: Colors.greenAccent, width: 2.0,),),
584589
// borderRadius: BorderRadius.circular(2.0)
585-
),
586-
indicatorPadding: EdgeInsets.all(8.0),
587-
indicatorWeight: 2.0,
588-
border: Border.all(color: Colors.white, width: 2.0),
589-
borderRadius: BorderRadius.circular(2.0)
590-
),
590+
),
591+
indicatorPadding: EdgeInsets.all(8.0),
592+
indicatorWeight: 2.0,
593+
border: Border.all(color: Colors.white, width: 2.0),
594+
borderRadius: BorderRadius.circular(2.0)),
591595

592596
GFTabBarView(
593597
controller: tabController,
@@ -596,9 +600,7 @@ class _MyHomePageState extends State<MyHomePage>
596600
Container(color: Colors.red),
597601
Container(color: Colors.green),
598602
Container(color: Colors.blue)
599-
]
600-
),
601-
603+
]),
602604

603605
// GFItemsCarousel(
604606
// rowCount: 3,
@@ -647,7 +649,6 @@ class _MyHomePageState extends State<MyHomePage>
647649
// },
648650
// ),
649651

650-
651652
// GFTabs(
652653
//// height: 100.0,
653654
//// tabBarHeight: 52.0,
@@ -929,7 +930,7 @@ class _MyHomePageState extends State<MyHomePage>
929930
//// border: Border.all(color: Colors.pink, width: 2.0),
930931
// ),
931932
// GFAvatar(
932-
// radius: 20.0,
933+
// radius: 20.0,
933934
// maxRadius: 50,
934935

935936
// child: Text("de"),

example/pubspec.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ packages:
8080
path: ".."
8181
relative: true
8282
source: path
83-
version: "1.0.0-dev.1"
83+
version: "1.0.0-dev.3"
8484
image:
8585
dependency: transitive
8686
description:

example/test/widget_test.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
import 'package:flutter_test/flutter_test.dart';
12

2-
import 'package:flutter_test/flutter_test.dart';void main() {
3+
void main() {
34
testWidgets('Basic test', (WidgetTester tester) async {
45
prints('Test paassed');
56
});

lib/components/list_tile/gf_list_tile.dart

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -88,35 +88,40 @@ class GFListTile extends StatelessWidget {
8888

8989
@override
9090
Widget build(BuildContext context) {
91-
9291
return Column(
9392
crossAxisAlignment: CrossAxisAlignment.start,
9493
children: <Widget>[
9594
Container(
9695
margin: padding,
9796
color: color,
9897
child: ListTile(
99-
leading: avatar,
100-
title: title,
101-
subtitle: subTitle != null || description != null
102-
? Column(
103-
crossAxisAlignment: CrossAxisAlignment.start,
104-
children: <Widget>[
105-
subTitle ?? Container(),
106-
description ?? Container()
107-
],
108-
)
109-
: Container(),
110-
trailing: Padding(padding: EdgeInsets.only(top: 16.0), child: icon),
98+
leading: avatar,
99+
title: title,
100+
subtitle: subTitle != null || description != null
101+
? Column(
102+
crossAxisAlignment: CrossAxisAlignment.start,
103+
children: <Widget>[
104+
subTitle ?? Container(),
105+
description ?? Container()
106+
],
107+
)
108+
: Container(),
109+
trailing: Padding(padding: EdgeInsets.only(top: 16.0), child: icon),
111110
),
112111
),
113-
showDivider == true ? Divider(
114-
height: dividerHeight == null ? 16.0 : dividerHeight,
115-
thickness: dividerThickness == null ? 1.0 : dividerThickness,
116-
color: dividerColor == null ? Theme.of(context).dividerColor : dividerColor,
117-
indent: dividerIndent == null ? 0.0 : dividerIndent,
118-
endIndent: dividerEndIndent == null ? 0.0 : dividerEndIndent,
119-
) : Container(height: 10.0,)
112+
showDivider == true
113+
? Divider(
114+
height: dividerHeight == null ? 16.0 : dividerHeight,
115+
thickness: dividerThickness == null ? 1.0 : dividerThickness,
116+
color: dividerColor == null
117+
? Theme.of(context).dividerColor
118+
: dividerColor,
119+
indent: dividerIndent == null ? 0.0 : dividerIndent,
120+
endIndent: dividerEndIndent == null ? 0.0 : dividerEndIndent,
121+
)
122+
: Container(
123+
height: 10.0,
124+
)
120125
],
121126
);
122127
}

lib/components/tabs/gf_tabBar.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import 'package:flutter/foundation.dart';
33
import 'package:flutter/rendering.dart';
44
import 'package:flutter/widgets.dart';
55
import 'package:getflutter/colors/gf_color.dart';
6-
import 'package:getflutter/components/tabs/gf_tabBarView.dart';
76

87
/// A material design widget that displays a horizontal row of tabs.
98
///
@@ -144,7 +143,6 @@ class GFTabBar extends StatefulWidget {
144143
/// body2 definition is used.
145144
final TextStyle unselectedLabelStyle;
146145

147-
148146
/// Typically a list of two or more [Tab] widgets.
149147
///
150148
/// The length of this list must match the [controller]'s [TabController.length]

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: getflutter
22
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.
3-
version: 1.0.0-dev.1
3+
version: 1.0.0-dev.3
44
#author: GetFlutter <[email protected]>
55
homepage: https://github.com/ionicfirebaseapp/getflutter
66

0 commit comments

Comments
 (0)