Skip to content

Commit 44550ce

Browse files
authored
Merge pull request #23 from ionicfirebaseapp/master
master pull
2 parents 38f4fb2 + ecf8374 commit 44550ce

File tree

12 files changed

+92
-1167
lines changed

12 files changed

+92
-1167
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ getflutter-app-kit
3333
getflutter-web-kit
3434
getflutter_app
3535
test/.test_coverage.dart
36+
example
3637

3738
# Android related
3839
**/android/**/gradle-wrapper.jar

example/pubspec.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ dev_dependencies:
2121

2222
flutter:
2323
uses-material-design: true
24-
2524
assets:
2625
- lib/assets/github.svg
2726
- lib/assets/logo.svg

lib/components/alert/gf_alert.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class _GFAlertState extends State<GFAlert> with TickerProviderStateMixin {
9393
Container(
9494
width: widget.type == GFAlertType.fullWidth
9595
? MediaQuery.of(context).size.width
96-
: widget.width,
96+
: widget.width?? MediaQuery.of(context).size.width*0.885,
9797
constraints: const BoxConstraints(minHeight: 50),
9898
margin: widget.type == GFAlertType.fullWidth
9999
? const EdgeInsets.only(left: 0, right: 0)

lib/components/toast/gf_floating_widget.dart renamed to lib/components/floating_widget/gf_floating_widget.dart

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ class GFFloatingWidget extends StatefulWidget {
66
/// Inside floating widget [GFToast] can be used as body. See [GFToast]
77
const GFFloatingWidget(
88
{Key key,
9-
this.child,
10-
this.horizontalPosition,
11-
this.verticalPosition,
12-
this.blurnessColor,
13-
this.showblurness = false,
14-
this.body})
9+
this.child,
10+
this.horizontalPosition,
11+
this.verticalPosition,
12+
this.blurnessColor,
13+
this.showblurness = false,
14+
this.body})
1515
: super(key: key);
1616

1717
///child of type [Widget] which floats across the body based on horizontal and vertical position
@@ -39,16 +39,17 @@ class GFFloatingWidget extends StatefulWidget {
3939
class _GFFloatingWidgetState extends State<GFFloatingWidget> {
4040
@override
4141
Widget build(BuildContext context) => Stack(
42-
alignment: Alignment.center,
43-
fit: StackFit.loose,
44-
children: <Widget>[
45-
Container(
46-
height: MediaQuery.of(context).size.height,
47-
child: widget.body ?? Container(),
48-
),
49-
Positioned(
50-
child: Container(
42+
alignment: Alignment.center,
43+
fit: StackFit.loose,
44+
children: <Widget>[
45+
Container(
46+
height: MediaQuery.of(context).size.height,
47+
child: widget.body ?? Container(),
48+
),
49+
Positioned(
50+
child: Container(
5151
height: MediaQuery.of(context).size.height,
52+
width: MediaQuery.of(context).size.width,
5253
color: widget.showblurness
5354
? widget.blurnessColor ?? Colors.black54
5455
: null,
@@ -61,14 +62,11 @@ class _GFFloatingWidgetState extends State<GFFloatingWidget> {
6162
left: widget.horizontalPosition != null
6263
? widget.horizontalPosition
6364
: 0.0,
64-
right: widget.horizontalPosition != null
65-
? widget.horizontalPosition
66-
: 0.0,
6765
child: widget.child ?? Container(),
6866
)
6967
],
7068
),
7169
))
72-
],
73-
);
70+
],
71+
);
7472
}

lib/components/loader/gf_loader.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'package:flutter/cupertino.dart';
22
import 'package:flutter/material.dart';
3-
import 'package:getflutter/types/gf_loader_type.dart';
4-
import 'package:getflutter/size/gf_size.dart';
3+
import 'package:getflutter/getflutter.dart';
54

65
class GFLoader extends StatefulWidget {
76
const GFLoader(

lib/components/slidable/gf_fractionally_aligned_sized_box.dart

Lines changed: 0 additions & 106 deletions
This file was deleted.

0 commit comments

Comments
 (0)