Skip to content

Review #25

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 10 commits into from
Jan 3, 2020
Merged

Review #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e677547
Merge pull request #2 from ionicfirebaseapp/master
Sandipkakadiya Jan 3, 2020
971da99
Merged
Jan 3, 2020
42df9ce
Avatar component reviewed
Jan 3, 2020
cb560bf
Badge component reviewed
Jan 3, 2020
db2d320
Button Badge component reviewed
Jan 3, 2020
abf5139
Icon Badge component reviewed
Jan 3, 2020
2568877
Button component reviewed
Jan 3, 2020
2d49274
Icon Button component reviewed
Jan 3, 2020
b1cd5c9
Merge pull request #3 from ionicfirebaseapp/master
Sandipkakadiya Jan 3, 2020
73e7cac
reviewed demo app
Jan 3, 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
473 changes: 201 additions & 272 deletions demo_app/lib/screens/badges.dart
View file
Open in desktop

Large diffs are not rendered by default.

134 changes: 61 additions & 73 deletions demo_app/lib/screens/headers.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,99 +5,88 @@ import 'package:ui_kit/components/card/gf_card.dart';
import 'package:ui_kit/components/header/gf_header.dart';
import 'package:ui_kit/types/gf_heading_type.dart';

import 'package:ui_kit/components/button/gf_button.dart';
import 'package:ui_kit/components/header/gf_header.dart';
import 'package:ui_kit/components/tabs/gf_tabs.dart';
import 'package:ui_kit/components/toast/gf_floating_widget.dart';
import 'package:ui_kit/components/toast/gf_toast.dart';
import 'package:ui_kit/types/gf_heading_type.dart';
import 'package:ui_kit/types/gf_type.dart';


class Headers extends StatefulWidget {
@override
_HeadersState createState() => _HeadersState();
}

class _HeadersState extends State<Headers> {

bool showToast = false;
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
backgroundColor: getGFColor(GFColor.dark),
title: Text('Headers', style: TextStyle(fontSize: 14),),
title: Text(
'Headers',
style: TextStyle(fontSize: 14),
),
),
body: Container(
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[

GFCard(
content: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[

GFHeader(
text: 'GF Header Typo1',
type: GFHeadingType.typo1,

backgroundImage: NetworkImage('https://cdn.pixabay.com/photo/2019/12/25/16/49/happy-new-year-4718894_960_720.png'),
),
SizedBox(
height: 40,
),
GFHeader(
icon: GFAvatar(

),
text: 'GF Header Typo2',
type: GFHeadingType.typo2,
dividerColor: GFColor.primary,
dividerAlignment: Alignment.center,
),
SizedBox(
height: 40,
),
GFHeader(
icon: Icon(Icons.insert_emoticon),
text: 'GF Header Typo3',
type: GFHeadingType.typo3,
dividerWidth: 150,
dividerColor: GFColor.warning,
dividerBorderRadius: BorderRadius.all(Radius.circular(0)),
),
SizedBox(
height: 40,
),
GFHeader(
content: Column(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
GFHeader(
text: 'GF Header Typo1',
type: GFHeadingType.typo1,
backgroundImage: NetworkImage(
'https://cdn.pixabay.com/photo/2019/12/25/16/49/happy-new-year-4718894_960_720.png'),
),
SizedBox(
height: 40,
),
GFHeader(
icon: GFAvatar(),
text: 'GF Header Typo2',
type: GFHeadingType.typo2,
dividerColor: GFColor.primary,
dividerAlignment: Alignment.center,
),
SizedBox(
height: 40,
),
GFHeader(
icon: Icon(Icons.insert_emoticon),
text: 'GF Header Typo3',
type: GFHeadingType.typo3,
dividerWidth: 150,
dividerColor: GFColor.warning,
dividerBorderRadius: BorderRadius.all(Radius.circular(0)),
),
SizedBox(
height: 40,
),
GFHeader(
text: 'GF Header Typo4',
type: GFHeadingType.typo4,
dividerWidth: 345,
icon: Image.network('https://cdn.pixabay.com/photo/2016/12/15/03/27/cocoa-1908020_960_720.jpg', width: 50, )
),
SizedBox(
height: 40,
),
GFHeader(
text: 'GF Header Typo5',
type: GFHeadingType.typo5,
dividerColor: GFColor.alt,
),
SizedBox(
height: 40,
),
GFHeader(
text: 'GF Header Typo6',
type: GFHeadingType.typo6,
dividerWidth: 20,
),
],
)
),

icon: Image.network(
'https://cdn.pixabay.com/photo/2016/12/15/03/27/cocoa-1908020_960_720.jpg',
width: 50,
)),
SizedBox(
height: 40,
),
GFHeader(
text: 'GF Header Typo5',
type: GFHeadingType.typo5,
dividerColor: GFColor.alt,
),
SizedBox(
height: 40,
),
GFHeader(
text: 'GF Header Typo6',
type: GFHeadingType.typo6,
dividerWidth: 20,
),
],
)),
],
),
),
Expand Down Expand Up @@ -199,7 +188,6 @@ class _HeadersState extends State<Headers> {
// )
// ],
// ),

);
}
}
98 changes: 43 additions & 55 deletions demo_app/lib/screens/icon-button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@ import 'package:ui_kit/components/card/gf_card.dart';
import 'package:ui_kit/components/header/gf_header.dart';
import 'package:ui_kit/types/gf_heading_type.dart';
import 'package:ui_kit/types/gf_type.dart';
import 'package:ui_kit/shape/gf_button_shape.dart';
import 'package:ui_kit/size/gf_size.dart';


