Skip to content

icons changed in buttons , changed in cards #41

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
shravyackm merged 1 commit into from
Jan 13, 2020
Merged

icons changed in buttons , changed in cards #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion demo_app/lib/screens/avatar/avatars.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ class _AvatarState extends State<Avatar> {
onTap: () {
Navigator.pop(context);
},
child: Icon(CupertinoIcons.back, color: getGFColor(GFColor.success), ),),
child: Container(
child: Icon(CupertinoIcons.back, color: getGFColor(GFColor.success), ),
)),
title: Text(
'Avatar',
style: TextStyle(fontSize: 17),
Expand Down
23 changes: 6 additions & 17 deletions demo_app/lib/screens/button/button-types.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,6 @@ class _ButtonTypesState extends State<ButtonTypes> {

child: Icon(CupertinoIcons.back, color: getGFColor(GFColor.success), ),
)
// child: Container(
// height: 30,
// width: 30,
// constraints: BoxConstraints(minHeight: 20, minWidth: 30),
//// color: Colors.red,
// child: GFIconButton(
// size: GFSize.small,
// color: GFColor.dark,
// icon: SvgPicture.asset('lib/assets/icons/back-arrow.svg',),
// )
// )
),
title: Text('Buttons', style: TextStyle(fontSize: 17),),
centerTitle: true,
Expand Down Expand Up @@ -84,7 +73,7 @@ class _ButtonTypesState extends State<ButtonTypes> {
color: getGFColor(GFColor.dark),
showDivider: false,
title: Text('Standard Buttons', style: TextStyle(color: getGFColor(GFColor.white)),),
icon: SvgPicture.asset('lib/assets/icons/next.svg'),
icon: Icon(CupertinoIcons.forward, color: getGFColor(GFColor.success),)

),
)
Expand Down Expand Up @@ -116,7 +105,7 @@ class _ButtonTypesState extends State<ButtonTypes> {
color: getGFColor(GFColor.dark),
showDivider: false,
title: Text('Pills Buttons', style: TextStyle(color: getGFColor(GFColor.white)),),
icon: SvgPicture.asset('lib/assets/icons/next.svg')
icon: Icon(CupertinoIcons.forward, color: getGFColor(GFColor.success),)
),
)
),
Expand Down Expand Up @@ -148,7 +137,7 @@ class _ButtonTypesState extends State<ButtonTypes> {
color: getGFColor(GFColor.dark),
showDivider: false,
title: Text('Square Buttons', style: TextStyle(color: getGFColor(GFColor.white)),),
icon: SvgPicture.asset('lib/assets/icons/next.svg')
icon: Icon(CupertinoIcons.forward, color: getGFColor(GFColor.success),)
),
)
),
Expand Down Expand Up @@ -179,7 +168,7 @@ class _ButtonTypesState extends State<ButtonTypes> {
color: getGFColor(GFColor.dark),
showDivider: false,
title: Text('Shadow Buttons', style: TextStyle(color: getGFColor(GFColor.white)),),
icon: SvgPicture.asset('lib/assets/icons/next.svg')
icon: Icon(CupertinoIcons.forward, color: getGFColor(GFColor.success),)
),
)
),
Expand Down Expand Up @@ -210,7 +199,7 @@ class _ButtonTypesState extends State<ButtonTypes> {
color: getGFColor(GFColor.dark),
showDivider: false,
title: Text('Icons Buttons', style: TextStyle(color: getGFColor(GFColor.white)),),
icon: SvgPicture.asset('lib/assets/icons/next.svg')
icon: Icon(CupertinoIcons.forward, color: getGFColor(GFColor.success),)
),
)
),
Expand Down Expand Up @@ -242,7 +231,7 @@ class _ButtonTypesState extends State<ButtonTypes> {
color: getGFColor(GFColor.dark),
showDivider: false,
title: Text('Social Buttons', style: TextStyle(color: getGFColor(GFColor.white)),),
icon: SvgPicture.asset('lib/assets/icons/next.svg')
icon: Icon(CupertinoIcons.forward, color: getGFColor(GFColor.success),)
),
)
),
Expand Down
2 changes: 1 addition & 1 deletion demo_app/lib/screens/button/pill-buttons.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class _PillsButtonsState extends State<PillsButtons> with SingleTickerProviderSt
tabBarColor: getGFColor(GFColor.light),
indicatorSize: TabBarIndicatorSize.tab,
labelColor: getGFColor(GFColor.white),
unselectedLabelColor: Colors.white,
unselectedLabelColor:getGFColor(GFColor.dark),
indicator: BoxDecoration(
color: getGFColor(GFColor.dark),
border: Border(bottom: BorderSide(color: getGFColor(GFColor.success), width: 3.0,),),
Expand Down
2 changes: 1 addition & 1 deletion demo_app/lib/screens/button/square-buttons.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class _SquareButtonsState extends State<SquareButtons> with SingleTickerProvider
tabBarColor: getGFColor(GFColor.light),
indicatorSize: TabBarIndicatorSize.tab,
labelColor: getGFColor(GFColor.white),
unselectedLabelColor: Colors.white,
unselectedLabelColor: getGFColor(GFColor.dark),
indicator: BoxDecoration(
color: getGFColor(GFColor.dark),
border: Border(bottom: BorderSide(color: getGFColor(GFColor.success), width: 3.0,),),
Expand Down
2 changes: 1 addition & 1 deletion demo_app/lib/screens/button/standard-buttons.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class _StandardButtonsState extends State<StandardButtons> with SingleTickerProv
tabBarColor: getGFColor(GFColor.light),
indicatorSize: TabBarIndicatorSize.tab,
labelColor: getGFColor(GFColor.white),
unselectedLabelColor: Colors.white,
unselectedLabelColor: getGFColor(GFColor.dark),
indicator: BoxDecoration(
color: getGFColor(GFColor.dark),
border: Border(bottom: BorderSide(color: getGFColor(GFColor.success), width: 3.0,),),
Expand Down
108 changes: 36 additions & 72 deletions demo_app/lib/screens/cards/cards.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ class _CardPageState extends State<CardPage> with SingleTickerProviderStateMixin
super.dispose();
}

bool fav= false;
bool fav1= false;
bool fav2 = false;
@override
Widget build(BuildContext context) {
return Scaffold(
Expand Down Expand Up @@ -84,7 +87,7 @@ class _CardPageState extends State<CardPage> with SingleTickerProviderStateMixin
tabBarColor: getGFColor(GFColor.light),
indicatorSize: TabBarIndicatorSize.tab,
labelColor: getGFColor(GFColor.white),
unselectedLabelColor: Colors.white,
unselectedLabelColor:getGFColor(GFColor.dark),
indicator: BoxDecoration(
color: Colors.black,
border: Border(bottom: BorderSide(color: getGFColor(GFColor.success), width: 3.0,),),
Expand Down Expand Up @@ -117,12 +120,17 @@ class _CardPageState extends State<CardPage> with SingleTickerProviderStateMixin
title: GFListTile(
title: Text(
'Card Title',
style: TextStyle(color: Colors.grey),
),
icon:
GFIconButton(
onPressed: null,
icon: Icon(Icons.favorite_border),
icon: GestureDetector(
onTap: (){
setState(() {fav =!fav;
});
},
child: fav? Icon(Icons.favorite, color: getGFColor(GFColor.danger),):Icon(Icons.favorite_border),
),
type: GFType.transparent,
),

Expand All @@ -134,8 +142,8 @@ class _CardPageState extends State<CardPage> with SingleTickerProviderStateMixin
buttonBar: GFButtonBar(
alignment: MainAxisAlignment.start,
children: <Widget>[
GFButton(onPressed: (){},text: 'Button', ),
GFButton(onPressed: (){},text: 'Button', )
GFButton(onPressed: (){},text: 'Read More', ),
GFButton(onPressed: (){},text: 'Send', )
],
),

Expand All @@ -151,12 +159,17 @@ class _CardPageState extends State<CardPage> with SingleTickerProviderStateMixin
title: GFListTile(
title: Text(
'Card Title',
style: TextStyle(color: Colors.grey),
),
icon:
GFIconButton(
onPressed: null,
icon: Icon(Icons.favorite_border),
icon:GestureDetector(
onTap: (){
setState(() {fav1 =!fav1;
});
},
child: fav1? Icon(Icons.favorite, color: getGFColor(GFColor.danger),):Icon(Icons.favorite_border),
),
type: GFType.transparent,
),

Expand Down Expand Up @@ -190,7 +203,6 @@ class _CardPageState extends State<CardPage> with SingleTickerProviderStateMixin
title: GFListTile(
title: Text(
'Card Title',
style: TextStyle(color: Colors.grey),
),
showDivider: false,

Expand All @@ -202,7 +214,7 @@ class _CardPageState extends State<CardPage> with SingleTickerProviderStateMixin
buttonBar: GFButtonBar(
alignment: MainAxisAlignment.start,
children: <Widget>[
GFButton(onPressed: (){},text: 'Button', )
GFButton(onPressed: (){},text: 'Share', )
],
),

Expand All @@ -218,7 +230,6 @@ class _CardPageState extends State<CardPage> with SingleTickerProviderStateMixin
title: GFListTile(
title: Text(
'Card Title',
style: TextStyle(color: Colors.grey),
),
showDivider: false,

Expand All @@ -230,8 +241,8 @@ class _CardPageState extends State<CardPage> with SingleTickerProviderStateMixin
buttonBar: GFButtonBar(
alignment: MainAxisAlignment.start,
children: <Widget>[
GFButton(onPressed: (){},text: 'Button', ),
GFButton(onPressed: (){},text: 'Button', )
GFButton(onPressed: (){},text: 'View More', ),
GFButton(onPressed: (){},text: 'Share', )
],
),

Expand All @@ -255,16 +266,21 @@ class _CardPageState extends State<CardPage> with SingleTickerProviderStateMixin
backgroundImage: AssetImage('lib/assets/images/three3.png'),
),
title: Text(
'title',
style: TextStyle(color: Colors.grey),
'Card Title',
),
subTitle: Text(
'subtitle',
style: TextStyle(color: Colors.grey),
),
icon: GFIconButton(
onPressed: null,
icon: Icon(Icons.favorite_border),
icon: GestureDetector(
onTap: (){
setState(() {fav2 =!fav2;
});
},
child: fav2? Icon(Icons.favorite, color: getGFColor(GFColor.danger),):Icon(Icons.favorite_border),
),
type: GFType.transparent,
),
),
Expand All @@ -273,57 +289,9 @@ class _CardPageState extends State<CardPage> with SingleTickerProviderStateMixin
"Flutter Flutter is Google's mobile UI framework for crafting",
style: TextStyle(color: Colors.grey),
),
// buttonBar: GFButtonBar(
// mainAxisSize: MainAxisSize.min,
// children: <Widget>[
// GFButton(
// onPressed: null,
// child: Text("favorite"),
// icon: Icon(Icons.favorite_border),
// type: GFType.transparent,
// ),
// GFButton(
// onPressed: null,
// child: Text("share"),
// icon: Icon(Icons.share),
// type: GFType.outline,
// ),
// ],
// ),
),

// GFCard(
// boxFit: BoxFit.fill,
// colorFilter: new ColorFilter.mode(
// Colors.black.withOpacity(0.67), BlendMode.darken),
// image: Image.asset('lib/assets/images/image.png'),
//
// titlePosition: GFPosition.end,
// title: GFListTile(
// avatar: GFAvatar(
// backgroundImage: AssetImage('lib/assets/images/avatar3.png'),
// ),
// title: Text(
// 'Card Title',
// style: TextStyle(color: Colors.grey),
// ),
// subTitle: Text('Subtitle'),
//
// ),
// content: Text(
// "Some quick example text to build on the card",
// style: TextStyle(color: Colors.grey),
// ),
// buttonBar: GFButtonBar(
// alignment: MainAxisAlignment.start,
// children: <Widget>[
// GFButton(onPressed: (){},text: 'Button', ),
// GFButton(onPressed: (){},text: 'Button', )
// ],
// ),
//
// ),

GFCard(
boxFit: BoxFit.cover,
colorFilter: new ColorFilter.mode(
Expand All @@ -337,7 +305,6 @@ class _CardPageState extends State<CardPage> with SingleTickerProviderStateMixin
),
title: Text(
'Card Title',
style: TextStyle(color: Colors.grey),
),
subTitle: Text('Subtitle'),

Expand Down Expand Up @@ -386,10 +353,7 @@ class _CardPageState extends State<CardPage> with SingleTickerProviderStateMixin
avatar: GFAvatar(
backgroundImage: AssetImage('lib/assets/images/three5.png'),
),
title: Text(
'title',
style: TextStyle(color: Colors.grey),
),
title:Text('Card Title', style: TextStyle(color: Colors.grey, fontWeight: FontWeight.w500),),
subTitle: Text(
'subtitle',
style: TextStyle(color: Colors.grey),
Expand All @@ -408,8 +372,8 @@ avatar: GFAvatar(
buttonBar: GFButtonBar(
alignment: MainAxisAlignment.center,
children: <Widget>[
GFButton(onPressed: (){}, text: 'Button',),
GFButton(onPressed: (){}, text: 'Button',)
GFButton(onPressed: (){}, text: 'Send',),
GFButton(onPressed: (){}, text: 'View',)
],
),

Expand All @@ -422,8 +386,8 @@ imageOverlay: AssetImage('lib/assets/images/image1.png'),
title: GFListTile(

title: Text(
'title',
style: TextStyle(color: Colors.grey),
'Card Title',
style: TextStyle(color: Colors.grey, fontWeight: FontWeight.w500),
),
subTitle: Text(
'subtitle',
Expand Down
2 changes: 1 addition & 1 deletion demo_app/lib/screens/carousel/carousel.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ class _CarouselState extends State<Carousel> with SingleTickerProviderStateMixi
tabBarColor: getGFColor(GFColor.light),
indicatorSize: TabBarIndicatorSize.tab,
labelColor: getGFColor(GFColor.white),
unselectedLabelColor: Colors.white,
unselectedLabelColor: getGFColor(GFColor.dark),
indicator: BoxDecoration(
color: Colors.black,
border: Border(bottom: BorderSide(color: getGFColor(GFColor.success), width: 3.0,),),
Expand Down
2 changes: 1 addition & 1 deletion demo_app/lib/screens/images/images.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class _ImagesState extends State<Images> with SingleTickerProviderStateMixin {
tabBarColor: getGFColor(GFColor.light),
indicatorSize: TabBarIndicatorSize.tab,
labelColor: getGFColor(GFColor.white),
unselectedLabelColor: Colors.white,
unselectedLabelColor: getGFColor(GFColor.dark),
indicator: BoxDecoration(
color: Colors.black,
border: Border(bottom: BorderSide(color: getGFColor(GFColor.success), width: 3.0,),),
Expand Down
2 changes: 1 addition & 1 deletion demo_app/lib/screens/tabs/tabsPage.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class _TabsPageState extends State<TabsPage> with SingleTickerProviderStateMixin
tabBarColor: getGFColor(GFColor.light),
indicatorSize: TabBarIndicatorSize.tab,
labelColor: getGFColor(GFColor.white),
unselectedLabelColor: Colors.white,
unselectedLabelColor:getGFColor(GFColor.dark),
indicator: BoxDecoration(
color: Colors.black,
border: Border(bottom: BorderSide(color: getGFColor(GFColor.success), width: 3.0,),),
Expand Down
Loading