Skip to content

Commit c2625fd

Browse files
SandipkakadiyaSandipkakadiya
authored
Merge pull request #49 from Sandipkakadiya/review
Review
2 parents e945576 + a39e992 commit c2625fd

File tree

9 files changed

+110
-76
lines changed

9 files changed

+110
-76
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
4+
## 1.0.0-dev.4 - 2020-01-16
5+
6+
### Fixed
7+
* ListTile re-implemeted.
8+
39
## 1.0.0-dev.3 - 2020-01-15
410

511
### Fixed

‎example/lib/main.dart‎

Lines changed: 86 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,6 @@ class _MyHomePageState extends State<MyHomePage>
173173
mainAxisAlignment: MainAxisAlignment.center,
174174
crossAxisAlignment: CrossAxisAlignment.center,
175175
children: <Widget>[
176-
177-
178176
GFCard(
179177
content: Column(
180178
children: <Widget>[
@@ -188,7 +186,7 @@ class _MyHomePageState extends State<MyHomePage>
188186
GFToast(
189187
text: 'Happy New Year',
190188
button: GFButton(
191-
onPressed: (){
189+
onPressed: () {
192190
print("dfr");
193191
},
194192
text: 'OK',
@@ -200,48 +198,50 @@ class _MyHomePageState extends State<MyHomePage>
200198
),
201199
),
202200

203-
GFCard(
204-
content: Column(
205-
children: <Widget>[
206-
GFTypography(
207-
text: 'Floating Toast',
208-
type: GFTypographyType.typo6,
209-
),
210-
GFFloatingWidget(
211-
verticalPosition: 80,
212-
child: showToast? GFToast(
213-
width: 300,
214-
text: 'Happy New Year',
215-
button: GFButton(
216-
onPressed: (){
217-
print("df");
218-
},
219-
text: 'OK',
220-
type: GFType.outline,
221-
color: GFColor.warning,
222-
),
223-
):Container(),
224-
body: Column(
225-
crossAxisAlignment: CrossAxisAlignment.center,
226-
children: <Widget>[
227-
Container(
228-
alignment: Alignment.center,
229-
child: GFButton(onPressed: (){
230-
setState(() {
231-
showToast = !showToast;
232-
});
233-
},
234-
text: 'Click to View the toast',
235-
type: GFType.outline,
236-
color: GFColor.warning,
237-
),
238-
)
239-
],
240-
)
241-
)
242-
],
201+
GFCard(
202+
content: Column(
203+
children: <Widget>[
204+
GFTypography(
205+
text: 'Floating Toast',
206+
type: GFTypographyType.typo6,
207+
),
208+
GFFloatingWidget(
209+
verticalPosition: 80,
210+
child: showToast
211+
? GFToast(
212+
width: 300,
213+
text: 'Happy New Year',
214+
button: GFButton(
215+
onPressed: () {
216+
print("df");
217+
},
218+
text: 'OK',
219+
type: GFType.outline,
220+
color: GFColor.warning,
221+
),
222+
)
223+
: Container(),
224+
body: Column(
225+
crossAxisAlignment: CrossAxisAlignment.center,
226+
children: <Widget>[
227+
Container(
228+
alignment: Alignment.center,
229+
child: GFButton(
230+
onPressed: () {
231+
setState(() {
232+
showToast = !showToast;
233+
});
234+
},
235+
text: 'Click to View the toast',
236+
type: GFType.outline,
237+
color: GFColor.warning,
238+
),
239+
)
240+
],
241+
))
242+
],
243+
),
243244
),
244-
),
245245

246246
// Container(
247247
// height: 130.0,
@@ -258,8 +258,6 @@ class _MyHomePageState extends State<MyHomePage>
258258
// ),
259259
//
260260

261-
262-
263261
// GFCard(
264262
// content: Column(
265263
// children: <Widget>[
@@ -337,20 +335,47 @@ class _MyHomePageState extends State<MyHomePage>
337335
// ),
338336
// ),
339337

340-
GFButtonBar(
341-
alignment: WrapAlignment.spaceEvenly,
342-
children: <Widget>[
343-
GFButton(onPressed: null, child: Text("dshsc"), icon: Icon(Icons.access_time),),
344-
GFButton(onPressed: null, child: Text("dszndc"),icon: Icon(Icons.warning),),
345-
GFButtonBadge(onPressed: null, text: "djvhcfdscc",icon: Icon(Icons.label),),
346-
GFButton(onPressed: null, child: Text("gcnjd"),),
347-
GFButton(onPressed: null, child: Text("dsqdsc"), icon: Icon(Icons.favorite),),
348-
GFButton(onPressed: null, child: Text("gcd"),),
349-
GFButton(onPressed: null, child: Text("dascdsc"),),
350-
GFButton(onPressed: null, child: Text("gtgcd"),),
351-
352-
],
353-
),
338+
GFButtonBar(
339+
alignment: WrapAlignment.spaceEvenly,
340+
children: <Widget>[
341+
GFButton(
342+
onPressed: null,
343+
child: Text("dshsc"),
344+
icon: Icon(Icons.access_time),
345+
),
346+
GFButton(
347+
onPressed: null,
348+
child: Text("dszndc"),
349+
icon: Icon(Icons.warning),
350+
),
351+
GFButtonBadge(
352+
onPressed: null,
353+
text: "djvhcfdscc",
354+
icon: Icon(Icons.label),
355+
),
356+
GFButton(
357+
onPressed: null,
358+
child: Text("gcnjd"),
359+
),
360+
GFButton(
361+
onPressed: null,
362+
child: Text("dsqdsc"),
363+
icon: Icon(Icons.favorite),
364+
),
365+
GFButton(
366+
onPressed: null,
367+
child: Text("gcd"),
368+
),
369+
GFButton(
370+
onPressed: null,
371+
child: Text("dascdsc"),
372+
),
373+
GFButton(
374+
onPressed: null,
375+
child: Text("gtgcd"),
376+
),
377+
],
378+
),
354379

355380
// GFCard(
356381
// content: Column(
@@ -581,7 +606,7 @@ class _MyHomePageState extends State<MyHomePage>
581606
//// textStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: 8.0),
582607
// ),
583608
text: 'goodies',
584-
onPressed: (){},
609+
onPressed: () {},
585610
// textColor: GFColor.danger,
586611
// icon: Icon(Icons.access_alarms),
587612
// hoverColor: GFColor.dark,
@@ -667,7 +692,6 @@ class _MyHomePageState extends State<MyHomePage>
667692
// ]
668693
// ),
669694

670-
671695
// GFItemsCarousel(
672696
// rowCount: 3,
673697
// children: imageList.map(

‎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.3"
83+
version: "1.0.0-dev.4"
8484
image:
8585
dependency: transitive
8686
description:

‎lib/components/appbar/gf_appbar.dart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ class GFAppBar extends StatefulWidget implements PreferredSizeWidget {
198198
assert(theme.platform != null);
199199
switch (theme.platform) {
200200
case TargetPlatform.android:
201+
case TargetPlatform.macOS:
201202
case TargetPlatform.fuchsia:
202203
return false;
203204
case TargetPlatform.iOS:
@@ -289,6 +290,7 @@ class _GFAppBarState extends State<GFAppBar> {
289290
bool namesRoute;
290291
switch (theme.platform) {
291292
case TargetPlatform.android:
293+
case TargetPlatform.macOS:
292294
case TargetPlatform.fuchsia:
293295
namesRoute = true;
294296
break;

‎lib/components/button/gf_button_bar.dart‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class GFButtonBar extends StatelessWidget {
2222

2323
/// The empty space that surrounds the buttonBar. Default's to padding.zero
2424
final EdgeInsetsGeometry padding;
25-
25+
2626
/// The direction to use as the main axis.
2727
///
2828
/// For example, if [direction] is [Axis.horizontal], the default, the
@@ -155,7 +155,6 @@ class GFButtonBar extends StatelessWidget {
155155
/// [verticalDirection] must not be null.
156156
final VerticalDirection verticalDirection;
157157

158-
159158
/// The buttons to arrange horizontally.
160159
/// Typically [RaisedButton] or [GFButton] or [GFIconButton] widgets.
161160
final List<Widget> children;
@@ -171,7 +170,7 @@ class GFButtonBar extends StatelessWidget {
171170
runAlignment: runAlignment,
172171
runSpacing: runSpacing,
173172
crossAxisAlignment: crossAxisAlignment,
174-
textDirection : textDirection,
173+
textDirection: textDirection,
175174
verticalDirection: verticalDirection,
176175
children: children.map<Widget>((Widget child) {
177176
return child;

‎lib/components/drawer/gf_drawer.dart‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ class GFDrawer extends StatelessWidget {
114114
label = semanticLabel;
115115
break;
116116
case TargetPlatform.android:
117+
case TargetPlatform.macOS:
117118
case TargetPlatform.fuchsia:
118119
label = semanticLabel ?? MaterialLocalizations.of(context)?.drawerLabel;
119120
}

‎lib/components/tabs/gf_tabBar.dart‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ class GFTabBar extends StatefulWidget {
162162
class _GFTabBarState extends State<GFTabBar> {
163163
@override
164164
Widget build(BuildContext context) {
165-
166165
return Container(
167166
height: widget.tabBarHeight == null
168167
? MediaQuery.of(context).size.height * 0.1

‎lib/components/toast/gf_floating_widget.dart‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,18 @@ class _GFFloatingWidgetState extends State<GFFloatingWidget> {
4040
child: widget.body ?? Container(),
4141
),
4242
Positioned(
43-
top: widget.verticalPosition != null
44-
? widget.verticalPosition
43+
top:
44+
widget.verticalPosition != null ? widget.verticalPosition : 0.0,
45+
left: widget.horizontalPosition != null
46+
? widget.horizontalPosition
47+
: 0.0,
48+
right: widget.horizontalPosition != null
49+
? widget.horizontalPosition
4550
: 0.0,
46-
left: widget.horizontalPosition != null ? widget.horizontalPosition : 0.0,
47-
right: widget.horizontalPosition != null ? widget.horizontalPosition : 0.0,
4851
child: Container(
49-
width: MediaQuery.of(context).size.width,
50-
child: widget.child ?? Container(),
51-
)),
52+
width: MediaQuery.of(context).size.width,
53+
child: widget.child ?? Container(),
54+
)),
5255
],
5356
);
5457
}

‎pubspec.yaml‎

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

77
environment:
8-
# sdk: ">=2.1.0 <3.0.0"
8+
# sdk: ">=2.1.0 <3.0.0"
99
sdk: ">=2.2.2 <3.0.0"
1010

1111
dependencies:

0 commit comments

Comments
 (0)