class IconButtons extends StatefulWidget {
@override
_IconButtonsState createState() => _IconButtonsState();
Expand All @@ -20,32 +18,35 @@ class _IconButtonsState extends State<IconButtons> {
return Scaffold(
appBar: AppBar(
backgroundColor: getGFColor(GFColor.dark),
title: Text('Icon Button', style: TextStyle(fontSize: 14),),
title: Text(
'Icon Button',
style: TextStyle(fontSize: 14),
),
),
body: ListView(
children: <Widget>[
GFCard(
content: Column(
children: <Widget>[
GFHeader(
text: 'Solid Icon Button',
type: GFHeadingType.typo6,
),
SizedBox(
height: 15.0,
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
GFCard(
content: Column(
children: <Widget>[
GFIconButton(
onPressed: null,
icon: Icon(Icons.ac_unit),
GFHeader(
text: 'Solid Icon Button',
type: GFHeadingType.typo6,
),
SizedBox(
height: 15.0,
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
GFIconButton(
onPressed: null,
icon: Icon(Icons.ac_unit),
// iconSize: 12.0,

type: GFType.solid,
size: GFSize.large,
buttonBoxShadow: true,
color: GFColor.primary,
type: GFType.solid,
size: GFSize.large,
buttonBoxShadow: true,
color: GFColor.primary,
// boxShadow: BoxShadow(
// color: Colors.pink,
// blurRadius: 2.0,
Expand All @@ -54,16 +55,16 @@ class _IconButtonsState extends State<IconButtons> {
// ),
// borderSide: BorderSide(color: Colors.pink, width: 1.0, style: BorderStyle.solid),
// borderShape: RoundedRectangleBorder(side: BorderSide(color: Colors.pink, width: 2.0, style: BorderStyle.solid), borderRadius: BorderRadius.zero),
),
GFIconButton(
onPressed: null,
icon: Icon(Icons.ac_unit),
),
GFIconButton(
onPressed: null,
icon: Icon(Icons.ac_unit),
// iconSize: 12.0,

type: GFType.solid,
size: GFSize.medium,
type: GFType.solid,
size: GFSize.medium,

color: GFColor.warning,
color: GFColor.warning,
// boxShadow: BoxShadow(
// color: Colors.pink,
// blurRadius: 2.0,
Expand All @@ -72,16 +73,16 @@ class _IconButtonsState extends State<IconButtons> {
// ),
// borderSide: BorderSide(color: Colors.pink, width: 1.0, style: BorderStyle.solid),
// borderShape: RoundedRectangleBorder(side: BorderSide(color: Colors.pink, width: 2.0, style: BorderStyle.solid), borderRadius: BorderRadius.zero),
),
GFIconButton(
onPressed: null,
icon: Icon(Icons.ac_unit),
),
GFIconButton(
onPressed: null,
icon: Icon(Icons.ac_unit),
// iconSize: 12.0,

type: GFType.solid,
size: GFSize.small,
buttonBoxShadow: true,
color: GFColor.success,
type: GFType.solid,
size: GFSize.small,
buttonBoxShadow: true,
color: GFColor.success,
// boxShadow: BoxShadow(
// color: Colors.pink,
// blurRadius: 2.0,
Expand All @@ -90,22 +91,19 @@ class _IconButtonsState extends State<IconButtons> {
// ),
// borderSide: BorderSide(color: Colors.pink, width: 1.0, style: BorderStyle.solid),
// borderShape: RoundedRectangleBorder(side: BorderSide(color: Colors.pink, width: 2.0, style: BorderStyle.solid), borderRadius: BorderRadius.zero),
),

),
],
)
],
)
],
),
),
),

GFCard(
content: Column(
children: <Widget>[
GFHeader(
text: 'Outline Icon Button',
type: GFHeadingType.typo6,
),

SizedBox(
height: 15.0,
),
Expand All @@ -120,7 +118,6 @@ class _IconButtonsState extends State<IconButtons> {
type: GFType.outline,
size: GFSize.large,


// boxShadow: BoxShadow(
// color: Colors.pink,
// blurRadius: 2.0,
Expand All @@ -135,9 +132,8 @@ class _IconButtonsState extends State<IconButtons> {
icon: Icon(Icons.ac_unit),
// iconSize: 12.0,


size: GFSize.medium,
type: GFType.outline,
type: GFType.outline,
// boxShadow: BoxShadow(
// color: Colors.pink,
// blurRadius: 2.0,
Expand All @@ -155,7 +151,6 @@ type: GFType.outline,
type: GFType.outline,
size: GFSize.small,


// boxShadow: BoxShadow(
// color: Colors.pink,
// blurRadius: 2.0,
Expand All @@ -165,14 +160,11 @@ type: GFType.outline,
// borderSide: BorderSide(color: Colors.pink, width: 1.0, style: BorderStyle.solid),
// borderShape: RoundedRectangleBorder(side: BorderSide(color: Colors.pink, width: 2.0, style: BorderStyle.solid), borderRadius: BorderRadius.zero),
),

],
)
],
),
),


GFCard(
content: Column(
children: <Widget>[
Expand All @@ -194,7 +186,6 @@ type: GFType.outline,
type: GFType.transparent,
size: GFSize.large,


// boxShadow: BoxShadow(
// color: Colors.pink,
// blurRadius: 2.0,
Expand All @@ -209,7 +200,6 @@ type: GFType.outline,
icon: Icon(Icons.ac_unit),
// iconSize: 12.0,


size: GFSize.medium,
type: GFType.transparent,
// boxShadow: BoxShadow(
Expand All @@ -229,7 +219,6 @@ type: GFType.outline,
type: GFType.transparent,
size: GFSize.small,


// boxShadow: BoxShadow(
// color: Colors.pink,
// blurRadius: 2.0,
Expand All @@ -239,7 +228,6 @@ type: GFType.outline,
// borderSide: BorderSide(color: Colors.pink, width: 1.0, style: BorderStyle.solid),
// borderShape: RoundedRectangleBorder(side: BorderSide(color: Colors.pink, width: 2.0, style: BorderStyle.solid), borderRadius: BorderRadius.zero),
),

],
)
],
Expand Down
Loading