Skip to content

Review #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sandipkakadiya merged 2 commits into from
Jan 16, 2020
Merged

Review #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b6b3e7
Merge pull request #7 from ionicfirebaseapp/master
Sandipkakadiya Jan 16, 2020
a39e992
new version published
Jan 16, 2020
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog


## 1.0.0-dev.4 - 2020-01-16

### Fixed
* ListTile re-implemeted.

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

### Fixed
Expand Down
148 changes: 86 additions & 62 deletions example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,6 @@ class _MyHomePageState extends State<MyHomePage>
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[


GFCard(
content: Column(
children: <Widget>[
Expand All @@ -188,7 +186,7 @@ class _MyHomePageState extends State<MyHomePage>
GFToast(
text: 'Happy New Year',
button: GFButton(
onPressed: (){
onPressed: () {
print("dfr");
},
text: 'OK',
Expand All @@ -200,48 +198,50 @@ class _MyHomePageState extends State<MyHomePage>
),
),

GFCard(
content: Column(
children: <Widget>[
GFTypography(
text: 'Floating Toast',
type: GFTypographyType.typo6,
),
GFFloatingWidget(
verticalPosition: 80,
child: showToast? GFToast(
width: 300,
text: 'Happy New Year',
button: GFButton(
onPressed: (){
print("df");
},
text: 'OK',
type: GFType.outline,
color: GFColor.warning,
),
):Container(),
body: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Container(
alignment: Alignment.center,
child: GFButton(onPressed: (){
setState(() {
showToast = !showToast;
});
},
text: 'Click to View the toast',
type: GFType.outline,
color: GFColor.warning,
),
)
],
)
)
],
GFCard(
content: Column(
children: <Widget>[
GFTypography(
text: 'Floating Toast',
type: GFTypographyType.typo6,
),
GFFloatingWidget(
verticalPosition: 80,
child: showToast
? GFToast(
width: 300,
text: 'Happy New Year',
button: GFButton(
onPressed: () {
print("df");
},
text: 'OK',
type: GFType.outline,
color: GFColor.warning,
),
)
: Container(),
body: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
Container(
alignment: Alignment.center,
child: GFButton(
onPressed: () {
setState(() {
showToast = !showToast;
});
},
text: 'Click to View the toast',
type: GFType.outline,
color: GFColor.warning,
),
)
],
))
],
),
),
),

// Container(
// height: 130.0,
Expand All @@ -258,8 +258,6 @@ class _MyHomePageState extends State<MyHomePage>
// ),
//



// GFCard(
// content: Column(
// children: <Widget>[
Expand Down Expand Up @@ -337,20 +335,47 @@ class _MyHomePageState extends State<MyHomePage>
// ),
// ),

GFButtonBar(
alignment: WrapAlignment.spaceEvenly,
children: <Widget>[
GFButton(onPressed: null, child: Text("dshsc"), icon: Icon(Icons.access_time),),
GFButton(onPressed: null, child: Text("dszndc"),icon: Icon(Icons.warning),),
GFButtonBadge(onPressed: null, text: "djvhcfdscc",icon: Icon(Icons.label),),
GFButton(onPressed: null, child: Text("gcnjd"),),
GFButton(onPressed: null, child: Text("dsqdsc"), icon: Icon(Icons.favorite),),
GFButton(onPressed: null, child: Text("gcd"),),
GFButton(onPressed: null, child: Text("dascdsc"),),
GFButton(onPressed: null, child: Text("gtgcd"),),

],
),
GFButtonBar(
alignment: WrapAlignment.spaceEvenly,
children: <Widget>[
GFButton(
onPressed: null,
child: Text("dshsc"),
icon: Icon(Icons.access_time),
),
GFButton(
onPressed: null,
child: Text("dszndc"),
icon: Icon(Icons.warning),
),
GFButtonBadge(
onPressed: null,
text: "djvhcfdscc",
icon: Icon(Icons.label),
),
GFButton(
onPressed: null,
child: Text("gcnjd"),
),
GFButton(
onPressed: null,
child: Text("dsqdsc"),
icon: Icon(Icons.favorite),
),
GFButton(
onPressed: null,
child: Text("gcd"),
),
GFButton(
onPressed: null,
child: Text("dascdsc"),
),
GFButton(
onPressed: null,
child: Text("gtgcd"),
),
],
),

// GFCard(
// content: Column(
Expand Down Expand Up @@ -581,7 +606,7 @@ class _MyHomePageState extends State<MyHomePage>
//// textStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: 8.0),
// ),
text: 'goodies',
onPressed: (){},
onPressed: () {},
// textColor: GFColor.danger,
// icon: Icon(Icons.access_alarms),
// hoverColor: GFColor.dark,
Expand Down Expand Up @@ -667,7 +692,6 @@ class _MyHomePageState extends State<MyHomePage>
// ]
// ),


// GFItemsCarousel(
// rowCount: 3,
// children: imageList.map(
Expand Down
2 changes: 1 addition & 1 deletion example/pubspec.lock
View file
Open in desktop
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.3"
version: "1.0.0-dev.4"
image:
dependency: transitive
description:
Expand Down
2 changes: 2 additions & 0 deletions lib/components/appbar/gf_appbar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ class GFAppBar extends StatefulWidget implements PreferredSizeWidget {
assert(theme.platform != null);
switch (theme.platform) {
case TargetPlatform.android:
case TargetPlatform.macOS:
case TargetPlatform.fuchsia:
return false;
case TargetPlatform.iOS:
Expand Down Expand Up @@ -289,6 +290,7 @@ class _GFAppBarState extends State<GFAppBar> {
bool namesRoute;
switch (theme.platform) {
case TargetPlatform.android:
case TargetPlatform.macOS:
case TargetPlatform.fuchsia:
namesRoute = true;
break;
Expand Down
5 changes: 2 additions & 3 deletions lib/components/button/gf_button_bar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class GFButtonBar extends StatelessWidget {

/// The empty space that surrounds the buttonBar. Default's to padding.zero
final EdgeInsetsGeometry padding;

/// The direction to use as the main axis.
///
/// For example, if [direction] is [Axis.horizontal], the default, the
Expand Down Expand Up @@ -155,7 +155,6 @@ class GFButtonBar extends StatelessWidget {
/// [verticalDirection] must not be null.
final VerticalDirection verticalDirection;


/// The buttons to arrange horizontally.
/// Typically [RaisedButton] or [GFButton] or [GFIconButton] widgets.
final List<Widget> children;
Expand All @@ -171,7 +170,7 @@ class GFButtonBar extends StatelessWidget {
runAlignment: runAlignment,
runSpacing: runSpacing,
crossAxisAlignment: crossAxisAlignment,
textDirection : textDirection,
textDirection: textDirection,
verticalDirection: verticalDirection,
children: children.map<Widget>((Widget child) {
return child;
Expand Down
1 change: 1 addition & 0 deletions lib/components/drawer/gf_drawer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ class GFDrawer extends StatelessWidget {
label = semanticLabel;
break;
case TargetPlatform.android:
case TargetPlatform.macOS:
case TargetPlatform.fuchsia:
label = semanticLabel ?? MaterialLocalizations.of(context)?.drawerLabel;
}
Expand Down
1 change: 0 additions & 1 deletion lib/components/tabs/gf_tabBar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@ class GFTabBar extends StatefulWidget {
class _GFTabBarState extends State<GFTabBar> {
@override
Widget build(BuildContext context) {

return Container(
height: widget.tabBarHeight == null
? MediaQuery.of(context).size.height * 0.1
Expand Down
17 changes: 10 additions & 7 deletions lib/components/toast/gf_floating_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,18 @@ class _GFFloatingWidgetState extends State<GFFloatingWidget> {
child: widget.body ?? Container(),
),
Positioned(
top: widget.verticalPosition != null
? widget.verticalPosition
top:
widget.verticalPosition != null ? widget.verticalPosition : 0.0,
left: widget.horizontalPosition != null
? widget.horizontalPosition
: 0.0,
right: widget.horizontalPosition != null
? widget.horizontalPosition
: 0.0,
left: widget.horizontalPosition != null ? widget.horizontalPosition : 0.0,
right: widget.horizontalPosition != null ? widget.horizontalPosition : 0.0,
child: Container(
width: MediaQuery.of(context).size.width,
child: widget.child ?? Container(),
)),
width: MediaQuery.of(context).size.width,
child: widget.child ?? Container(),
)),
],
);
}
Expand Down
4 changes: 2 additions & 2 deletions pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
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.3
version: 1.0.0-dev.4
#author: GetFlutter <[email protected]>
homepage: https://github.com/ionicfirebaseapp/getflutter

environment:
# sdk: ">=2.1.0 <3.0.0"
# sdk: ">=2.1.0 <3.0.0"
sdk: ">=2.2.2 <3.0.0"

dependencies:
Expand Down