diff --git a/lib/assets/gif/Borders.gif b/lib/assets/gif/Borders.gif index 0d6342e..db80b38 100644 Binary files a/lib/assets/gif/Borders.gif and b/lib/assets/gif/Borders.gif differ diff --git a/lib/assets/gif/Dropdown.gif b/lib/assets/gif/Dropdown.gif new file mode 100644 index 0000000..e786876 Binary files /dev/null and b/lib/assets/gif/Dropdown.gif differ diff --git a/lib/assets/gif/Intro.gif b/lib/assets/gif/Intro.gif new file mode 100644 index 0000000..d69d2b5 Binary files /dev/null and b/lib/assets/gif/Intro.gif differ diff --git a/lib/assets/gif/Sticky.gif b/lib/assets/gif/Sticky.gif new file mode 100644 index 0000000..a398aaa Binary files /dev/null and b/lib/assets/gif/Sticky.gif differ diff --git a/lib/assets/gif/bottomsheet.gif b/lib/assets/gif/bottomsheet.gif index 9511cd7..7a44f14 100644 Binary files a/lib/assets/gif/bottomsheet.gif and b/lib/assets/gif/bottomsheet.gif differ diff --git a/lib/assets/icons/Rotation.png b/lib/assets/icons/Rotation.png new file mode 100644 index 0000000..40cb2b1 Binary files /dev/null and b/lib/assets/icons/Rotation.png differ diff --git a/lib/assets/icons/allign.png b/lib/assets/icons/allign.png new file mode 100644 index 0000000..7ccea80 Binary files /dev/null and b/lib/assets/icons/allign.png differ diff --git a/lib/assets/icons/gflogo.png b/lib/assets/icons/gflogo.png new file mode 100644 index 0000000..3d3b919 Binary files /dev/null and b/lib/assets/icons/gflogo.png differ diff --git a/lib/assets/icons/scaling.png b/lib/assets/icons/scaling.png new file mode 100644 index 0000000..fc4664c Binary files /dev/null and b/lib/assets/icons/scaling.png differ diff --git a/lib/assets/icons/size.png b/lib/assets/icons/size.png new file mode 100644 index 0000000..835ca50 Binary files /dev/null and b/lib/assets/icons/size.png differ diff --git a/lib/assets/icons/slide.png b/lib/assets/icons/slide.png new file mode 100644 index 0000000..bda6c2f Binary files /dev/null and b/lib/assets/icons/slide.png differ diff --git a/lib/assets/images/e1.png b/lib/assets/images/e1.png new file mode 100644 index 0000000..42d15f3 Binary files /dev/null and b/lib/assets/images/e1.png differ diff --git a/lib/assets/images/e2.png b/lib/assets/images/e2.png new file mode 100644 index 0000000..61743b6 Binary files /dev/null and b/lib/assets/images/e2.png differ diff --git a/lib/assets/images/e3.png b/lib/assets/images/e3.png new file mode 100644 index 0000000..96a251d Binary files /dev/null and b/lib/assets/images/e3.png differ diff --git a/lib/assets/images/e4.png b/lib/assets/images/e4.png new file mode 100644 index 0000000..44c7343 Binary files /dev/null and b/lib/assets/images/e4.png differ diff --git a/lib/assets/images/e5.png b/lib/assets/images/e5.png new file mode 100644 index 0000000..e44c5eb Binary files /dev/null and b/lib/assets/images/e5.png differ diff --git a/lib/assets/images/i1.png b/lib/assets/images/i1.png new file mode 100644 index 0000000..ec81a03 Binary files /dev/null and b/lib/assets/images/i1.png differ diff --git a/lib/assets/images/i2.png b/lib/assets/images/i2.png new file mode 100644 index 0000000..8034359 Binary files /dev/null and b/lib/assets/images/i2.png differ diff --git a/lib/assets/images/i3.png b/lib/assets/images/i3.png new file mode 100644 index 0000000..0b5403c Binary files /dev/null and b/lib/assets/images/i3.png differ diff --git a/lib/assets/images/i4.png b/lib/assets/images/i4.png new file mode 100644 index 0000000..43eafad Binary files /dev/null and b/lib/assets/images/i4.png differ diff --git a/lib/assets/images/s1.png b/lib/assets/images/s1.png new file mode 100644 index 0000000..6be5e8e Binary files /dev/null and b/lib/assets/images/s1.png differ diff --git a/lib/assets/images/s2.png b/lib/assets/images/s2.png new file mode 100644 index 0000000..e304628 Binary files /dev/null and b/lib/assets/images/s2.png differ diff --git a/lib/assets/images/s3.png b/lib/assets/images/s3.png new file mode 100644 index 0000000..0499afe Binary files /dev/null and b/lib/assets/images/s3.png differ diff --git a/lib/assets/images/s4.png b/lib/assets/images/s4.png new file mode 100644 index 0000000..aec78d8 Binary files /dev/null and b/lib/assets/images/s4.png differ diff --git a/lib/assets/images/s5.png b/lib/assets/images/s5.png new file mode 100644 index 0000000..52bf212 Binary files /dev/null and b/lib/assets/images/s5.png differ diff --git a/lib/assets/images/story.jpg b/lib/assets/images/story.jpg new file mode 100644 index 0000000..67b7fb7 Binary files /dev/null and b/lib/assets/images/story.jpg differ diff --git a/lib/screens/accordion/accordion.dart b/lib/screens/accordion/accordion.dart index 358ef7c..6caaf08 100644 --- a/lib/screens/accordion/accordion.dart +++ b/lib/screens/accordion/accordion.dart @@ -1,7 +1,8 @@ import 'package:flutter/material.dart'; -import 'package:getwidget/getwidget.dart'; import 'package:gf_web/screens/layout/layout.dart'; import 'package:gf_web/styles/styles.dart'; +import 'package:getwidget/getwidget.dart'; + class Accordion extends StatefulWidget { @override @@ -30,7 +31,7 @@ class _AccordionState extends State { SizedBox( height: 30, ), - const Padding( + Padding( padding: EdgeInsets.only(left: 15, top: 30), child: GFTypography( child: Text( @@ -43,7 +44,7 @@ class _AccordionState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), SizedBox( @@ -60,7 +61,7 @@ class _AccordionState extends State { bottom: BorderSide( color: Colors.black.withOpacity(0.2), width: 0.5), ), - contentborder: Border( + contentBorder: Border( top: BorderSide( color: Colors.black.withOpacity(0.2), width: 0.5), bottom: BorderSide( @@ -87,7 +88,7 @@ class _AccordionState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), SizedBox( @@ -104,7 +105,7 @@ class _AccordionState extends State { bottom: BorderSide( color: Colors.black.withOpacity(0.2), width: 0.5), ), - contentborder: Border( + contentBorder: Border( top: BorderSide( color: Colors.black.withOpacity(0.2), width: 0.5), bottom: BorderSide( @@ -136,7 +137,7 @@ class _AccordionState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), SizedBox( @@ -153,7 +154,7 @@ class _AccordionState extends State { bottom: BorderSide( color: Colors.black.withOpacity(0.2), width: 0.5), ), - contentborder: Border( + contentBorder: Border( top: BorderSide( color: Colors.black.withOpacity(0.2), width: 0.5), bottom: BorderSide( diff --git a/lib/screens/alert/alert.dart b/lib/screens/alert/alert.dart index 3f19ec3..e5e8966 100644 --- a/lib/screens/alert/alert.dart +++ b/lib/screens/alert/alert.dart @@ -10,7 +10,7 @@ class Alert extends StatefulWidget { class _AlertState extends State { bool showblur = false; - Widget alertWidget; + Widget? alertWidget; @override Widget build(BuildContext context) { return Scaffold( @@ -18,10 +18,7 @@ class _AlertState extends State { demoImageUrl: 'lib/assets/gif/Alerts.gif', body: GFFloatingWidget( verticalPosition: 150, - showblurness: showblur, -//blurnessColor: Colors.black54, - -// + showBlurness: showblur, child: alertWidget, body: ListView( children: [ @@ -52,7 +49,7 @@ class _AlertState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), Container( @@ -126,7 +123,7 @@ class _AlertState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), Container( @@ -198,13 +195,12 @@ class _AlertState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), Container( margin: const EdgeInsets.only(top: 20), color: Colors.transparent, -// height: 300, child: Center( child: GFButton( text: 'Tap to View', diff --git a/lib/screens/animation/animation.dart b/lib/screens/animation/animation.dart new file mode 100644 index 0000000..72cc33b --- /dev/null +++ b/lib/screens/animation/animation.dart @@ -0,0 +1,289 @@ +import 'package:flutter/material.dart'; +import 'package:gf_web/screens/layout/layout.dart'; +import 'package:gf_web/styles/styles.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:getwidget/getwidget.dart'; + +class Animation extends StatefulWidget { + @override + _AnimationState createState() => _AnimationState(); +} + +class _AnimationState extends State + with SingleTickerProviderStateMixin { + bool selected = false; + bool _large = false; + double _size = 50.0; + AnimationController? controller; + bool _first = true; + double _fontSize = 30; + Color _color = GFColors.SUCCESS; + + @override + void initState() { + super.initState(); + controller = + AnimationController(duration: const Duration(seconds: 2), vsync: this); + controller!.repeat(); + } + + @override + void dispose() { + if (controller != null) controller!.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + body: Layout( + demoImageUrl: 'lib/assets/gif/floating.gif', + body: SingleChildScrollView( + child: Column( + children: [ + Row( + children: [ + Text( + 'Animation', + style: hintStyleTextblackbolder(), + ), + ], + ), + SizedBox( + height: 20, + ), + Text( + "Animation is a method in which figures are manipulated to appear as moving images.", + style: hintStyleTextblackdull(), + ), + SizedBox( + height: 20, + ), + const Padding( + padding: EdgeInsets.only(left: 15, top: 30, bottom: 10), + child: GFTypography( + child: Text( + 'Rotation', + style: TextStyle( + fontSize: 20.0, + color: Colors.black, + fontWeight: FontWeight.w600, + ), + ), + type: GFTypographyType.typo5, + dividerWidth: 45, + dividerColor: Color(0xFF19CA4B), text: '', + ), + ), + GestureDetector( + onTap: () { + controller!.repeat(); + }, + child: GFAnimation( + controller: controller, + type: GFAnimationType.rotateTransition, + alignment: Alignment.center, + child: Image.asset( + 'lib/assets/icons/Rotation.png', + width: 80, + height: 80, + ), + ), + ), + SizedBox(height: 5), + Center(child: Text('Tap Me')), + const Padding( + padding: EdgeInsets.only(left: 15, top: 30, bottom: 10), + child: GFTypography( + child: Text( + 'Scalling', + style: TextStyle( + fontSize: 20.0, + color: Colors.black, + fontWeight: FontWeight.w600, + ), + ), + type: GFTypographyType.typo5, + dividerWidth: 45, + dividerColor: Color(0xFF19CA4B), text: '', + ), + ), + GestureDetector( + onTap: () { + controller!.repeat(); + }, + child: GFAnimation( + controller: controller, + type: GFAnimationType.scaleTransition, + child: Image.asset( + 'lib/assets/icons/scaling.png', + width: 80, + height: 80, + ), + ), + ), + SizedBox(height: 5), + Center(child: Text('Tap Me')), + const Padding( + padding: EdgeInsets.only(left: 15, top: 30, bottom: 10), + child: GFTypography( + child: Text( + 'Alignment', + style: TextStyle( + fontSize: 20.0, + color: Colors.black, + fontWeight: FontWeight.w600, + ), + ), + type: GFTypographyType.typo5, + dividerWidth: 45, + dividerColor: Color(0xFF19CA4B), text: '', + ), + ), + GFAnimation( + duration: Duration(seconds: 2), + alignment: Alignment.centerLeft, + type: GFAnimationType.align, + child: Image.asset( + 'lib/assets/icons/allign.png', + width: 80, + height: 80, + ), + ), + SizedBox(height: 5), + Center(child: Text('Tap Me')), + const Padding( + padding: EdgeInsets.only(left: 15, top: 30, bottom: 10), + child: GFTypography( + child: Text( + 'Slide Transition', + style: TextStyle( + fontSize: 20.0, + color: Colors.black, + fontWeight: FontWeight.w600, + ), + ), + type: GFTypographyType.typo5, + dividerWidth: 45, + dividerColor: Color(0xFF19CA4B), text: '', + ), + ), + Container( + width: MediaQuery.of(context).size.width, + child: GFAnimation( + controller: controller, + type: GFAnimationType.slideTransition, + child: Image.asset( + 'lib/assets/icons/slide.png', + width: 80, + height: 80, + ), + ), + ), + SizedBox(height: 5), + const Padding( + padding: EdgeInsets.only(left: 15, top: 30, bottom: 10), + child: GFTypography( + child: Text( + 'Size', + style: TextStyle( + fontSize: 20.0, + color: Colors.black, + fontWeight: FontWeight.w600, + ), + ), + type: GFTypographyType.typo5, + dividerWidth: 45, + dividerColor: Color(0xFF19CA4B), text: '', + ), + ), + GFAnimation( + onTap: () { + if (mounted) { + setState(() { + selected = !selected; + }); + } + }, + width: selected ? 100 : 50, + height: selected ? 100 : 50, + type: GFAnimationType.size, + controller: controller, + child: Image.asset( + 'lib/assets/icons/size.png', + ), + ), + SizedBox(height: 5), + Center(child: Text('Tap Me')), + const Padding( + padding: EdgeInsets.only(left: 15, top: 30, bottom: 10), + child: GFTypography( + child: Text( + 'TextStyle', + style: TextStyle( + fontSize: 20.0, + color: Colors.black, + fontWeight: FontWeight.w600, + ), + ), + type: GFTypographyType.typo5, + dividerWidth: 45, + dividerColor: Color(0xFF19CA4B), text: '', + ), + ), + GFAnimation( + onTap: () { + setState(() { + _fontSize = _first ? 60 : 30; + _color = _first ? Colors.blue : Colors.red; + _first = !_first; + }); + }, + color: _color, + fontSize: _fontSize, + type: GFAnimationType.textStyle, + child: Center(child: Text('Get Widget')), + ), + SizedBox(height: 5), + Center(child: Text('Tap Me')), + const Padding( + padding: EdgeInsets.only(left: 15, top: 30, bottom: 10), + child: GFTypography( + child: Text( + 'Container', + style: TextStyle( + fontSize: 20.0, + color: Colors.black, + fontWeight: FontWeight.w600, + ), + ), + type: GFTypographyType.typo5, + dividerWidth: 45, + dividerColor: Color(0xFF19CA4B), text: '', + ), + ), + GFAnimation( + width: 50, + changedWidth: 100, + height: 50, + changedHeight: 100, + activeColor: Colors.transparent, + color: Colors.transparent, + fontSize: _fontSize, + type: GFAnimationType.container, + child: Image.asset( + 'lib/assets/icons/slide.png', + width: 80, + height: 80, + ), + ), + SizedBox(height: 5), + Center(child: Text('Tap Me')), + SizedBox(height: 60), + ], + ), + ), + ), + ); + } +} diff --git a/lib/screens/appbar/appbar.dart b/lib/screens/appbar/appbar.dart index 995766d..b60a424 100644 --- a/lib/screens/appbar/appbar.dart +++ b/lib/screens/appbar/appbar.dart @@ -46,7 +46,7 @@ class _AppBarState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), SizedBox( @@ -69,7 +69,7 @@ class _AppBarState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), SizedBox( @@ -92,7 +92,7 @@ class _AppBarState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), SizedBox( diff --git a/lib/screens/appbar/searchbar.dart b/lib/screens/appbar/searchbar.dart index 4acf098..d140a14 100644 --- a/lib/screens/appbar/searchbar.dart +++ b/lib/screens/appbar/searchbar.dart @@ -13,7 +13,6 @@ class _SearchbarState extends State { backgroundColor: GFColors.DARK, title: const Text('UI Kit'), searchBar: true, -// searchBarColorTheme: Colors.deepOrange, actions: [ GFIconButton( icon: Icon( diff --git a/lib/screens/appbar/segmented.dart b/lib/screens/appbar/segmented.dart index dd6fd50..86b1edf 100644 --- a/lib/screens/appbar/segmented.dart +++ b/lib/screens/appbar/segmented.dart @@ -8,7 +8,7 @@ class SegmentedAppbar extends StatefulWidget { class _SegmentedAppbarState extends State with TickerProviderStateMixin { - TabController tabController; + TabController? tabController; @override void initState() { super.initState(); @@ -17,7 +17,7 @@ class _SegmentedAppbarState extends State @override void dispose() { - tabController.dispose(); + tabController!.dispose(); super.dispose(); } @@ -31,18 +31,10 @@ class _SegmentedAppbarState extends State GFSegmentTabs( tabController: tabController, tabBarColor: GFColors.LIGHT, -// indicatorSize: TabBarIndicatorSize.tab, labelColor: GFColors.WHITE, unselectedLabelColor: GFColors.DARK, indicator: BoxDecoration( color: GFColors.DARK, -// border: Border( -// bottom: BorderSide( -// color: GFColors.SUCCESS, -// width: 3.0, -// ), -// ), -// borderRadius: BorderRadius.circular(2.0) ), indicatorPadding: const EdgeInsets.all(8), indicatorWeight: 2, @@ -82,7 +74,6 @@ class _SegmentedAppbarState extends State style: TextStyle(fontSize: 30.0), ), ), -// Container(child: Text('Tab 3'),), ]), ); } diff --git a/lib/screens/avatar/avatar.dart b/lib/screens/avatar/avatar.dart index 8237d63..0401cea 100644 --- a/lib/screens/avatar/avatar.dart +++ b/lib/screens/avatar/avatar.dart @@ -16,18 +16,13 @@ class _AvatarState extends State { demoImageUrl: 'lib/assets/gif/avatars.gif', body: ListView( children: [ - // Text( - // 'Avatar', - // style: hintStyleTextblackbolder(), - // ), Padding( - padding: EdgeInsets.only( - // left: 15, - ), + padding: EdgeInsets.only(), child: GFTypography( type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Avatar', style: hintStyleTextblackbold(), @@ -44,7 +39,6 @@ class _AvatarState extends State { SizedBox( height: 30, ), - // Text('With Buttons', style: hintStyleTextblackbold(),), GFCard( content: Column( children: [ diff --git a/lib/screens/badges/badges.dart b/lib/screens/badges/badges.dart index 7fd7875..ab00f8c 100644 --- a/lib/screens/badges/badges.dart +++ b/lib/screens/badges/badges.dart @@ -30,10 +30,6 @@ class _BadgesState extends State { SizedBox( height: 30, ), - // Text( - // 'With Buttons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -42,6 +38,7 @@ class _BadgesState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'With Buttons', style: hintStyleTextblackbold(), @@ -162,12 +159,6 @@ class _BadgesState extends State { ], ), ), - -//icons with badges - // Text( - // 'Icon with Badges', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -176,6 +167,7 @@ class _BadgesState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Icon with Badges', style: hintStyleTextblackbold(), diff --git a/lib/screens/border/border.dart b/lib/screens/border/border.dart deleted file mode 100644 index 92d26a9..0000000 --- a/lib/screens/border/border.dart +++ /dev/null @@ -1,126 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:getwidget/getwidget.dart'; -import 'package:gf_web/screens/layout/layout.dart'; -import 'package:gf_web/styles/styles.dart'; - -class Border extends StatefulWidget { - @override - _BorderState createState() => _BorderState(); -} - -class _BorderState extends State { - @override - Widget build(BuildContext context) { - return Scaffold( - body: Layout( - demoImageUrl: 'lib/assets/gif/Borders.gif', - body: ListView( - children: [ - Text( - 'Border', - style: hintStyleTextblackbolder(), - ), - SizedBox( - height: 20, - ), - Text( - "The most basic way is to wrap your widget in a DecoratedBox.A border of a box, comprised of four sides: top, right, bottom, left.", - style: hintStyleTextblackdull(), - ), - const Padding( - padding: EdgeInsets.only(left: 15, top: 30, bottom: 10), - child: GFTypography( - child: Text( - 'Solid Borders', - style: TextStyle( - fontSize: 20.0, - color: Colors.black, - fontWeight: FontWeight.w600, - ), - ), - type: GFTypographyType.typo5, - dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), - ), - ), - Container( - margin: EdgeInsets.symmetric(horizontal: 15, vertical: 15), - child: GFBorder( - radius: Radius.circular(30), - color: Color(0xFF19CA4B), - dashedLine: [2, 0], - type: GFBorderType.Rect, - child: Container( - height: 100, - color: Color(0xFFE9FFEF), - ), - ), - ), - const Padding( - padding: EdgeInsets.only(left: 15, top: 30, bottom: 10), - child: GFTypography( - child: Text( - 'Dashed Borders', - style: TextStyle( - fontSize: 20.0, - color: Colors.black, - fontWeight: FontWeight.w600, - ), - ), - type: GFTypographyType.typo5, - dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), - ), - ), - Container( - margin: EdgeInsets.symmetric(horizontal: 15, vertical: 15), - child: GFBorder( - type: GFBorderType.RRect, - radius: Radius.circular(20), - color: Color(0xFFAA66CC), - child: Container( - decoration: BoxDecoration( - color: Color(0xFFFAF0FF), - borderRadius: BorderRadius.circular(20)), - height: 100, - ), - ), - ), - const Padding( - padding: EdgeInsets.only(left: 15, top: 30, bottom: 10), - child: GFTypography( - child: Text( - 'Dotted Borders', - style: TextStyle( - fontSize: 20.0, - color: Colors.black, - fontWeight: FontWeight.w600, - ), - ), - type: GFTypographyType.typo5, - dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), - ), - ), - Container( - margin: EdgeInsets.symmetric(horizontal: 15, vertical: 15), - child: GFBorder( - radius: Radius.circular(30), - color: Color(0xFF19CA4B), - dashedLine: [2, 1], - type: GFBorderType.Rect, - child: Container( - height: 100, - color: Color(0xFFE9FFEF), - ), - ), - ), - SizedBox( - height: 20, - ) - ], - ), - ), - ); - } -} diff --git a/lib/screens/border/dashedborder.dart b/lib/screens/border/dashedborder.dart new file mode 100644 index 0000000..54f34d8 --- /dev/null +++ b/lib/screens/border/dashedborder.dart @@ -0,0 +1,237 @@ +import 'package:flutter/material.dart'; +import 'package:getwidget/getwidget.dart'; +import 'package:gf_web/screens/layout/layout.dart'; +import 'package:gf_web/styles/styles.dart'; + +class DashedBorder extends StatefulWidget { + @override + _DashedBorderState createState() => _DashedBorderState(); +} + +class _DashedBorderState extends State { + bool fav = false; + bool fav1 = false; + bool fav2 = false; + @override + Widget build(BuildContext context) { + return Scaffold( + body: Layout( + demoImageUrl: 'lib/assets/gif/Borders.gif', + body: ListView( + children: [ + Text( + 'Border', + style: hintStyleTextblackbolder(), + ), + SizedBox( + height: 20, + ), + Text( + "The most basic way is to wrap your widget in a DecoratedBox.A border of a box, comprised of four sides: top, right, bottom, left.", + style: hintStyleTextblackdull(), + ), + const Padding( + padding: EdgeInsets.only(left: 15, top: 30, bottom: 10), + child: GFTypography( + child: Text( + 'Dashed Borders', + style: TextStyle( + fontSize: 20.0, + color: Colors.black, + fontWeight: FontWeight.w600, + ), + ), + type: GFTypographyType.typo5, + dividerWidth: 45, + dividerColor: Color(0xFF19CA4B), text: '', + ), + ), + Container( + margin: EdgeInsets.symmetric(horizontal: 15, vertical: 15), + child: GFBorder( + type: GFBorderType.rRect, + color: Color(0xFF19CA4B), + child: Container( + decoration: BoxDecoration( + color: Color(0xFFE9FFEF), + ), + height: 100, + ), + ), + ), + Container( + margin: EdgeInsets.symmetric(horizontal: 15, vertical: 15), + child: GFBorder( + type: GFBorderType.rRect, + color: Color(0xFF19CA4B), + child: Image.asset( + 'lib/assets/images/image1.png', + width: MediaQuery.of(context).size.width, + fit: BoxFit.fitWidth, + ), + ), + ), + const Padding( + padding: EdgeInsets.only(left: 15, top: 30, bottom: 10), + child: GFTypography( + child: Text( + 'Dashed border with radius', + style: TextStyle( + fontSize: 20.0, + color: Colors.black, + fontWeight: FontWeight.w600, + ), + ), + type: GFTypographyType.typo5, + dividerWidth: 45, + dividerColor: Color(0xFF19CA4B), text: '', + ), + ), + Container( + margin: EdgeInsets.symmetric(horizontal: 15, vertical: 15), + child: GFBorder( + type: GFBorderType.rRect, + radius: Radius.circular(20), + color: Color(0xFF19CA4B), + child: Container( + decoration: BoxDecoration( + color: Color(0xFFE9FFEF), + borderRadius: BorderRadius.circular(20)), + height: 100, + ), + ), + ), + Container( + margin: EdgeInsets.symmetric(horizontal: 15, vertical: 15), + child: GFBorder( + type: GFBorderType.rRect, + radius: Radius.circular(20), + color: Color(0xFF19CA4B), + child: GFCard( + boxFit: BoxFit.fill, + colorFilter: ColorFilter.mode( + Colors.black.withOpacity(0.67), BlendMode.darken), + image: Image.asset( + 'lib/assets/images/image1.png', + width: MediaQuery.of(context).size.width, + fit: BoxFit.fitWidth, + ), + titlePosition: GFPosition.end, + title: GFListTile( + avatar: const GFAvatar( + backgroundImage: AssetImage('lib/assets/images/img.png'), + ), + titleText: 'Card Title', + subTitleText: 'Sub Title', + icon: GFIconButton( + onPressed: null, + icon: GestureDetector( + onTap: () { + setState(() { + fav2 = !fav2; + }); + }, + child: fav2 + ? Icon( + Icons.favorite, + color: GFColors.DANGER, + ) + : Icon(Icons.favorite_border), + ), + type: GFButtonType.transparent, + ), + ), + content: Text( + 'GetWidget is an open source library that comes with pre-build 1000+ UI components', + style: TextStyle(color: Colors.grey), + ), + ), + ), + ), + const Padding( + padding: EdgeInsets.only(left: 15, top: 30, bottom: 10), + child: GFTypography( + child: Text( + 'Rounded Corners', + style: TextStyle( + fontSize: 20.0, + color: Colors.black, + fontWeight: FontWeight.w600, + ), + ), + type: GFTypographyType.typo5, + dividerWidth: 45, + dividerColor: Color(0xFF19CA4B), text: '', + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Container( + height: 60, + child: GFBorder( + type: GFBorderType.oval, + dashedLine: [3, 1], + color: Color(0xFF19CA4B), + child: Center(child: Text('Oval Border')), + ), + ), + Container( + width: 130, + height: 90, + child: GFBorder( + type: GFBorderType.oval, + dashedLine: [3, 1], + color: Color(0xFF19CA4B), + child: Center( + child: Image.asset( + 'lib/assets/images/img.png', + fit: BoxFit.fitWidth, + )), + ), + ), + ], + ), + SizedBox(height: 15), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Container( + width: 100, + height: 100, + child: GFBorder( + type: GFBorderType.circle, + dashedLine: [3, 1], + color: Color(0xFF19CA4B), + child: Center( + child: Text( + 'Circular Border', + textAlign: TextAlign.center, + )), + ), + ), + Container( + width: 100, + height: 100, + child: GFBorder( + type: GFBorderType.circle, + dashedLine: [3, 1], + color: Color(0xFF19CA4B), + child: Container( + child: Image.asset( + 'lib/assets/images/img1.png', + width: MediaQuery.of(context).size.width, + fit: BoxFit.fitWidth, + ), + ), + ), + ), + ], + ), + SizedBox(height: 40) + ], + ), + ), + ); + } +} diff --git a/lib/screens/border/dottedborder.dart b/lib/screens/border/dottedborder.dart new file mode 100644 index 0000000..2f79e8c --- /dev/null +++ b/lib/screens/border/dottedborder.dart @@ -0,0 +1,234 @@ +import 'package:flutter/material.dart'; +import 'package:getwidget/getwidget.dart'; +import 'package:gf_web/screens/layout/layout.dart'; +import 'package:gf_web/styles/styles.dart'; + +class DottedBorder extends StatefulWidget { + @override + _DottedBorderState createState() => _DottedBorderState(); +} + +class _DottedBorderState extends State { + bool fav = false; + bool fav1 = false; + bool fav2 = false; + @override + Widget build(BuildContext context) { + return Scaffold( + body: Layout( + demoImageUrl: 'lib/assets/gif/Borders.gif', + body: ListView( + children: [ + Text( + 'Border', + style: hintStyleTextblackbolder(), + ), + SizedBox( + height: 20, + ), + Text( + "The most basic way is to wrap your widget in a DecoratedBox.A border of a box, comprised of four sides: top, right, bottom, left.", + style: hintStyleTextblackdull(), + ), + const Padding( + padding: EdgeInsets.only(left: 15, top: 30, bottom: 10), + child: GFTypography( + child: Text( + 'Dotted Borders', + style: TextStyle( + fontSize: 20.0, + color: Colors.black, + fontWeight: FontWeight.w600, + ), + ), + type: GFTypographyType.typo5, + dividerWidth: 45, + dividerColor: Color(0xFF19CA4B), text: '', + ), + ), + Container( + margin: EdgeInsets.symmetric(horizontal: 15, vertical: 15), + child: GFBorder( + color: Color(0xFF19CA4B), + dashedLine: [2, 1], + type: GFBorderType.rect, + child: Container( + height: 100, + color: Color(0xFFE9FFEF), + ), + ), + ), + Container( + margin: EdgeInsets.symmetric(horizontal: 15, vertical: 15), + child: GFBorder( + color: Color(0xFF19CA4B), + dashedLine: [2, 1], + type: GFBorderType.rect, + child: Image.asset( + 'lib/assets/images/image1.png', + width: MediaQuery.of(context).size.width, + fit: BoxFit.fitWidth, + ), + ), + ), + const Padding( + padding: EdgeInsets.only(left: 15, top: 30, bottom: 10), + child: GFTypography( + child: Text( + 'Dotted border with radius', + style: TextStyle( + fontSize: 20.0, + color: Colors.black, + fontWeight: FontWeight.w600, + ), + ), + type: GFTypographyType.typo5, + dividerWidth: 45, + dividerColor: Color(0xFF19CA4B), text: '', + ), + ), + Container( + margin: EdgeInsets.symmetric(horizontal: 15, vertical: 15), + child: GFBorder( + radius: Radius.circular(20), + color: Color(0xFF19CA4B), + dashedLine: [2, 1], + type: GFBorderType.rect, + child: Container( + height: 100, + color: Color(0xFFE9FFEF), + ), + ), + ), + Container( + margin: EdgeInsets.symmetric(horizontal: 15, vertical: 15), + child: GFBorder( + radius: Radius.circular(20), + color: Color(0xFF19CA4B), + dashedLine: [2, 1], + type: GFBorderType.rRect, + child: GFCard( + boxFit: BoxFit.cover, + colorFilter: ColorFilter.mode( + Colors.black.withOpacity(0.40), BlendMode.darken), + imageOverlay: + const AssetImage('lib/assets/images/image1.png'), + title: GFListTile( + title: Text( + 'Card Title', + style: TextStyle( + color: Colors.grey, fontWeight: FontWeight.w500), + ), + subTitle: Text( + 'subtitle', + style: TextStyle(color: Colors.grey), + ), + ), + content: Text( + 'GetWidget is an open source library that comes with pre-build 1000+ UI components', + style: TextStyle(color: Colors.grey), + ), + buttonBar: GFButtonBar( + padding: const EdgeInsets.only(bottom: 20), + children: [ + GFIconButton( + color: const Color(0xFF3B5998), + shape: GFIconButtonShape.circle, + icon: const Icon( + IconData(0xe908, fontFamily: 'GFSocialFonts'), + color: Colors.white, + size: 20, + ), + onPressed: () {}), + ], + ), + ), + ), + ), + const Padding( + padding: EdgeInsets.only(left: 15, top: 30, bottom: 10), + child: GFTypography( + child: Text( + 'Rounded Corners', + style: TextStyle( + fontSize: 20.0, + color: Colors.black, + fontWeight: FontWeight.w600, + ), + ), + type: GFTypographyType.typo5, + dividerWidth: 45, + dividerColor: Color(0xFF19CA4B), text: '', + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Container( + height: 60, + child: GFBorder( + type: GFBorderType.oval, + dashedLine: [2, 1], + color: Color(0xFF19CA4B), + child: Center(child: Text('Oval Border')), + ), + ), + Container( + width: 130, + height: 90, + child: GFBorder( + type: GFBorderType.oval, + dashedLine: [2, 1], + color: Color(0xFF19CA4B), + child: Center( + child: Image.asset( + 'lib/assets/images/img.png', + fit: BoxFit.fitWidth, + )), + ), + ), + ], + ), + SizedBox(height: 15), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Container( + width: 100, + height: 100, + child: GFBorder( + type: GFBorderType.circle, + dashedLine: [2, 1], + color: Color(0xFF19CA4B), + child: Center( + child: Text( + 'Circular Border', + textAlign: TextAlign.center, + )), + ), + ), + Container( + width: 100, + height: 100, + child: GFBorder( + type: GFBorderType.circle, + dashedLine: [2, 1], + color: Color(0xFF19CA4B), + child: Container( + child: Image.asset( + 'lib/assets/images/img1.png', + width: MediaQuery.of(context).size.width, + fit: BoxFit.fitWidth, + ), + ), + ), + ), + ], + ), + SizedBox(height: 40) + ], + ), + ), + ); + } +} diff --git a/lib/screens/border/solidborder.dart b/lib/screens/border/solidborder.dart new file mode 100644 index 0000000..415b732 --- /dev/null +++ b/lib/screens/border/solidborder.dart @@ -0,0 +1,231 @@ +import 'package:flutter/material.dart'; +import 'package:getwidget/getwidget.dart'; +import 'package:gf_web/screens/layout/layout.dart'; +import 'package:gf_web/styles/styles.dart'; + +class SolidBorder extends StatefulWidget { + @override + _SolidBorderState createState() => _SolidBorderState(); +} + +class _SolidBorderState extends State { + bool fav = false; + bool fav1 = false; + bool fav2 = false; + @override + Widget build(BuildContext context) { + return Scaffold( + body: Layout( + demoImageUrl: 'lib/assets/gif/Borders.gif', + body: ListView( + children: [ + Text( + 'Border', + style: hintStyleTextblackbolder(), + ), + SizedBox( + height: 20, + ), + Text( + "The most basic way is to wrap your widget in a DecoratedBox.A border of a box, comprised of four sides: top, right, bottom, left.", + style: hintStyleTextblackdull(), + ), + const Padding( + padding: EdgeInsets.only(left: 15, top: 30, bottom: 10), + child: GFTypography( + child: Text( + 'Solid Borders', + style: TextStyle( + fontSize: 20.0, + color: Colors.black, + fontWeight: FontWeight.w600, + ), + ), + type: GFTypographyType.typo5, + dividerWidth: 45, + dividerColor: Color(0xFF19CA4B), text: '', + ), + ), + Container( + margin: EdgeInsets.symmetric(horizontal: 15, vertical: 15), + child: GFBorder( + color: Color(0xFF19CA4B), + dashedLine: [2, 0], + type: GFBorderType.rect, + child: Container( + height: 100, + color: Color(0xFFE9FFEF), + ), + ), + ), + Container( + margin: EdgeInsets.symmetric(horizontal: 15, vertical: 15), + child: GFBorder( + color: Color(0xFF19CA4B), + dashedLine: [2, 0], + type: GFBorderType.rect, + child: Image.asset( + 'lib/assets/images/card.png', + width: MediaQuery.of(context).size.width, + fit: BoxFit.fitWidth, + ), + ), + ), + const Padding( + padding: EdgeInsets.only(left: 15, top: 30, bottom: 10), + child: GFTypography( + child: Text( + 'Solid borders with radius', + style: TextStyle( + fontSize: 20.0, + color: Colors.black, + fontWeight: FontWeight.w600, + ), + ), + type: GFTypographyType.typo5, + dividerWidth: 45, + dividerColor: Color(0xFF19CA4B), text: '', + ), + ), + Container( + margin: EdgeInsets.symmetric(horizontal: 15, vertical: 15), + child: GFBorder( + radius: Radius.circular(20), + color: Color(0xFF19CA4B), + dashedLine: [2, 0], + type: GFBorderType.rRect, + child: Container( + height: 100, + color: Color(0xFFE9FFEF), + ), + ), + ), + Container( + margin: EdgeInsets.symmetric(horizontal: 15, vertical: 15), + child: GFBorder( + radius: Radius.circular(20), + color: Color(0xFF19CA4B), + dashedLine: [2, 0], + type: GFBorderType.rRect, + child: GFCard( + boxFit: BoxFit.cover, + image: Image.asset( + 'lib/assets/images/card.png', + width: MediaQuery.of(context).size.width, + fit: BoxFit.fitWidth, + ), + titlePosition: GFPosition.end, + title: GFListTile( + titleText: 'Card Title', + icon: GFIconButton( + onPressed: null, + icon: GestureDetector( + onTap: () { + setState(() { + fav = !fav; + }); + }, + child: fav + ? Icon( + Icons.favorite, + color: GFColors.DANGER, + ) + : Icon(Icons.favorite_border), + ), + type: GFButtonType.transparent, + ), + ), + ), + ), + ), + const Padding( + padding: EdgeInsets.only(left: 15, top: 30, bottom: 10), + child: GFTypography( + child: Text( + 'Rounded Corners', + style: TextStyle( + fontSize: 20.0, + color: Colors.black, + fontWeight: FontWeight.w600, + ), + ), + type: GFTypographyType.typo5, + dividerWidth: 45, + dividerColor: Color(0xFF19CA4B), text: '', + ), + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Container( + height: 60, + child: GFBorder( + type: GFBorderType.oval, + dashedLine: [6, 0], + color: Color(0xFF19CA4B), + strokeWidth: 2, + child: Center(child: Text('Oval Border')), + ), + ), + Container( + width: 130, + height: 90, + child: GFBorder( + type: GFBorderType.oval, + dashedLine: [6, 0], + color: Color(0xFF19CA4B), + strokeWidth: 2, + child: Center( + child: Image.asset( + 'lib/assets/images/img.png', + fit: BoxFit.fitWidth, + )), + ), + ), + ], + ), + SizedBox(height: 15), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + Container( + width: 100, + height: 100, + child: GFBorder( + type: GFBorderType.circle, + dashedLine: [2, 0], + color: Color(0xFF19CA4B), + strokeWidth: 2, + child: Center( + child: Text( + 'Circular Border', + textAlign: TextAlign.center, + )), + ), + ), + Container( + width: 100, + height: 100, + child: GFBorder( + type: GFBorderType.circle, + dashedLine: [2, 0], + color: Color(0xFF19CA4B), + strokeWidth: 2, + child: Container( + child: Image.asset( + 'lib/assets/images/img1.png', + width: MediaQuery.of(context).size.width, + fit: BoxFit.fitWidth, + ), + ), + ), + ), + ], + ), + SizedBox(height: 40) + ], + ), + ), + ); + } +} diff --git a/lib/screens/bottomsheet/bottomsheet.dart b/lib/screens/bottomsheet/bottomsheet.dart index 183cf55..4dc23ce 100644 --- a/lib/screens/bottomsheet/bottomsheet.dart +++ b/lib/screens/bottomsheet/bottomsheet.dart @@ -16,70 +16,84 @@ class _BottomSheetState extends State { return Scaffold( bottomSheet: GFBottomSheet( controller: _controller, -//animationDuration: 800, -// minContentHeight: 100, - maxContentHeight: 200, -// elevation: 10, + maxContentHeight: 300, enableExpandableContent: true, stickyHeaderHeight: 90, stickyHeader: Container( - decoration: BoxDecoration(color: Colors.white, - // borderRadius: BorderRadius.circular(10), + decoration: BoxDecoration( + color: Colors.grey[100], boxShadow: [BoxShadow(color: Colors.black45, blurRadius: 0)]), -// height: 100, child: const GFListTile( avatar: GFAvatar( - backgroundImage: AssetImage('lib/assets/images/gflogo.png'), + backgroundImage: AssetImage('lib/assets/images/img.png'), ), - titleText: 'GetWidget', - subtitleText: 'Open source UI library', + titleText: 'Eva Mendez', + subTitleText: '11 minutes ago', ), ), - contentBody: Container( - margin: EdgeInsets.symmetric(horizontal: 15, vertical: 0), - child: ListView( - shrinkWrap: true, - physics: const ScrollPhysics(), - children: const [ - Center( - child: Text( - 'Getwidget reduces your overall app development time to minimum 30% because of its pre-build clean UI widget that you can use in flutter app development. We have spent more than 1000+ hours to build this library to make flutter developer’s life easy.', - style: TextStyle( - fontSize: 15, wordSpacing: 0.3, letterSpacing: 0.2), - )) - ], - ), - ), - stickyFooter: Container( - color: GFColors.SUCCESS, - height: 100, - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - Text( - 'Get in touch', - style: TextStyle( - fontSize: 18, - fontWeight: FontWeight.bold, - color: Colors.white), - ), - Text( - 'info@getwidget.dev', - style: TextStyle(fontSize: 15, color: Colors.white), - ), - ], + contentBody: SingleChildScrollView( + child: Container( + margin: EdgeInsets.symmetric(horizontal: 15, vertical: 10), + child: Column( + children: [ + Container( + margin: EdgeInsets.symmetric(horizontal: 15), + child: Row( + children: [ + Container( + width: 30, + height: 30, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(50), + image: DecorationImage( + image: + AssetImage('lib/assets/images/img1.png'))), + ), + Container( + margin: EdgeInsets.only(left: 6), + child: Text( + 'Add to your story', + style: TextStyle(color: Colors.blue), + )) + ], + ), + ), + ListView.builder( + physics: ScrollPhysics(), + shrinkWrap: true, + scrollDirection: Axis.vertical, + itemCount: 3, + itemBuilder: (BuildContext context, int index) { + return SingleChildScrollView( + child: InkWell( + child: GFListTile( + avatar: GFAvatar( + backgroundImage: + AssetImage('lib/assets/images/img2.png'), + size: 20, + ), + subTitleText: 'John Mendez', + icon: Container( + width: 66, + height: 30, + child: GFButton( + onPressed: () {}, + color: GFColors.PRIMARY, + child: Center( + child: Text( + 'Send', + style: TextStyle(color: Colors.white), + )), + ), + ), + ), + )); + }), + ], + ), ), ), - stickyFooterHeight: 50, ), - floatingActionButton: FloatingActionButton( - backgroundColor: GFColors.SUCCESS, - child: const Icon(Icons.keyboard_arrow_down), - onPressed: () { - _controller.isBottomSheetOpened - ? _controller.hideBottomSheet() - : _controller.showBottomSheet(); - }), body: Layout( demoImageUrl: 'lib/assets/gif/bottomsheet.gif', body: ListView( @@ -95,6 +109,10 @@ class _BottomSheetState extends State { "The BottomSheet can be used to open panels to the bottom of the screen.", style: hintStyleTextblackdull(), ), + SizedBox( + height: 20, + ), + buildPostImage(), SizedBox( height: 20, ) @@ -103,4 +121,59 @@ class _BottomSheetState extends State { ), ); } + + Widget buildPostImage() { + return Stack( + children: [ + Container( + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.height * 0.5, + decoration: BoxDecoration( + image: DecorationImage( + image: AssetImage('lib/assets/images/story.jpg'), + fit: BoxFit.fill, + colorFilter: new ColorFilter.mode( + Colors.black.withOpacity(0.2), BlendMode.darken), + )), + ), + Positioned( + bottom: 0, + child: Container( + width: MediaQuery.of(context).size.width, + height: 83, + padding: EdgeInsets.all(10), + color: Colors.black.withOpacity(0.30), + child: Column( + children: [ + Row( + children: [ + Text( + 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr.', + style: TextStyle(color: Colors.white), + ), + ], + ), + SizedBox(height: 10), + Row( + children: [ + Text( + '123 Likes .', + style: TextStyle(color: Colors.white), + ), + Text( + ' 86 Comments .', + style: TextStyle(color: Colors.white), + ), + Text( + ' 19 Shares', + style: TextStyle(color: Colors.white), + ), + ], + ) + ], + ), + )) + ], + ); + } } diff --git a/lib/screens/buttons/icon-buttons.dart b/lib/screens/buttons/icon-buttons.dart index 9fa14d7..c7a62ff 100644 --- a/lib/screens/buttons/icon-buttons.dart +++ b/lib/screens/buttons/icon-buttons.dart @@ -30,10 +30,6 @@ class _IconButtonsState extends State { SizedBox( height: 30, ), - // Text( - // 'Solid Icons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -42,6 +38,7 @@ class _IconButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Solid', style: hintStyleTextblackbold(), @@ -65,10 +62,6 @@ class _IconButtonsState extends State { ), color: GFColors.WHITE, ), - // SvgPicture.asset( - // 'lib/assets/icons/primary.svg', - // // color: getGFColor(GFColors.WHITE), - // ) )), SizedBox( width: 5, @@ -134,9 +127,6 @@ class _IconButtonsState extends State { color: GFColors.WHITE, ), )), - // SizedBox( - // width: 10, - // ), ], ), SizedBox( @@ -202,7 +192,6 @@ class _IconButtonsState extends State { 0xe909, fontFamily: 'icomoon', ), - // color: getGFColor(GFColors.WHITE), ), )), SizedBox( @@ -216,11 +205,6 @@ class _IconButtonsState extends State { SizedBox( height: 20, ), - //outline icons - // Text( - // 'Outline Icons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -229,6 +213,7 @@ class _IconButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Outline', style: hintStyleTextblackbold(), @@ -251,7 +236,6 @@ class _IconButtonsState extends State { 0xe90c, fontFamily: 'icomoon', ), - // color: getGFColor(GFColors.WHITE), ), )), SizedBox( @@ -268,7 +252,6 @@ class _IconButtonsState extends State { 0xe90d, fontFamily: 'icomoon', ), - // color: getGFColor(GFColors.WHITE), ), )), SizedBox( @@ -285,7 +268,6 @@ class _IconButtonsState extends State { 0xe90f, fontFamily: 'icomoon', ), - // color: getGFColor(GFColors.WHITE), ), )), SizedBox( @@ -302,7 +284,6 @@ class _IconButtonsState extends State { 0xe911, fontFamily: 'icomoon', ), - // color: getGFColor(GFColors.WHITE), ), )), SizedBox( @@ -319,7 +300,6 @@ class _IconButtonsState extends State { 0xe901, fontFamily: 'icomoon', ), - // color: getGFColor(GFColors.WHITE), ), )), SizedBox( @@ -343,7 +323,6 @@ class _IconButtonsState extends State { 0xe907, fontFamily: 'icomoon', ), - // color: getGFColor(GFColors.WHITE), ), )), SizedBox( @@ -360,7 +339,6 @@ class _IconButtonsState extends State { 0xe908, fontFamily: 'icomoon', ), - // color: getGFColor(GFColors.WHITE), ), )), SizedBox( @@ -377,7 +355,6 @@ class _IconButtonsState extends State { 0xe902, fontFamily: 'icomoon', ), - // color: getGFColor(GFColors.WHITE), ), )), SizedBox( @@ -394,7 +371,6 @@ class _IconButtonsState extends State { 0xe909, fontFamily: 'icomoon', ), - // color: getGFColor(GFColors.WHITE), ), )), SizedBox( @@ -411,12 +387,6 @@ class _IconButtonsState extends State { SizedBox( height: 20, ), - -//outline 2x icons - // Text( - // 'Outline 2x Icons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -425,6 +395,7 @@ class _IconButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Outline 2x', style: hintStyleTextblackbold(), @@ -447,7 +418,6 @@ class _IconButtonsState extends State { 0xe90c, fontFamily: 'icomoon', ), - // color: getGFColor(GFColors.WHITE), ), )), SizedBox( @@ -464,7 +434,6 @@ class _IconButtonsState extends State { 0xe90d, fontFamily: 'icomoon', ), - // color: getGFColor(GFColors.WHITE), ), )), SizedBox( @@ -481,7 +450,6 @@ class _IconButtonsState extends State { 0xe90f, fontFamily: 'icomoon', ), - // color: getGFColor(GFColors.WHITE), ), )), SizedBox( @@ -498,7 +466,6 @@ class _IconButtonsState extends State { 0xe911, fontFamily: 'icomoon', ), - // color: getGFColor(GFColors.WHITE), ), )), SizedBox( @@ -515,7 +482,6 @@ class _IconButtonsState extends State { 0xe901, fontFamily: 'icomoon', ), - // color: getGFColor(GFColors.WHITE), ), )), SizedBox( @@ -539,7 +505,6 @@ class _IconButtonsState extends State { 0xe907, fontFamily: 'icomoon', ), - // color: getGFColor(GFColors.WHITE), ), )), SizedBox( @@ -556,7 +521,6 @@ class _IconButtonsState extends State { 0xe908, fontFamily: 'icomoon', ), - // color: getGFColor(GFColors.WHITE), ), )), SizedBox( @@ -573,7 +537,6 @@ class _IconButtonsState extends State { 0xe902, fontFamily: 'icomoon', ), - // color: getGFColor(GFColors.WHITE), ), )), SizedBox( @@ -590,7 +553,6 @@ class _IconButtonsState extends State { 0xe909, fontFamily: 'icomoon', ), - // color: getGFColor(GFColors.WHITE), ), )), SizedBox( @@ -607,11 +569,6 @@ class _IconButtonsState extends State { SizedBox( height: 20, ), -//square icons - // Text( - // 'Square Icons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -620,6 +577,7 @@ class _IconButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Square', style: hintStyleTextblackbold(), @@ -784,7 +742,6 @@ class _IconButtonsState extends State { 0xe909, fontFamily: 'icomoon', ), - // color: getGFColor(GFColors.WHITE), ), )), SizedBox( @@ -801,11 +758,6 @@ class _IconButtonsState extends State { SizedBox( height: 20, ), -//pills icons - // Text( - // 'Pills Icons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -814,6 +766,7 @@ class _IconButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Pills', style: hintStyleTextblackbold(), @@ -978,12 +931,8 @@ class _IconButtonsState extends State { 0xe909, fontFamily: 'icomoon', ), - // color: getGFColor(GFColors.WHITE), ), )), - // SizedBox( - // width: 10, - // ), ], ), ], @@ -992,11 +941,6 @@ class _IconButtonsState extends State { SizedBox( height: 20, ), -//shadow icons - // Text( - // 'Shadow Icons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -1005,6 +949,7 @@ class _IconButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Shadow', style: hintStyleTextblackbold(), @@ -1186,226 +1131,6 @@ class _IconButtonsState extends State { SizedBox( height: 20, ), - -// - // Text('Disabled Buttons', style: hintStyleTextblackbold(),), - // GFCard( - // content: Column( - // children: [ - // Row( - // children: [ - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Primary', - // icon: SvgPicture.asset( - // 'lib/assets/icons/primary.svg') - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Secondary', - // color: GFColors.SECONDARY, - // icon: SvgPicture.asset( - // 'lib/assets/icons/secondary.svg') - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Success', - // color: GFColors.SUCCESS, - // icon: SvgPicture.asset( - // 'lib/assets/icons/success.svg') - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Warning', - // color: GFColors.WARNING, - // icon: SvgPicture.asset( - // 'lib/assets/icons/warning.svg') - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'danger', - // color: GFColors.DANGER, - // icon: SvgPicture.asset( - // 'lib/assets/icons/danger.svg') - // )) - // ], - // ), - // SizedBox( - // height: 20, - // ), - // Row( - // children: [ - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Info', - // color: GFColors.INFO, - // icon: SvgPicture.asset( - // 'lib/assets/icons/info.svg') - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Light', - // color: GFColors.LIGHT, - // icon: SvgPicture.asset( - // 'lib/assets/icons/light.svg') - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Dark', - // color: GFColors.DARK, - // icon: SvgPicture.asset( - // 'lib/assets/icons/dark.svg') - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed: (){}, - // text: 'Link', - // color: GFColors.TRANSPARENT, - // icon: SvgPicture.asset( - // 'lib/assets/icons/link.svg') - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: Text('')) - - // ], - // ), - - // ], - // ), - // ), - - // SizedBox( - // height: 20, - // ), - - // Text('Transparent Buttons', style: hintStyleTextblackbold(),), - // GFCard( - // content: Column( - // children: [ - // Row( - // children: [ - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Primary', - // type: GFButtonType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Secondary', - // color: GFColors.SECONDARY, - // type: GFButtonType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Success', - // color: GFColors.SUCCESS, - // type: GFButtonType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Warning', - // color: GFColors.WARNING, - // type: GFButtonType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'danger', - // color: GFColors.DANGER, - // type: GFButtonType.transparent, - // )) - // ], - // ), - // SizedBox( - // height: 20, - // ), - // Row( - // children: [ - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Info', - // color: GFColors.INFO, - // type: GFButtonType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Light', - // color: GFColors.LIGHT, - // type: GFButtonType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Dark', - // color: GFColors.DARK, - // type: GFButtonType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed: (){}, - // text: 'Link', - // color: GFColors.TRANSPARENT, - // type: GFButtonType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: Text('')) - - // ], - // ), - - // ], - // ), - // ), - // SizedBox( - // height: 20, - // ), - - // Text( - // ' Button Sizes', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -1414,6 +1139,7 @@ class _IconButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Button Sizes', style: hintStyleTextblackbold(), @@ -1484,15 +1210,9 @@ class _IconButtonsState extends State { ], ), ), - SizedBox( height: 20, ), - - // Text( - // ' Block Buttons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -1501,6 +1221,7 @@ class _IconButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Block', style: hintStyleTextblackbold(), @@ -1586,13 +1307,13 @@ class _IconButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Icons Only', style: hintStyleTextblackbold(), ), ), ), - GFCard( content: Column( mainAxisAlignment: MainAxisAlignment.start, @@ -1605,10 +1326,6 @@ class _IconButtonsState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ GFIconButton( - // icon: SvgPicture.asset( - // 'lib/assets/icons/primary.svg', - // color: Colors.white, - // ), icon: Icon( IconData( 0xe90c, @@ -1619,10 +1336,6 @@ class _IconButtonsState extends State { onPressed: () {}), GFIconButton( color: GFColors.SECONDARY, - // icon: SvgPicture.asset( - // 'lib/assets/icons/secondary.svg', - // color: Colors.white, - // ), icon: Icon( IconData( 0xe90d, @@ -1633,10 +1346,6 @@ class _IconButtonsState extends State { onPressed: () {}), GFIconButton( color: GFColors.SUCCESS, - // icon: SvgPicture.asset( - // 'lib/assets/icons/success.svg', - // color: Colors.white, - // ), icon: Icon( IconData( 0xe90f, @@ -1647,10 +1356,6 @@ class _IconButtonsState extends State { onPressed: () {}), GFIconButton( color: GFColors.WARNING, - // icon: SvgPicture.asset( - // 'lib/assets/icons/warning.svg', - // color: Colors.white, - // ), icon: Icon( IconData( 0xe911, @@ -1661,10 +1366,6 @@ class _IconButtonsState extends State { onPressed: () {}), GFIconButton( color: GFColors.DANGER, - // icon: SvgPicture.asset( - // 'lib/assets/icons/danger.svg', - // color: Colors.white, - // ), icon: Icon( IconData( 0xe901, @@ -1683,10 +1384,6 @@ class _IconButtonsState extends State { children: [ GFIconButton( color: GFColors.INFO, - // icon: SvgPicture.asset( - // 'lib/assets/icons/info.svg', - // color: Colors.white, - // ), icon: Icon( IconData( 0xe907, @@ -1697,10 +1394,6 @@ class _IconButtonsState extends State { onPressed: () {}), GFIconButton( color: GFColors.LIGHT, - // icon: SvgPicture.asset( - // 'lib/assets/icons/light.svg', - // color: Colors.white, - // ), icon: Icon( IconData( 0xe908, @@ -1711,10 +1404,6 @@ class _IconButtonsState extends State { onPressed: () {}), GFIconButton( color: GFColors.DARK, - // icon: SvgPicture.asset( - // 'lib/assets/icons/dark.svg', - // color: Colors.white, - // ), icon: Icon( IconData( 0xe902, diff --git a/lib/screens/buttons/pills-buttons.dart b/lib/screens/buttons/pills-buttons.dart index c0afd40..8a8673d 100644 --- a/lib/screens/buttons/pills-buttons.dart +++ b/lib/screens/buttons/pills-buttons.dart @@ -30,10 +30,6 @@ class _PillButtonsState extends State { SizedBox( height: 30, ), - // Text( - // 'Solid Buttons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -42,6 +38,7 @@ class _PillButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Solid', style: hintStyleTextblackbold(), @@ -160,11 +157,6 @@ class _PillButtonsState extends State { SizedBox( height: 20, ), - - // Text( - // 'Disabled Buttons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -173,6 +165,7 @@ class _PillButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Disabled', style: hintStyleTextblackbold(), @@ -291,117 +284,9 @@ class _PillButtonsState extends State { ], ), ), - SizedBox( height: 20, ), - - // Text('Transparent Buttons', style: hintStyleTextblackbold(),), - // GFCard( - // content: Column( - // children: [ - // Row( - // children: [ - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Primary', - // type: GFButtonType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Secondary', - // color: GFColors.SECONDARY, - // type: GFType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Success', - // color: GFColors.SUCCESS, - // type: GFType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Warning', - // color: GFColors.WARNING, - // type: GFType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'danger', - // color: GFColors.DANGER, - // type: GFType.transparent, - // )) - // ], - // ), - // SizedBox( - // height: 20, - // ), - // Row( - // children: [ - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Info', - // color: GFColors.INFO, - // type: GFType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Light', - // color: GFColors.LIGHT, - // type: GFType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Dark', - // color: GFColors.DARK, - // type: GFType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed: (){}, - // text: 'Link', - // color: GFColors.TRANSPARENT, - // type: GFType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: Text('')) - - // ], - // ), - - // ], - // ), - // ), - // SizedBox( - // height: 20, - // ), - - // Text( - // ' Button Sizes', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -410,6 +295,7 @@ class _PillButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Button Sizes', style: hintStyleTextblackbold(), @@ -462,15 +348,9 @@ class _PillButtonsState extends State { ], ), ), - SizedBox( height: 20, ), - - // Text( - // ' Block Buttons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -479,6 +359,7 @@ class _PillButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Block', style: hintStyleTextblackbold(), @@ -538,11 +419,6 @@ class _PillButtonsState extends State { ], ), ), -// outline buttons - // Text( - // 'Outline Solid Buttons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -551,6 +427,7 @@ class _PillButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Outline Solid', style: hintStyleTextblackbold(), @@ -678,11 +555,6 @@ class _PillButtonsState extends State { SizedBox( height: 20, ), - - // Text( - // 'Outline Disabled Buttons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -691,6 +563,7 @@ class _PillButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Outline Disabled', style: hintStyleTextblackbold(), @@ -818,15 +691,9 @@ class _PillButtonsState extends State { ], ), ), - SizedBox( height: 20, ), - - // Text( - // 'Outline Button Sizes', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -835,6 +702,7 @@ class _PillButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Outline Button Sizes', style: hintStyleTextblackbold(), @@ -890,15 +758,9 @@ class _PillButtonsState extends State { ], ), ), - SizedBox( height: 20, ), - - // Text( - // 'Outline Block Buttons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -907,6 +769,7 @@ class _PillButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Outline Block', style: hintStyleTextblackbold(), @@ -960,11 +823,6 @@ class _PillButtonsState extends State { ], ), ), -//outline 2x buttons - // Text( - // 'Outline2x Solid Buttons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -973,6 +831,7 @@ class _PillButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Outline2x Solid', style: hintStyleTextblackbold(), @@ -1111,16 +970,13 @@ class _PillButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Disabled Outline', style: hintStyleTextblackbold(), ), ), ), - // Text( - // 'Disabled Outline Buttons', - // style: hintStyleTextblackbold(), - // ), GFCard( content: Column( children: [ @@ -1242,15 +1098,9 @@ class _PillButtonsState extends State { ], ), ), - SizedBox( height: 20, ), - - // Text( - // 'Outline Button Sizes', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -1259,6 +1109,7 @@ class _PillButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Outline Buttons Sizes', style: hintStyleTextblackbold(), @@ -1314,15 +1165,9 @@ class _PillButtonsState extends State { ], ), ), - SizedBox( height: 20, ), - - // Text( - // 'Outline Block Buttons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -1331,6 +1176,7 @@ class _PillButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Outline Block', style: hintStyleTextblackbold(), diff --git a/lib/screens/buttons/shadow-buttons.dart b/lib/screens/buttons/shadow-buttons.dart index 0e950a1..f21883c 100644 --- a/lib/screens/buttons/shadow-buttons.dart +++ b/lib/screens/buttons/shadow-buttons.dart @@ -158,221 +158,6 @@ class _ShadowButtonsState extends State { SizedBox( height: 20, ), - - // Text('Disabled Buttons', style: hintStyleTextblackbold(),), - // GFCard( - // content: Column( - // children: [ - // Row( - // children: [ - // Expanded(child: GFButton( - // shape: GFButtonShape.standard, - // buttonBoxShadow: true, - // onPressed:null, - // text: 'Primary', - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // shape: GFButtonShape.standard, - // buttonBoxShadow: true, - // text: 'Secondary', - // color: GFColors.SECONDARY, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // shape: GFButtonShape.standard, - // buttonBoxShadow: true, - // text: 'Success', - // color: GFColors.SUCCESS, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // shape: GFButtonShape.standard, - // buttonBoxShadow: true, - // text: 'Warning', - // color: GFColors.WARNING, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // shape: GFButtonShape.standard, - // buttonBoxShadow: true, - // text: 'danger', - // color: GFColors.DANGER, - // )) - // ], - // ), - // SizedBox( - // height: 20, - // ), - // Row( - // children: [ - // Expanded(child: GFButton( - // onPressed:null, - // shape: GFButtonShape.standard, - // buttonBoxShadow: true, - // text: 'Info', - // color: GFColors.INFO, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // shape: GFButtonShape.standard, - // buttonBoxShadow: true, - // text: 'Light', - // color: GFColors.LIGHT, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // shape: GFButtonShape.standard, - // buttonBoxShadow: true, - // text: 'Dark', - // color: GFColors.DARK, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed: (){}, - // shape: GFButtonShape.standard, - // buttonBoxShadow: true, - // text: 'Link', - // color: GFColors.TRANSPARENT, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: Text('')) - - // ], - // ), - - // ], - // ), - // ), - - // SizedBox( - // height: 20, - // ), - - // Text('Transparent Buttons', style: hintStyleTextblackbold(),), - // GFCard( - // content: Column( - // children: [ - // Row( - // children: [ - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Primary', - // type: GFType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Secondary', - // color: GFColors.SECONDARY, - // type: GFType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Success', - // color: GFColors.SUCCESS, - // type: GFType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Warning', - // color: GFColors.WARNING, - // type: GFType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'danger', - // color: GFColors.DANGER, - // type: GFType.transparent, - // )) - // ], - // ), - // SizedBox( - // height: 20, - // ), - // Row( - // children: [ - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Info', - // color: GFColors.INFO, - // type: GFType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Light', - // color: GFColors.LIGHT, - // type: GFType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed:null, - // text: 'Dark', - // color: GFColors.DARK, - // type: GFType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: GFButton( - // onPressed: (){}, - // text: 'Link', - // color: GFColors.TRANSPARENT, - // type: GFType.transparent, - // )), - // SizedBox( - // width: 10, - // ), - // Expanded(child: Text('')) - - // ], - // ), - - // ], - // ), - // ), - // SizedBox( - // height: 20, - // ), - Text( ' Button Sizes', style: hintStyleTextblackbold(), @@ -426,11 +211,9 @@ class _ShadowButtonsState extends State { ], ), ), - SizedBox( height: 20, ), - Text( ' Block Buttons', style: hintStyleTextblackbold(), diff --git a/lib/screens/buttons/social-buttons.dart b/lib/screens/buttons/social-buttons.dart index 4c92956..7ac04aa 100644 --- a/lib/screens/buttons/social-buttons.dart +++ b/lib/screens/buttons/social-buttons.dart @@ -30,10 +30,6 @@ class _SocialButtonsState extends State { SizedBox( height: 30, ), - // Text( - // 'Solid Buttons Full', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -42,6 +38,7 @@ class _SocialButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Solid Buttons Full', style: hintStyleTextblackbold(), @@ -56,7 +53,6 @@ class _SocialButtonsState extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - // Expanded( GFButton( buttonBoxShadow: true, color: Color(0xFF3B5998), @@ -72,11 +68,9 @@ class _SocialButtonsState extends State { color: GFColors.WHITE, ), ), - // ), SizedBox( width: 5, ), - // Expanded( GFButton( onPressed: () {}, child: Text("Twitter"), @@ -90,11 +84,9 @@ class _SocialButtonsState extends State { color: Color(0xFF00ACEE), buttonBoxShadow: true, ), - // ), SizedBox( width: 5, ), - // Expanded( GFButton( onPressed: () {}, child: Text( @@ -110,11 +102,9 @@ class _SocialButtonsState extends State { color: Color(0xFF25D366), buttonBoxShadow: true, ), - // ), SizedBox( width: 5, ), - // Expanded( GFButton( onPressed: () {}, child: Text( @@ -130,11 +120,9 @@ class _SocialButtonsState extends State { color: Color(0xFFDD4B39), buttonBoxShadow: true, ), - // ), SizedBox( width: 5, ), - // Expanded( GFButton( onPressed: () {}, child: Text( @@ -150,7 +138,6 @@ class _SocialButtonsState extends State { color: Color(0xFFEA4C89), buttonBoxShadow: true, ), - // ), ], ), SizedBox( @@ -159,16 +146,6 @@ class _SocialButtonsState extends State { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - // Expanded( - - // ), - // Expanded( - // SizedBox( - // height: 6, - // ), - // SizedBox( - // height: 6, - // ), GFButton( onPressed: () {}, child: Text( @@ -205,11 +182,6 @@ class _SocialButtonsState extends State { SizedBox( width: 5, ), - // ), - // SizedBox( - // height: 6, - // ), - // Expanded( GFButton( onPressed: () {}, child: Text( @@ -231,11 +203,6 @@ class _SocialButtonsState extends State { SizedBox( width: 5, ), - // ), - // SizedBox( - // height: 6, - // ), - // Expanded( GFButton( onPressed: () {}, child: Text( @@ -251,25 +218,6 @@ class _SocialButtonsState extends State { color: Color(0XFFC8232C), buttonBoxShadow: true, ), - // ), - // SizedBox( - // height: 10, - // ), - // GFButton( - // child: Text(''), - // onPressed: () {}, - // color: GFColors.WHITE, - // ), - // GFButton( - // child: Text(''), - // onPressed: () {}, - // color: GFColors.WHITE, - // ), - // GFButton( - // child: Text(''), - // onPressed: () {}, - // color: GFColors.WHITE, - // ) ], ), SizedBox( @@ -278,12 +226,6 @@ class _SocialButtonsState extends State { ], ), ), - -//social buttons icons - // Text( - // 'Social Buttons Icons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -292,6 +234,7 @@ class _SocialButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Social Buttons Icons', style: hintStyleTextblackbold(), @@ -448,11 +391,6 @@ class _SocialButtonsState extends State { ], ), ), -//shadow icons - // Text( - // 'Floating Social Buttons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -461,6 +399,7 @@ class _SocialButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Floating Social Buttons', style: hintStyleTextblackbold(), diff --git a/lib/screens/buttons/square-buttons.dart b/lib/screens/buttons/square-buttons.dart index 4d7d98c..b693a19 100644 --- a/lib/screens/buttons/square-buttons.dart +++ b/lib/screens/buttons/square-buttons.dart @@ -30,10 +30,6 @@ class _SquareButtonsState extends State { SizedBox( height: 30, ), - // Text( - // 'Solid Buttons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -42,6 +38,7 @@ class _SquareButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Solid', style: hintStyleTextblackbold(), @@ -163,11 +160,6 @@ class _SquareButtonsState extends State { SizedBox( height: 20, ), - - // Text( - // 'Disabled Buttons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -176,6 +168,7 @@ class _SquareButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Disabled', style: hintStyleTextblackbold(), @@ -294,11 +287,9 @@ class _SquareButtonsState extends State { ], ), ), - SizedBox( height: 20, ), - Padding( padding: EdgeInsets.only( left: 15, @@ -307,6 +298,7 @@ class _SquareButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Button Sizes', style: hintStyleTextblackbold(), @@ -359,11 +351,9 @@ class _SquareButtonsState extends State { ], ), ), - SizedBox( height: 20, ), - Padding( padding: EdgeInsets.only( left: 15, @@ -372,6 +362,7 @@ class _SquareButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Block', style: hintStyleTextblackbold(), @@ -431,11 +422,6 @@ class _SquareButtonsState extends State { ], ), ), - //outline buttons - // Text( - // 'Solid Outline Buttons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -444,6 +430,7 @@ class _SquareButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Solid Outline', style: hintStyleTextblackbold(), @@ -571,11 +558,6 @@ class _SquareButtonsState extends State { SizedBox( height: 20, ), - - // Text( - // 'Disabled Outline Buttons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -584,6 +566,7 @@ class _SquareButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Disabled Outline', style: hintStyleTextblackbold(), @@ -708,15 +691,9 @@ class _SquareButtonsState extends State { ], ), ), - SizedBox( height: 20, ), - - // Text( - // 'Outline Button Sizes', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -725,6 +702,7 @@ class _SquareButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Outline Button Sizes', style: hintStyleTextblackbold(), @@ -780,15 +758,9 @@ class _SquareButtonsState extends State { ], ), ), - SizedBox( height: 20, ), - - // Text( - // ' Block Buttons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -797,6 +769,7 @@ class _SquareButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Block', style: hintStyleTextblackbold(), @@ -853,11 +826,6 @@ class _SquareButtonsState extends State { ], ), ), - //outline 2x buttons - // Text( - // 'Solid Outline Buttons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -866,6 +834,7 @@ class _SquareButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Solid Outline', style: hintStyleTextblackbold(), @@ -996,11 +965,6 @@ class _SquareButtonsState extends State { SizedBox( height: 20, ), - - // Text( - // 'Disabled Outline Buttons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -1009,6 +973,7 @@ class _SquareButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Disabled Outline', style: hintStyleTextblackbold(), @@ -1133,15 +1098,9 @@ class _SquareButtonsState extends State { ], ), ), - SizedBox( height: 20, ), - - // Text( - // 'Outline Button Sizes', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -1150,6 +1109,7 @@ class _SquareButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Outline Button Sizes', style: hintStyleTextblackbold(), @@ -1205,15 +1165,9 @@ class _SquareButtonsState extends State { ], ), ), - SizedBox( height: 20, ), - - // Text( - // ' Block Buttons', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -1222,6 +1176,7 @@ class _SquareButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Block', style: hintStyleTextblackbold(), diff --git a/lib/screens/buttons/standard-buttons.dart b/lib/screens/buttons/standard-buttons.dart index e542d97..a78fa85 100644 --- a/lib/screens/buttons/standard-buttons.dart +++ b/lib/screens/buttons/standard-buttons.dart @@ -30,17 +30,15 @@ class _StandardButtonsState extends State { SizedBox( height: 30, ), - // Text('Solid Buttons', style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, ), child: GFTypography( - // text: 'Solid', type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Solid ', style: hintStyleTextblackbold(), @@ -151,7 +149,6 @@ class _StandardButtonsState extends State { SizedBox( height: 20, ), - Padding( padding: EdgeInsets.only( left: 15, @@ -160,6 +157,7 @@ class _StandardButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Disabled ', style: hintStyleTextblackbold(), @@ -264,11 +262,9 @@ class _StandardButtonsState extends State { ], ), ), - SizedBox( height: 20, ), - Padding( padding: EdgeInsets.only( left: 15, @@ -277,6 +273,7 @@ class _StandardButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Transparent ', style: hintStyleTextblackbold(), @@ -393,8 +390,6 @@ class _StandardButtonsState extends State { SizedBox( height: 20, ), - - // Text(' Button Sizes', style: hintStyleTextblackbold(),), Padding( padding: EdgeInsets.only( left: 15, @@ -403,6 +398,7 @@ class _StandardButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Button Sizes ', style: hintStyleTextblackbold(), @@ -452,12 +448,9 @@ class _StandardButtonsState extends State { ], ), ), - SizedBox( height: 20, ), - - // Text(' Block Buttons', style: hintStyleTextblackbold(),), Padding( padding: EdgeInsets.only( left: 15, @@ -466,6 +459,7 @@ class _StandardButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Block', style: hintStyleTextblackbold(), @@ -516,8 +510,6 @@ class _StandardButtonsState extends State { ], ), ), - //outline buttons - // Text(' Solid Outline Buttons', style: hintStyleTextblackbold(),), Padding( padding: EdgeInsets.only( left: 15, @@ -526,13 +518,13 @@ class _StandardButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Solid Outline ', style: hintStyleTextblackbold(), ), ), ), - GFCard( content: Column( mainAxisAlignment: MainAxisAlignment.start, @@ -633,7 +625,6 @@ class _StandardButtonsState extends State { ], ), ), - // Text(' Disabled Outline Buttons', style: hintStyleTextblackbold(),), Padding( padding: EdgeInsets.only( left: 15, @@ -642,13 +633,13 @@ class _StandardButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Disabled Outline', style: hintStyleTextblackbold(), ), ), ), - GFCard( content: Column( mainAxisAlignment: MainAxisAlignment.start, @@ -749,7 +740,6 @@ class _StandardButtonsState extends State { ], ), ), - // Text('Button Sizes', style: hintStyleTextblackbold(),), Padding( padding: EdgeInsets.only( left: 15, @@ -758,6 +748,7 @@ class _StandardButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Button Sizes', style: hintStyleTextblackbold(), @@ -810,7 +801,6 @@ class _StandardButtonsState extends State { ], ), ), - // Text(' Block Outline Buttons', style: hintStyleTextblackbold(),), Padding( padding: EdgeInsets.only( left: 15, @@ -819,6 +809,7 @@ class _StandardButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Block Outline', style: hintStyleTextblackbold(), @@ -875,8 +866,6 @@ class _StandardButtonsState extends State { ], ), ), -//outline 2x buttons -// Text(' Solid Outline Buttons', style: hintStyleTextblackbold(),), Padding( padding: EdgeInsets.only( left: 15, @@ -885,13 +874,13 @@ class _StandardButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Solid Outline', style: hintStyleTextblackbold(), ), ), ), - GFCard( content: Column( mainAxisAlignment: MainAxisAlignment.start, @@ -995,7 +984,6 @@ class _StandardButtonsState extends State { ], ), ), - // Text(' Disabled Outline Buttons', style: hintStyleTextblackbold(),), Padding( padding: EdgeInsets.only( left: 15, @@ -1004,13 +992,13 @@ class _StandardButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Disabled Outline', style: hintStyleTextblackbold(), ), ), ), - GFCard( content: Column( mainAxisAlignment: MainAxisAlignment.start, @@ -1111,7 +1099,6 @@ class _StandardButtonsState extends State { ], ), ), - // Text('Outline Button Sizes', style: hintStyleTextblackbold(),), Padding( padding: EdgeInsets.only( left: 15, @@ -1120,6 +1107,7 @@ class _StandardButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Outline Button Sizes', style: hintStyleTextblackbold(), @@ -1172,7 +1160,6 @@ class _StandardButtonsState extends State { ], ), ), - // Text(' Block Outline Buttons', style: hintStyleTextblackbold(),), Padding( padding: EdgeInsets.only( left: 15, @@ -1181,6 +1168,7 @@ class _StandardButtonsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Block Outline Buttons', style: hintStyleTextblackbold(), diff --git a/lib/screens/cards/cards.dart b/lib/screens/cards/cards.dart index 0de6a66..53301cc 100644 --- a/lib/screens/cards/cards.dart +++ b/lib/screens/cards/cards.dart @@ -34,10 +34,6 @@ class _CardsState extends State { SizedBox( height: 30, ), - // Text( - // 'Basic Cards', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -46,6 +42,7 @@ class _CardsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Basic', style: hintStyleTextblackbold(), @@ -62,17 +59,13 @@ class _CardsState extends State { padding: const EdgeInsets.only(top: 5.0, bottom: 5.0), child: GFCard( boxFit: BoxFit.cover, - colorFilter: new ColorFilter.mode( Colors.black.withOpacity(0.67), BlendMode.darken), image: Image.asset( 'lib/assets/images/card.png', width: MediaQuery.of(context).size.width, fit: BoxFit.fitWidth, - // width: 300, - // height: 400, ), -// imageOverlay: AssetImage("lib/assets/food.jpeg"), titlePosition: GFPosition.end, title: GFListTile( title: Text('Card Title', @@ -102,7 +95,6 @@ class _CardsState extends State { style: TextStyle(fontSize: 16.0, color: Colors.grey), ), buttonBar: GFButtonBar( - // alignment: MainAxisAlignment.start, children: [ GFButton( onPressed: () {}, @@ -127,7 +119,6 @@ class _CardsState extends State { width: MediaQuery.of(context).size.width, fit: BoxFit.fitWidth, ), -// imageOverlay: AssetImage("lib/assets/food.jpeg"), titlePosition: GFPosition.end, title: GFListTile( title: @@ -155,7 +146,6 @@ class _CardsState extends State { style: TextStyle(fontSize: 16.0, color: Colors.grey), ), buttonBar: GFButtonBar( - // alignment: MainAxisAlignment.end, children: [ GFButton( onPressed: null, @@ -185,21 +175,18 @@ class _CardsState extends State { width: MediaQuery.of(context).size.width, fit: BoxFit.fitWidth, ), -// imageOverlay: AssetImage("lib/assets/food.jpeg"), titlePosition: GFPosition.end, title: GFListTile( title: Text( 'Card Title', style: TextStyle(fontSize: 19.0), ), - // showDivider: false, ), content: Text( "Some quick example text to build on the card", style: TextStyle(fontSize: 16.0, color: Colors.grey), ), buttonBar: GFButtonBar( - // alignment: MainAxisAlignment.start, children: [ GFButton( onPressed: () {}, @@ -219,21 +206,18 @@ class _CardsState extends State { width: MediaQuery.of(context).size.width, fit: BoxFit.fitWidth, ), -// imageOverlay: AssetImage("lib/assets/food.jpeg"), titlePosition: GFPosition.end, title: GFListTile( title: Text( 'Card Title', style: TextStyle(fontSize: 19.0), ), - // showDivider: false, ), content: Text( "Some quick example text to build on the card", style: TextStyle(fontSize: 16.0, color: Colors.grey), ), buttonBar: GFButtonBar( - // alignment: MainAxisAlignment.start, children: [ GFButton( onPressed: () {}, @@ -249,14 +233,9 @@ class _CardsState extends State { ) ], ), - SizedBox( height: 30, ), - // Text( - // 'Avatars', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -265,6 +244,7 @@ class _CardsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Avatars', style: hintStyleTextblackbold(), @@ -286,7 +266,6 @@ class _CardsState extends State { width: MediaQuery.of(context).size.width, fit: BoxFit.fitWidth, ), -// imageOverlay: AssetImage("lib/assets/food.jpeg"), titlePosition: GFPosition.end, title: GFListTile( avatar: GFAvatar( @@ -338,9 +317,7 @@ class _CardsState extends State { 'lib/assets/images/image1.png', width: MediaQuery.of(context).size.width, fit: BoxFit.fitWidth, - // height: 400.0, ), -// imageOverlay: AssetImage("lib/assets/food.jpeg"), titlePosition: GFPosition.end, title: GFListTile( avatar: GFAvatar( @@ -361,7 +338,6 @@ class _CardsState extends State { style: TextStyle(fontSize: 16.0, color: Colors.grey), ), buttonBar: GFButtonBar( - // alignment: MainAxisAlignment.center, children: [ Padding( padding: const EdgeInsets.only(bottom: 10.0), @@ -405,16 +381,9 @@ class _CardsState extends State { ) ], ), - -// - SizedBox( height: 30, ), - // Text( - // 'Full Image', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -423,6 +392,7 @@ class _CardsState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Full Image', style: hintStyleTextblackbold(), @@ -456,9 +426,6 @@ class _CardsState extends State { 'subtitle', style: TextStyle(fontSize: 16.0, color: Colors.white), ), -// icon: GFAvatar( -// child: Icon(Icons.insert_emoticon) -// ) ), content: Text( "Flutter " @@ -468,7 +435,6 @@ class _CardsState extends State { style: TextStyle(fontSize: 16.0, color: Colors.white), ), buttonBar: GFButtonBar( - // alignment: MainAxisAlignment.center, children: [ GFButton( onPressed: () {}, @@ -500,9 +466,6 @@ class _CardsState extends State { 'subtitle', style: TextStyle(fontSize: 16.0, color: Colors.white), ), -// icon: GFAvatar( -// child: Icon(Icons.insert_emoticon) -// ) ), content: Text( "Flutter " @@ -512,7 +475,6 @@ class _CardsState extends State { style: TextStyle(fontSize: 16.0, color: Colors.white), ), buttonBar: GFButtonBar( - // alignment: MainAxisAlignment.center, children: [ Padding( padding: diff --git a/lib/screens/carousel/carousel.dart b/lib/screens/carousel/carousel.dart index bee154e..9130eea 100644 --- a/lib/screens/carousel/carousel.dart +++ b/lib/screens/carousel/carousel.dart @@ -53,6 +53,7 @@ class _CarouselState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Full Width', style: hintStyleTextblackbold(), @@ -72,10 +73,8 @@ class _CarouselState extends State { items: assetImg.map( (url) { return GFImageOverlay( -// height: 200, boxFit: BoxFit.fitWidth, color: Colors.transparent, -// width: 300, margin: EdgeInsets.only( left: 15, right: 15, @@ -107,7 +106,6 @@ class _CarouselState extends State { )) ], )), -// colorFilter: new ColorFilter.mode(Colors.black.withOpacity(0.60), BlendMode.darken), image: AssetImage(url), ); }, @@ -129,6 +127,7 @@ class _CarouselState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Multiple Items', style: hintStyleTextblackbold(), @@ -189,6 +188,7 @@ class _CarouselState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Full Size', style: hintStyleTextblackbold(), @@ -209,7 +209,6 @@ class _CarouselState extends State { (url) { return GFImageOverlay( height: 200, -// width: 300, margin: EdgeInsets.only(left: 15, right: 15), borderRadius: BorderRadius.all(Radius.circular(4)), child: Padding( @@ -258,6 +257,7 @@ class _CarouselState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Full Width', style: hintStyleTextblackbold(), @@ -278,7 +278,6 @@ class _CarouselState extends State { (url) { return GFImageOverlay( height: 200, -// width: 300, margin: EdgeInsets.only( left: 15, right: 15, @@ -331,6 +330,7 @@ class _CarouselState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Multiple Items', style: hintStyleTextblackbold(), @@ -391,6 +391,7 @@ class _CarouselState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Full Size', style: hintStyleTextblackbold(), @@ -411,7 +412,6 @@ class _CarouselState extends State { (url) { return GFImageOverlay( height: 200, -// width: 300, margin: EdgeInsets.only(left: 15, right: 15), borderRadius: BorderRadius.all(Radius.circular(4)), child: Padding( diff --git a/lib/screens/checkbox-listtile/checkbox_listtile.dart b/lib/screens/checkbox-listtile/checkbox_listtile.dart index 870cb5c..6ce910d 100644 --- a/lib/screens/checkbox-listtile/checkbox_listtile.dart +++ b/lib/screens/checkbox-listtile/checkbox_listtile.dart @@ -34,12 +34,12 @@ class _CheckboxListtileState extends State { ), GFCheckboxListTile( titleText: 'hi', - subtitleText: 'Happy Ugadi', + subTitleText: 'Happy Ugadi', avatar: GFAvatar( backgroundImage: AssetImage('lib/assets/images/img.png'), ), size: 25, - activebgColor: Colors.green, + activeBgColor: Colors.green, activeIcon: Icon( Icons.check, size: 15, @@ -56,12 +56,12 @@ class _CheckboxListtileState extends State { ), GFCheckboxListTile( titleText: 'hi', - subtitleText: 'Happy Ugadi', + subTitleText: 'Happy Ugadi', avatar: GFAvatar( backgroundImage: AssetImage('lib/assets/images/img1.png'), ), size: 25, - activebgColor: Colors.green, + activeBgColor: Colors.green, activeIcon: Icon( Icons.check, size: 15, diff --git a/lib/screens/checkbox/checkbox.dart b/lib/screens/checkbox/checkbox.dart index 96d827d..9a7e195 100644 --- a/lib/screens/checkbox/checkbox.dart +++ b/lib/screens/checkbox/checkbox.dart @@ -52,7 +52,7 @@ class _CheckBoxState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), GFCard( @@ -61,7 +61,7 @@ class _CheckBoxState extends State { children: [ GFCheckbox( size: GFSize.SMALL, - activebgColor: GFColors.DANGER, + activeBgColor: GFColors.DANGER, onChanged: (val) { setState(() { check = val; @@ -71,7 +71,7 @@ class _CheckBoxState extends State { inactiveIcon: null, ), GFCheckbox( - activebgColor: GFColors.SECONDARY, + activeBgColor: GFColors.SECONDARY, onChanged: (val) { setState(() { check1 = val; @@ -82,7 +82,7 @@ class _CheckBoxState extends State { ), GFCheckbox( size: GFSize.LARGE, - activebgColor: GFColors.SUCCESS, + activeBgColor: GFColors.SUCCESS, onChanged: (val) { setState(() { check2 = val; @@ -107,7 +107,7 @@ class _CheckBoxState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), GFCard( @@ -116,7 +116,7 @@ class _CheckBoxState extends State { children: [ GFCheckbox( size: GFSize.SMALL, - activebgColor: GFColors.DANGER, + activeBgColor: GFColors.DANGER, type: GFCheckboxType.square, onChanged: (val) { setState(() { @@ -128,7 +128,7 @@ class _CheckBoxState extends State { ), GFCheckbox( type: GFCheckboxType.square, - activebgColor: GFColors.SECONDARY, + activeBgColor: GFColors.SECONDARY, onChanged: (val) { setState(() { check4 = val; @@ -139,7 +139,7 @@ class _CheckBoxState extends State { ), GFCheckbox( size: GFSize.LARGE, - activebgColor: GFColors.SUCCESS, + activeBgColor: GFColors.SUCCESS, type: GFCheckboxType.square, onChanged: (val) { setState(() { @@ -165,7 +165,7 @@ class _CheckBoxState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), GFCard( @@ -174,7 +174,7 @@ class _CheckBoxState extends State { children: [ GFCheckbox( size: GFSize.SMALL, - activebgColor: GFColors.DANGER, + activeBgColor: GFColors.DANGER, type: GFCheckboxType.circle, onChanged: (val) { setState(() { @@ -186,7 +186,7 @@ class _CheckBoxState extends State { ), GFCheckbox( type: GFCheckboxType.circle, - activebgColor: GFColors.SECONDARY, + activeBgColor: GFColors.SECONDARY, onChanged: (val) { setState(() { check7 = val; @@ -195,7 +195,7 @@ class _CheckBoxState extends State { value: check7, ), GFCheckbox( - activebgColor: GFColors.SUCCESS, + activeBgColor: GFColors.SUCCESS, size: GFSize.LARGE, type: GFCheckboxType.circle, onChanged: (val) { @@ -222,7 +222,7 @@ class _CheckBoxState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), GFCard( @@ -242,7 +242,7 @@ class _CheckBoxState extends State { ), GFCheckbox( type: GFCheckboxType.square, - activebgColor: GFColors.SECONDARY, + activeBgColor: GFColors.SECONDARY, activeIcon: Icon(Icons.sentiment_satisfied), onChanged: (val) { setState(() { @@ -254,7 +254,6 @@ class _CheckBoxState extends State { ), GFCheckbox( size: GFSize.MEDIUM, -// activebgColor: GFColors., type: GFCheckboxType.custom, onChanged: (val) { setState(() { @@ -262,7 +261,7 @@ class _CheckBoxState extends State { }); }, value: check11, - custombgColor: GFColors.INFO, + customBgColor: GFColors.INFO, inactiveIcon: null, ), ], diff --git a/lib/screens/dropdown/dropdown.dart b/lib/screens/dropdown/dropdown.dart new file mode 100644 index 0000000..902c48a --- /dev/null +++ b/lib/screens/dropdown/dropdown.dart @@ -0,0 +1,103 @@ +import 'package:flutter/material.dart'; +import 'package:gf_web/screens/layout/layout.dart'; +import 'package:gf_web/styles/styles.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:getwidget/getwidget.dart'; + +class Dropdown extends StatefulWidget { + @override + _DropdownState createState() => _DropdownState(); +} + +class _DropdownState extends State + with SingleTickerProviderStateMixin { + TabController? tabController; + int _value = 1; + @override + void initState() { + super.initState(); + } + + String? dropdownValue = 'FC Barcelona'; + List dropList = [ + 'Running', + 'Walking', + 'Eating', + 'Sleeping', + 'Playing', + 'Drinking', + 'Jogging' + ]; + String? dropdown; + String? selected, selectedIndex; + + @override + Widget build(BuildContext context) { + return Scaffold( + body: Layout( + demoImageUrl: 'lib/assets/gif/Dropdown.gif', + body: SingleChildScrollView( + child: Column( + children: [ + Row( + children: [ + Text( + 'Dropdown', + style: hintStyleTextblackbolder(), + ), + ], + ), + SizedBox( + height: 20, + ), + Text( + "A dropdown is a list of graphical control element, similar to a listbox that allows the user to choose one value from a list.", + style: hintStyleTextblackdull(), + ), + SizedBox( + height: 20, + ), + Container( + child: Column( + children: [ + Container( + height: 50, + width: MediaQuery.of(context).size.width, + margin: EdgeInsets.all(20), + child: DropdownButtonHideUnderline( + child: GFDropdown( + padding: const EdgeInsets.all(15), + borderRadius: BorderRadius.circular(5), + border: + const BorderSide(color: Colors.black12, width: 1), + dropdownButtonColor: Colors.white, + value: dropdownValue, + onChanged: (dynamic newValue) { + setState(() { + dropdownValue = newValue; + }); + }, + items: [ + 'FC Barcelona', + 'Real Madrid', + 'Villareal', + 'Manchester City' + ] + .map((value) => DropdownMenuItem( + value: value, + child: Text(value), + )) + .toList(), + ), + ), + ), + ], + ), + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/screens/dropdown/multiselect.dart b/lib/screens/dropdown/multiselect.dart new file mode 100644 index 0000000..21f37e7 --- /dev/null +++ b/lib/screens/dropdown/multiselect.dart @@ -0,0 +1,176 @@ +import 'package:flutter/material.dart'; +import 'package:gf_web/screens/layout/layout.dart'; +import 'package:gf_web/styles/styles.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:getwidget/getwidget.dart'; + +class Multiselect extends StatefulWidget { + @override + _MultiselectState createState() => _MultiselectState(); +} + +class _MultiselectState extends State + with SingleTickerProviderStateMixin { + late TabController tabController; + int _value = 1; + @override + void initState() { + super.initState(); + tabController = TabController(length: 2, vsync: this); + } + + @override + void dispose() { + tabController.dispose(); + super.dispose(); + } + + String dropdownValue = 'One'; + List dropList = [ + 'Messi', + 'Griezmann', + 'Coutinho', + 'Fati', + 'Dest', + ]; + String? dropdown; + String? selected, selectedIndex; + + @override + Widget build(BuildContext context) { + return Scaffold( + body: Layout( + demoImageUrl: 'lib/assets/gif/Dropdown.gif', + body: SingleChildScrollView( + child: Column( + children: [ + Row( + children: [ + Text( + 'Multiselect', + style: hintStyleTextblackbolder(), + ), + ], + ), + SizedBox( + height: 20, + ), + Text( + "A multiselect is a list of graphical control element, similar to a listbox that allows the user to choose one value from a list. when the multiselect is inactive it shows one value when activated it displays a list of values.", + style: hintStyleTextblackdull(), + ), + SizedBox( + height: 20, + ), + const Padding( + padding: EdgeInsets.only(left: 15, top: 30, bottom: 10), + child: GFTypography( + child: Text( + 'Basic', + style: TextStyle( + fontSize: 20.0, + color: Colors.black, + fontWeight: FontWeight.w600, + ), + ), + type: GFTypographyType.typo5, + dividerWidth: 45, + dividerColor: Color(0xFF19CA4B), text: '', + ), + ), + Container( + child: Column( + children: [ + GFMultiSelect( + items: dropList, + onSelect: (value) {}, + dropdownTitleTileText: 'Messi, Griezmann, Coutinho ', + dropdownTitleTileMargin: EdgeInsets.only( + top: 22, left: 18, right: 18, bottom: 5), + dropdownTitleTilePadding: EdgeInsets.all(10), + dropdownUnderlineBorder: + const BorderSide(color: Colors.transparent, width: 2), + dropdownTitleTileBorder: + Border.all(color: Colors.grey[200]!, width: 1), + dropdownTitleTileBorderRadius: BorderRadius.circular(5), + expandedIcon: const Icon( + Icons.keyboard_arrow_down, + color: Colors.black54, + ), + collapsedIcon: const Icon( + Icons.keyboard_arrow_up, + color: Colors.black54, + ), + submitButton: Text('OK'), + cancelButton: Text('Cancel'), + dropdownTitleTileTextStyle: + const TextStyle(fontSize: 14, color: Colors.black54), + padding: const EdgeInsets.all(6), + margin: const EdgeInsets.all(6), + type: GFCheckboxType.basic, + activeBgColor: GFColors.SUCCESS, + activeBorderColor: GFColors.SUCCESS, + inactiveBorderColor: Colors.grey[200]!, + ), + ], + ), + ), + const Padding( + padding: EdgeInsets.only(left: 15, top: 30, bottom: 10), + child: GFTypography( + child: Text( + 'Customized', + style: TextStyle( + fontSize: 20.0, + color: Colors.black, + fontWeight: FontWeight.w600, + ), + ), + type: GFTypographyType.typo5, + dividerWidth: 45, + dividerColor: Color(0xFF19CA4B), text: '', + ), + ), + Container( + child: Column( + children: [ + GFMultiSelect( + items: dropList, + onSelect: (value) {}, + dropdownTitleTileText: 'Messi, Griezmann, Coutinho ', + dropdownTitleTileColor: Colors.grey[200], + dropdownTitleTileMargin: EdgeInsets.only( + top: 22, left: 18, right: 18, bottom: 5), + dropdownTitleTilePadding: EdgeInsets.all(10), + dropdownUnderlineBorder: + const BorderSide(color: Colors.transparent, width: 2), + dropdownTitleTileBorder: + Border.all(color: Colors.grey[300]!, width: 1), + dropdownTitleTileBorderRadius: BorderRadius.circular(5), + expandedIcon: const Icon( + Icons.keyboard_arrow_down, + color: Colors.black54, + ), + collapsedIcon: const Icon( + Icons.keyboard_arrow_up, + color: Colors.black54, + ), + submitButton: Text('OK'), + dropdownTitleTileTextStyle: + const TextStyle(fontSize: 14, color: Colors.black54), + padding: const EdgeInsets.all(6), + margin: const EdgeInsets.all(6), + type: GFCheckboxType.basic, + activeBgColor: Colors.green.withOpacity(0.5), + inactiveBorderColor: Colors.grey[200]!, + ), + ], + ), + ), + ], + ), + ), + ), + ); + } +} diff --git a/lib/screens/floating-widget/fab_floating.dart b/lib/screens/floating-widget/fab_floating.dart index 2be5949..d5dc499 100644 --- a/lib/screens/floating-widget/fab_floating.dart +++ b/lib/screens/floating-widget/fab_floating.dart @@ -10,8 +10,8 @@ class FabFloatingWidget extends StatefulWidget { class _FabFloatingWidgetState extends State with TickerProviderStateMixin { TextEditingController controller1 = TextEditingController(); - Animation animation; - AnimationController animationController; + Animation? animation; + late AnimationController animationController; @override void initState() { @@ -23,8 +23,7 @@ class _FabFloatingWidgetState extends State offset = Tween(begin: const Offset(0, -0.04), end: const Offset(0, 0.2)) .animate(controller); -// offset = Tween(begin: Offset.zero, end: Offset(0.0, 1.0)) -// .animate(controller); + _controller = AnimationController( vsync: this, duration: const Duration(milliseconds: 300)); offset1 = Tween(begin: Offset.zero, end: const Offset(0, -0.05)) @@ -57,7 +56,6 @@ class _FabFloatingWidgetState extends State showfabFloatingWidget ? Icon(Icons.close) : Icon(Icons.add), shape: GFIconButtonShape.circle, color: GFColors.PRIMARY, -// iconSize: 80, size: 100, onPressed: () { setState(() { @@ -75,56 +73,54 @@ class _FabFloatingWidgetState extends State } }), ), - body: ListView( -// mainAxisAlignment: MainAxisAlignment.center, - children: [ - const Padding( - padding: EdgeInsets.only(left: 15, top: 20, bottom: 40), - child: GFTypography( - text: 'FAB Button as a Floating Widget', - type: GFTypographyType.typo5, - dividerWidth: 25, - dividerColor: Color(0xFF19CA4B), - ), - ), - showfabFloatingWidget - ? SlideTransition( - position: offset, - child: Container( - margin: const EdgeInsets.only(right: 35), - alignment: Alignment.topRight, - child: Column( + body: ListView(children: [ + const Padding( + padding: EdgeInsets.only(left: 15, top: 20, bottom: 40), + child: GFTypography( + text: 'FAB Button as a Floating Widget', + type: GFTypographyType.typo5, + dividerWidth: 25, + dividerColor: Color(0xFF19CA4B), + ), + ), + showfabFloatingWidget + ? SlideTransition( + position: offset, + child: Container( + margin: const EdgeInsets.only(right: 35), + alignment: Alignment.topRight, + child: Column( + children: [ + GFButtonBar( + alignment: WrapAlignment.end, + direction: Axis.vertical, children: [ - GFButtonBar( - alignment: WrapAlignment.end, - direction: Axis.vertical, - children: [ - GFIconButton( - icon: Icon(Icons.add), - shape: GFIconButtonShape.circle, - color: GFColors.INFO, - onPressed: () {}), - GFIconButton( - icon: Icon(Icons.share), - shape: GFIconButtonShape.circle, - color: GFColors.SUCCESS, - onPressed: () {}), - GFIconButton( - icon: Icon(Icons.message), - shape: GFIconButtonShape.circle, - color: GFColors.WARNING, - onPressed: () {}), - GFIconButton( - icon: Icon(Icons.settings), - shape: GFIconButtonShape.circle, - color: GFColors.SECONDARY, - onPressed: () {}), - ], - ) + GFIconButton( + icon: Icon(Icons.add), + shape: GFIconButtonShape.circle, + color: GFColors.INFO, + onPressed: () {}), + GFIconButton( + icon: Icon(Icons.share), + shape: GFIconButtonShape.circle, + color: GFColors.SUCCESS, + onPressed: () {}), + GFIconButton( + icon: Icon(Icons.message), + shape: GFIconButtonShape.circle, + color: GFColors.WARNING, + onPressed: () {}), + GFIconButton( + icon: Icon(Icons.settings), + shape: GFIconButtonShape.circle, + color: GFColors.SECONDARY, + onPressed: () {}), ], - ), - ), - ) - : Container(), - ]))); + ) + ], + ), + ), + ) + : Container(), + ]))); } diff --git a/lib/screens/images/image.dart b/lib/screens/images/image.dart index 5607d85..619d453 100644 --- a/lib/screens/images/image.dart +++ b/lib/screens/images/image.dart @@ -30,10 +30,6 @@ class _ImagesState extends State { SizedBox( height: 30, ), - // Text( - // 'Basic Images', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -42,6 +38,7 @@ class _ImagesState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Basic', style: hintStyleTextblackbold(), @@ -84,10 +81,6 @@ class _ImagesState extends State { ], ), ), - // Text( - // 'Circular Images', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -96,6 +89,7 @@ class _ImagesState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Circular', style: hintStyleTextblackbold(), @@ -135,10 +129,6 @@ class _ImagesState extends State { ], ), ), - // Text( - // 'Overlay Images', - // style: hintStyleTextblackbold(), - // ), Padding( padding: EdgeInsets.only( left: 15, @@ -147,6 +137,7 @@ class _ImagesState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'Overlay', style: hintStyleTextblackbold(), @@ -208,11 +199,7 @@ class _ImagesState extends State { 'Strong Overlay', style: TextStyle(color: GFColors.WHITE), ), - ) - // ), - // colorFilter: new ColorFilter.mode(Colors.black.withOpacity(0.60), BlendMode.darken), - // image: AssetImage('lib/assets/images/image1.png'), - ), + )), ], ), ) diff --git a/lib/screens/intro-screen/halfintro.dart b/lib/screens/intro-screen/halfintro.dart new file mode 100644 index 0000000..c9a1ceb --- /dev/null +++ b/lib/screens/intro-screen/halfintro.dart @@ -0,0 +1,172 @@ +import 'package:flutter/material.dart'; +import 'package:gf_web/screens/layout/layout.dart'; +import 'package:gf_web/styles/styles.dart'; +import 'package:flutter/cupertino.dart'; +import 'package:getwidget/getwidget.dart'; + +class HalfIntroScreenPage extends StatefulWidget { + @override + _HalfIntroScreenPageState createState() => _HalfIntroScreenPageState(); +} + +class _HalfIntroScreenPageState extends State { + late PageController _pageController; + List? slideList; + late int initialPage; + @override + void initState() { + _pageController = PageController(initialPage: 2); + initialPage = _pageController.initialPage; + super.initState(); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + body: Layout( + demoImageUrl: 'lib/assets/gif/Intro.gif', + body: SingleChildScrollView( + child: Column( + children: [ + Row( + children: [ + Text( + 'IntroScreen', + style: hintStyleTextblackbolder(), + ), + ], + ), + SizedBox( + height: 20, + ), + Text( + "Introduction screen allow you to have a screen at launcher for example, where you can explain your app.", + style: hintStyleTextblackdull(), + ), + SizedBox( + height: 20, + ), + SafeArea( + child: GFIntroScreen( + height: MediaQuery.of(context).size.height * 0.7, + width: MediaQuery.of(context).size.width * 0.9, + color: Colors.white, + borderRadius: BorderRadius.circular(40), + border: Border.all(color: Colors.grey[300]!), + slides: slides()!, + pageController: _pageController, + introScreenBottomNavigationBar: + GFIntroScreenBottomNavigationBar( + pageController: _pageController, + pageCount: slideList!.length, + currentIndex: initialPage, + backButtonText: 'Previous', + forwardButtonText: 'Next', + skipButtonText: 'Skip', + doneButtonText: 'Done', + navigationBarHeight: 50, + navigationBarWidth: 300, + navigationBarShape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(60), + ), + navigationBarColor: Colors.white, + showDivider: false, + dotHeight: 10, + dotWidth: 16, + dotShape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(5)), + inactiveColor: Colors.grey[200]!, + activeColor: Colors.green, + dotMargin: EdgeInsets.symmetric(horizontal: 6), + showPagination: true, + ), + currentIndex: 0, + pageCount: 0, + ), + ), + SizedBox( + height: 40, + ), + ], + ), + ), + ), + ); + } + + List? slides() { + slideList = [ + Container( + child: GFImageOverlay( + width: MediaQuery.of(context).size.width, + padding: EdgeInsets.all(16), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: const EdgeInsets.only(top: 10.0, left: 20), + child: Text( + 'Welcome Back!', + style: TextStyle( + color: Colors.white, + decoration: TextDecoration.none, + fontSize: 25), + ), + ), + ], + ), + color: Colors.orange, + image: const AssetImage('lib/assets/images/i1.png'), + boxFit: BoxFit.fill, + colorFilter: + ColorFilter.mode(Colors.black.withOpacity(0.2), BlendMode.darken), + borderRadius: BorderRadius.only( + topLeft: Radius.circular(40), topRight: Radius.circular(40)), + ), + ), + Container( + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.height, + decoration: BoxDecoration( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(40), topRight: Radius.circular(40)), + color: Colors.blue, + image: DecorationImage( + image: AssetImage('lib/assets/images/i2.png'), + fit: BoxFit.fill, + colorFilter: ColorFilter.mode( + Colors.black.withOpacity(0.2), BlendMode.darken), + )), + ), + Container( + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.height, + decoration: BoxDecoration( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(40), topRight: Radius.circular(40)), + color: Colors.purple, + image: DecorationImage( + image: AssetImage('lib/assets/images/i3.png'), + fit: BoxFit.fill, + colorFilter: ColorFilter.mode( + Colors.black.withOpacity(0.2), BlendMode.darken), + )), + ), + Container( + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.height, + decoration: BoxDecoration( + borderRadius: BorderRadius.only( + topLeft: Radius.circular(40), topRight: Radius.circular(40)), + color: Colors.green, + image: DecorationImage( + image: AssetImage('lib/assets/images/i4.png'), + fit: BoxFit.fill, + colorFilter: ColorFilter.mode( + Colors.black.withOpacity(0.2), BlendMode.darken), + )), + ), + ]; + return slideList; + } +} diff --git a/lib/screens/layout/header.dart b/lib/screens/layout/header.dart index 2d3f4e7..f779309 100644 --- a/lib/screens/layout/header.dart +++ b/lib/screens/layout/header.dart @@ -9,7 +9,6 @@ class Header extends StatefulWidget { class _HeaderState extends State
{ launchURL(urlLink) async { - // const url = urlLink; if (await canLaunch(urlLink)) { await launch(urlLink); } else { @@ -34,10 +33,6 @@ class _HeaderState extends State
{ onTap: () { Navigator.pushNamed(context, '/home'); }, - // child: Image.network( - // 'https://ik.imagekit.io/ionicfirebaseapp/get-flutter-logo_FAN-82xCG.png', - // height: 40.0, - // ), child: Image.asset( 'lib/assets/logo.png', height: 40, @@ -47,7 +42,6 @@ class _HeaderState extends State
{ flex: 1, child: Row( mainAxisAlignment: MainAxisAlignment.spaceEvenly, - // crossAxisAlignment: CrossAxisAlignment.center, children: [ Padding( padding: const EdgeInsets.only(), diff --git a/lib/screens/layout/layout.dart b/lib/screens/layout/layout.dart index fc99ea0..e1e285f 100644 --- a/lib/screens/layout/layout.dart +++ b/lib/screens/layout/layout.dart @@ -7,10 +7,10 @@ import 'header.dart'; import 'package:url_launcher/url_launcher.dart'; class Layout extends StatefulWidget { - final Widget body; - final String demoImageUrl; + final Widget? body; + final String? demoImageUrl; const Layout({ - Key key, + Key? key, this.body, this.demoImageUrl, }) : super(key: key); @@ -53,7 +53,6 @@ class _LayoutState extends State { children: [ Container( color: GFColors.LIGHT, - // width: 1100, child: Column( children: [ Padding( @@ -70,31 +69,6 @@ class _LayoutState extends State { ], ), ), - // InkWell( - // child: Padding( - // padding: const EdgeInsets.only( - // left: 8.0, - // ), - // child: Row( - // mainAxisAlignment: MainAxisAlignment.center, - // children: [ - // Text( - // 'Download & play with GetWIdget mobile app ', - // style: TextStyle(color: Colors.red), - // ), - // // GFIconButton( - // // icon: Icon( - // // IconData( - // // 0xe904, - // // fontFamily: 'icomoon', - // // ), - // // color: GFColors.WHITE, - // // ), - // // onPressed: () {}), - // ], - // ), - // ), - // ), ], ), ), @@ -103,15 +77,12 @@ class _LayoutState extends State { ), Container( height: MediaQuery.of(context).size.height - 140, - // height: 500, width: MediaQuery.of(context).size.width - 730, child: widget.body, ), ], )), Column( - // mainAxisAlignment: MainAxisAlignment.start, - // crossAxisAlignment: CrossAxisAlignment.center, children: [ Center( child: Text('Try our GetWidget mobile app'), @@ -132,7 +103,6 @@ class _LayoutState extends State { ), Container( width: 430, -// color: Colors.red, height: 500, child: MobileDemo(demoImageUrl: widget.demoImageUrl), ), diff --git a/lib/screens/layout/mobile-demo.dart b/lib/screens/layout/mobile-demo.dart index d1685ac..14862d9 100644 --- a/lib/screens/layout/mobile-demo.dart +++ b/lib/screens/layout/mobile-demo.dart @@ -1,9 +1,9 @@ import 'package:flutter/material.dart'; class MobileDemo extends StatefulWidget { - final String demoImageUrl; + final String? demoImageUrl; const MobileDemo({ - Key key, + Key? key, this.demoImageUrl, }) : super(key: key); @override @@ -11,15 +11,10 @@ class MobileDemo extends StatefulWidget { } class _MobileDemoState extends State { - String imageUrl; + String? imageUrl; @override Widget build(BuildContext context) { - // return Container( - // height: 300, - // child: Image.asset( - // widget.demoImageUrl ?? "lib/assets/std-buttons-mockup.gif"), - // ); return Stack( children: [ Padding( @@ -37,24 +32,8 @@ class _MobileDemoState extends State { child: Image.asset( widget.demoImageUrl ?? 'lib/assets/images/Artboard1.png', height: 400, - // width: 320, ), ), - // Container( - - // decoration: BoxDecoration( - // borderRadius: BorderRadius.only( - // bottomLeft: Radius.circular(20), - // bottomRight: Radius.circular(20), - - // ), - - // ), - // child: Image.asset( - // 'lib/assets/standard-buttons.gif', - // height: 569, - // ), - // ) ], ); } diff --git a/lib/screens/layout/routes.dart b/lib/screens/layout/routes.dart index ff1406f..718699d 100644 --- a/lib/screens/layout/routes.dart +++ b/lib/screens/layout/routes.dart @@ -1,7 +1,10 @@ import 'package:gf_web/screens/accordion/accordion.dart'; import 'package:gf_web/screens/alert/alert.dart'; +import 'package:gf_web/screens/animation/animation.dart'; import 'package:gf_web/screens/appbar/appbar.dart'; -import 'package:gf_web/screens/border/border.dart'; +import 'package:gf_web/screens/border/dashedborder.dart'; +import 'package:gf_web/screens/border/dottedborder.dart'; +import 'package:gf_web/screens/border/solidborder.dart'; import 'package:gf_web/screens/bottomsheet/bottomsheet.dart'; import 'package:gf_web/screens/buttons/standard-buttons.dart'; import 'package:gf_web/screens/buttons/pills-buttons.dart'; @@ -13,6 +16,8 @@ import 'package:gf_web/screens/badges/badges.dart'; import 'package:gf_web/screens/cards/cards.dart'; import 'package:gf_web/screens/checkbox-listtile/checkbox_listtile.dart'; import 'package:gf_web/screens/checkbox/checkbox.dart'; +import 'package:gf_web/screens/dropdown/dropdown.dart'; +import 'package:gf_web/screens/dropdown/multiselect.dart'; import 'package:gf_web/screens/floating-widget/floatingwidget.dart'; import 'package:gf_web/screens/loader/loader.dart'; import 'package:gf_web/screens/pages/home.dart'; @@ -22,6 +27,8 @@ import 'package:gf_web/screens/radio/radio.dart'; import 'package:gf_web/screens/rating/rating.dart'; import 'package:gf_web/screens/searchbar/searchbar.dart'; import 'package:gf_web/screens/shimmer/shimmer.dart'; +import 'package:gf_web/screens/stickyheader/basic.dart'; +import 'package:gf_web/screens/stickyheader/custom.dart'; import 'package:gf_web/screens/tabs/bottom-icon.dart'; import 'package:gf_web/screens/tabs/bottom-labeled.dart'; import 'package:gf_web/screens/tabs/icon-tabs.dart'; @@ -35,8 +42,7 @@ import 'package:gf_web/screens/images/image.dart'; import 'package:gf_web/screens/carousel/carousel.dart'; import 'package:gf_web/screens/tabs/tabs.dart'; import 'package:gf_web/screens/tiles/tiles.dart'; - -//Map route = Map(); +import 'package:gf_web/screens/intro-screen/halfintro.dart'; final routes = { '/home': (context) => HomePage(), @@ -74,6 +80,15 @@ final routes = { '/gf-checkboxlist/checkboxlist': (context) => CheckboxListtile(), '/gf-radio/radio': (context) => RadioButton(), '/gf-radiolisttile/radiolisttile': (context) => RadioListtile(), - '/gf-border/border': (context) => Border(), + '/gf-border/solidborder': (context) => SolidBorder(), + '/gf-border/dashedborder': (context) => DashedBorder(), + '/gf-border/dottedborder': (context) => DottedBorder(), '/gf-bottomsheet/bottomsheet': (context) => BottomSheet(), + '/gf-animation/animation': (context) => Animation(), + '/gf-introscreen/introscreen': (context) => HalfIntroScreenPage(), + '/gf-basicstickyheader/basicstickyheader': (context) => BasicStickyHeader(), + '/gf-customstickyheader/customstickyheader': (context) => + CustomStickyHeader(), + '/gf-dropdown/dropdown': (context) => Dropdown(), + '/gf-multiselect/multiselect': (context) => Multiselect(), }; diff --git a/lib/screens/layout/sidebar.dart b/lib/screens/layout/sidebar.dart index 03dc0b9..5ae04b4 100644 --- a/lib/screens/layout/sidebar.dart +++ b/lib/screens/layout/sidebar.dart @@ -8,28 +8,27 @@ class Sidebar extends StatefulWidget { } class _SidebarState extends State with TickerProviderStateMixin { - Animation animation; - AnimationController animationController; - AnimationController controller; - Animation offset; - AnimationController controller1; + Animation? animation; + AnimationController? animationController; + late AnimationController controller; + Animation? offset; + AnimationController? controller1; @override void initState() { super.initState(); - // animationController = - // AnimationController(duration: Duration(seconds: 2), vsync: this); - // controller = - // AnimationController(vsync: this, duration: Duration(milliseconds: 300)); offset = Tween( begin: Offset.zero, end: Offset(0.0, 0.1), ).animate(controller); - // animation = Tween(begin: 1.0, end: 0.0).animate(CurvedAnimation(parent: animationController, curve: Curves.fastLinearToSlowEaseIn)); } bool showButtonTypes = false; bool showButtonTypes1 = false; + bool showButtonTypes2 = false; + bool showButtonTypes3 = false; + bool showButtonTypes4 = false; + bool showButtonTypes5 = false; @override Widget build(BuildContext context) { @@ -59,15 +58,6 @@ class _SidebarState extends State with TickerProviderStateMixin { GestureDetector( onTap: () { setState(() { - // switch (controller.status) { - // case AnimationStatus.completed: - // controller.forward(from: 0); - // break; - // case AnimationStatus.dismissed: - // controller.forward(); - // break; - // default: - // } showButtonTypes = !showButtonTypes; }); }, @@ -81,11 +71,7 @@ class _SidebarState extends State with TickerProviderStateMixin { ], )), showButtonTypes - ? - // SlideTransition( - // position: offset, - // child: - Container( + ? Container( height: 200, decoration: BoxDecoration(color: Colors.white, boxShadow: [ BoxShadow(color: Colors.black.withOpacity(0.40)) @@ -118,12 +104,6 @@ class _SidebarState extends State with TickerProviderStateMixin { }, child: Text('Square Buttons'), ), - // GestureDetector( - // onTap: (){ - // Navigator.pushNamed(context, '/gf-buttons/shadow-button'); - // }, - // child: Text('Shadow Buttons'), - // ), GestureDetector( onTap: () { Navigator.pushNamed( @@ -141,14 +121,12 @@ class _SidebarState extends State with TickerProviderStateMixin { ], ), ) - // ) : Container(), SizedBox( height: 20, ), - // Text('GF Badge', style: hintStyleTextblackdull(),), GestureDetector( onTap: () { Navigator.pushNamed(context, '/gf-badges/badges'); @@ -221,27 +199,9 @@ class _SidebarState extends State with TickerProviderStateMixin { SizedBox( height: 20, ), - // GestureDetector( - // onTap: () { - // Navigator.pushNamed(context, '/gf-tabs/tabs'); - // }, - // child: Text( - // 'GF Tab', - // style: hintStyleTextblackdull(), - // ), - // ), GestureDetector( onTap: () { setState(() { - // switch (controller.status) { - // case AnimationStatus.completed: - // controller.forward(from: 0); - // break; - // case AnimationStatus.dismissed: - // controller.forward(); - // break; - // default: - // } showButtonTypes1 = !showButtonTypes1; }); }, @@ -255,11 +215,7 @@ class _SidebarState extends State with TickerProviderStateMixin { ], )), showButtonTypes1 - ? - // SlideTransition( - // position: offset, - // child: - Container( + ? Container( height: 200, decoration: BoxDecoration(color: Colors.white, boxShadow: [ BoxShadow(color: Colors.black.withOpacity(0.40)) @@ -291,12 +247,6 @@ class _SidebarState extends State with TickerProviderStateMixin { }, child: Text('Labeled Tabs'), ), - // GestureDetector( - // onTap: (){ - // Navigator.pushNamed(context, '/gf-buttons/shadow-button'); - // }, - // child: Text('Shadow Buttons'), - // ), GestureDetector( onTap: () { Navigator.pushNamed( @@ -314,7 +264,6 @@ class _SidebarState extends State with TickerProviderStateMixin { ], ), ) - // ) : Container(), SizedBox( height: 20, @@ -511,15 +460,180 @@ class _SidebarState extends State with TickerProviderStateMixin { SizedBox( height: 20, ), + + GestureDetector( + onTap: () { + setState(() { + showButtonTypes2 = !showButtonTypes2; + }); + }, + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text('GF Border', style: hintStyleTextblackdull()), + showButtonTypes + ? Icon(Icons.keyboard_arrow_down) + : Icon(Icons.keyboard_arrow_right) + ], + )), + showButtonTypes2 + ? Container( + height: 120, + decoration: BoxDecoration(color: Colors.white, boxShadow: [ + BoxShadow(color: Colors.black.withOpacity(0.40)) + ]), + padding: + EdgeInsets.only(top: 0, bottom: 0, left: 25, right: 20), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + GestureDetector( + onTap: () { + Navigator.pushNamed( + context, '/gf-border/solidborder'); + }, + child: Text('Solid Border'), + ), + GestureDetector( + onTap: () { + Navigator.pushNamed( + context, '/gf-border/dashedborder'); + }, + child: Text('Dashed Border'), + ), + GestureDetector( + onTap: () { + Navigator.pushNamed( + context, '/gf-border/dottedborder'); + }, + child: Text('Dotted Border'), + ), + ], + ), + ) + : Container(), + SizedBox( + height: 20, + ), + GestureDetector( + onTap: () { + Navigator.pushNamed(context, '/gf-animation/animation'); + }, + child: Text( + 'GF Animation', + style: hintStyleTextblackdull(), + ), + ), + SizedBox( + height: 20, + ), GestureDetector( onTap: () { - Navigator.pushNamed(context, '/gf-border/border'); + Navigator.pushNamed(context, '/gf-introscreen/introscreen'); }, child: Text( - 'GF Border', + 'GF IntroScreen', style: hintStyleTextblackdull(), ), ), + + SizedBox( + height: 20, + ), + GestureDetector( + onTap: () { + setState(() { + showButtonTypes4 = !showButtonTypes4; + }); + }, + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text('GF StickyHeader', style: hintStyleTextblackdull()), + showButtonTypes + ? Icon(Icons.keyboard_arrow_down) + : Icon(Icons.keyboard_arrow_right) + ], + )), + showButtonTypes4 + ? Container( + height: 100, + decoration: BoxDecoration(color: Colors.white, boxShadow: [ + BoxShadow(color: Colors.black.withOpacity(0.40)) + ]), + padding: + EdgeInsets.only(top: 0, bottom: 0, left: 25, right: 20), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + GestureDetector( + onTap: () { + Navigator.pushNamed(context, + '/gf-basicstickyheader/basicstickyheader'); + }, + child: Text('Basic'), + ), + GestureDetector( + onTap: () { + Navigator.pushNamed(context, + '/gf-customstickyheader/customstickyheader'); + }, + child: Text('Customized'), + ), + ], + ), + ) + : Container(), + SizedBox( + height: 20, + ), + GestureDetector( + onTap: () { + setState(() { + showButtonTypes5 = !showButtonTypes5; + }); + }, + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text('GF Dropdown', style: hintStyleTextblackdull()), + showButtonTypes + ? Icon(Icons.keyboard_arrow_down) + : Icon(Icons.keyboard_arrow_right) + ], + )), + showButtonTypes5 + ? Container( + height: 100, + decoration: BoxDecoration(color: Colors.white, boxShadow: [ + BoxShadow(color: Colors.black.withOpacity(0.40)) + ]), + padding: + EdgeInsets.only(top: 0, bottom: 0, left: 25, right: 20), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + GestureDetector( + onTap: () { + Navigator.pushNamed( + context, '/gf-dropdown/dropdown'); + }, + child: Text('Dropdown'), + ), + GestureDetector( + onTap: () { + Navigator.pushNamed( + context, '/gf-multiselect/multiselect'); + }, + child: Text('Multiselect'), + ), + ], + ), + ) + : Container(), SizedBox( height: 20, ), diff --git a/lib/screens/loader/loader.dart b/lib/screens/loader/loader.dart index 8821bb6..6d4fb9b 100644 --- a/lib/screens/loader/loader.dart +++ b/lib/screens/loader/loader.dart @@ -40,7 +40,7 @@ class _LoaderState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), GFCard( @@ -115,7 +115,7 @@ class _LoaderState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), GFCard( @@ -162,7 +162,7 @@ class _LoaderState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), GFCard( @@ -210,7 +210,7 @@ class _LoaderState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), GFCard( @@ -258,7 +258,7 @@ class _LoaderState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), GFCard( @@ -272,7 +272,6 @@ class _LoaderState extends State { children: const [ GFLoader( type: GFLoaderType.custom, -// size: GFSize.LARGE, child: Image( image: AssetImage('lib/assets/gif/loader.gif'), width: 150, diff --git a/lib/screens/pages/home.dart b/lib/screens/pages/home.dart index 5833506..5fec057 100644 --- a/lib/screens/pages/home.dart +++ b/lib/screens/pages/home.dart @@ -12,21 +12,9 @@ class _HomePageState extends State { return Scaffold( backgroundColor: Colors.white, body: Layout( - // demoImageUrl: '', body: SingleChildScrollView( child: Column( children: [ - // GFCard( - // color: Colors.lightBlue[50], - // content: Row( - // mainAxisAlignment: MainAxisAlignment.start, - // children: [Text('Info:')], - // ), - // ), - // Text( - // 'Introduction', - // style: TextStyle(fontSize: 20), - // ), SizedBox( height: 20, ), diff --git a/lib/screens/progressbar/progressbar.dart b/lib/screens/progressbar/progressbar.dart index cbb9d3f..9d0192e 100644 --- a/lib/screens/progressbar/progressbar.dart +++ b/lib/screens/progressbar/progressbar.dart @@ -40,7 +40,7 @@ class _ProgressBarState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), Container( @@ -68,8 +68,6 @@ class _ProgressBarState extends State { progressBarColor: GFColors.INFO, animation: true, animationDuration: 4000, - -// ), ), Container( @@ -78,7 +76,6 @@ class _ProgressBarState extends State { percentage: 0.5, lineHeight: 20, alignment: MainAxisAlignment.spaceBetween, - child: const Padding( padding: EdgeInsets.only(right: 5), child: Text( @@ -87,7 +84,6 @@ class _ProgressBarState extends State { style: TextStyle(fontSize: 16, color: Colors.white), ), ), -// progressHeadType: GFProgressHeadType.square, backgroundColor: Colors.black26, progressBarColor: GFColors.WARNING, @@ -100,7 +96,6 @@ class _ProgressBarState extends State { child: GFProgressBar( percentage: 0.3, lineHeight: 20, -// progressHeadType: GFProgressHeadType.square, child: const Text( '30%', textAlign: TextAlign.end, @@ -125,12 +120,11 @@ class _ProgressBarState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), Container( child: GFProgressBar( -// width: 300, width: 300, alignment: MainAxisAlignment.spaceBetween, radius: 90, diff --git a/lib/screens/radio-listtile/radio_listtile.dart b/lib/screens/radio-listtile/radio_listtile.dart index 45f7997..697f970 100644 --- a/lib/screens/radio-listtile/radio_listtile.dart +++ b/lib/screens/radio-listtile/radio_listtile.dart @@ -9,7 +9,7 @@ class RadioListtile extends StatefulWidget { } class _RadioListtileState extends State { - int groupValue = 0; + int? groupValue = 0; @override Widget build(BuildContext context) { @@ -34,7 +34,7 @@ class _RadioListtileState extends State { ), GFRadioListTile( titleText: 'Hello', - subtitleText: 'Happy New Year', + subTitleText: 'Happy New Year', avatar: GFAvatar( backgroundImage: AssetImage('lib/assets/images/img1.png'), ), @@ -53,7 +53,7 @@ class _RadioListtileState extends State { ), GFRadioListTile( titleText: 'Hello', - subtitleText: 'Happy New Year', + subTitleText: 'Happy New Year', avatar: GFAvatar( backgroundImage: AssetImage('lib/assets/images/img2.png'), ), diff --git a/lib/screens/radio/radio.dart b/lib/screens/radio/radio.dart index 17ae251..ef206ff 100644 --- a/lib/screens/radio/radio.dart +++ b/lib/screens/radio/radio.dart @@ -42,7 +42,7 @@ class _RadioButtonState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), GFCard( @@ -50,17 +50,11 @@ class _RadioButtonState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ GFRadio( -// type: GFRadioButtonType.custom, size: GFSize.LARGE, -// activebgColor: Colors.red, -// inactivebgColor: Colors.amber, -// inactiveBorderColor: Colors.purple, activeBorderColor: GFColors.SUCCESS, -// radioColor: Colors.black87, -// custombgColor: Colors.red, value: 0, groupValue: groupValue, - onChanged: (val) { + onChanged: (dynamic val) { setState(() { groupValue = val; }); @@ -72,7 +66,7 @@ class _RadioButtonState extends State { size: GFSize.MEDIUM, value: 1, groupValue: groupValue, - onChanged: (val) { + onChanged: (dynamic val) { setState(() { groupValue = val; }); @@ -85,7 +79,7 @@ class _RadioButtonState extends State { size: GFSize.SMALL, value: 2, groupValue: groupValue, - onChanged: (val) { + onChanged: (dynamic val) { setState(() { groupValue = val; }); @@ -98,7 +92,7 @@ class _RadioButtonState extends State { size: 20, value: 3, groupValue: groupValue, - onChanged: (val) { + onChanged: (dynamic val) { setState(() { groupValue = val; }); @@ -122,7 +116,7 @@ class _RadioButtonState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), GFCard( @@ -132,15 +126,9 @@ class _RadioButtonState extends State { GFRadio( type: GFRadioType.square, size: GFSize.LARGE, -// activebgColor: Colors.red, -// inactivebgColor: Colors.amber, -// inactiveBorderColor: Colors.purple, -// activeBorderColor: Colors.pink, -// radioColor: Colors.black87, -// custombgColor: Colors.red, value: 4, groupValue: groupValue, - onChanged: (val) { + onChanged: (dynamic val) { setState(() { groupValue = val; }); @@ -154,7 +142,7 @@ class _RadioButtonState extends State { size: GFSize.MEDIUM, value: 5, groupValue: groupValue, - onChanged: (val) { + onChanged: (dynamic val) { setState(() { groupValue = val; }); @@ -168,7 +156,7 @@ class _RadioButtonState extends State { size: GFSize.SMALL, value: 6, groupValue: groupValue, - onChanged: (val) { + onChanged: (dynamic val) { setState(() { groupValue = val; }); @@ -182,7 +170,7 @@ class _RadioButtonState extends State { size: 20, value: 7, groupValue: groupValue, - onChanged: (val) { + onChanged: (dynamic val) { setState(() { groupValue = val; }); @@ -207,7 +195,7 @@ class _RadioButtonState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), GFCard( @@ -217,62 +205,57 @@ class _RadioButtonState extends State { GFRadio( type: GFRadioType.blunt, size: GFSize.LARGE, -// activebgColor: Colors.red, -// inactivebgColor: Colors.amber, -// inactiveBorderColor: Colors.purple, activeBorderColor: GFColors.SUCCESS, -// radioColor: Colors.black87, -// custombgColor: Colors.red, value: 8, groupValue: groupValue, - onChanged: (val) { + onChanged: (dynamic val) { setState(() { groupValue = val; }); }, inactiveIcon: null, - custombgColor: GFColors.SUCCESS), + customBgColor: GFColors.SUCCESS), GFRadio( type: GFRadioType.blunt, size: GFSize.MEDIUM, value: 9, groupValue: groupValue, - onChanged: (val) { + onChanged: (dynamic val) { setState(() { groupValue = val; }); }, inactiveIcon: null, activeBorderColor: GFColors.SUCCESS, - custombgColor: GFColors.SUCCESS, + customBgColor: GFColors.SUCCESS, ), GFRadio( type: GFRadioType.blunt, size: GFSize.SMALL, value: 10, groupValue: groupValue, - onChanged: (val) { + onChanged: (dynamic val) { setState(() { groupValue = val; }); }, inactiveIcon: null, activeBorderColor: GFColors.SUCCESS, - custombgColor: GFColors.SUCCESS, + customBgColor: GFColors.SUCCESS, ), GFRadio( type: GFRadioType.blunt, size: 25, value: 11, groupValue: groupValue, - onChanged: (val) { + onChanged: (dynamic val) { setState(() { groupValue = val; }); }, inactiveIcon: null, activeBorderColor: GFColors.SUCCESS, - custombgColor: GFColors.SUCCESS, + customBgColor: GFColors.SUCCESS, ) ], )), @@ -289,7 +272,7 @@ class _RadioButtonState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), GFCard( @@ -301,12 +284,12 @@ class _RadioButtonState extends State { activeIcon: Icon(Icons.check), radioColor: Colors.red, size: GFSize.LARGE, - activebgColor: GFColors.SUCCESS, + activeBgColor: GFColors.SUCCESS, inactiveBorderColor: GFColors.DARK, activeBorderColor: GFColors.SUCCESS, value: 12, groupValue: groupValue, - onChanged: (val) { + onChanged: (dynamic val) { setState(() { groupValue = val; }); @@ -318,14 +301,14 @@ class _RadioButtonState extends State { size: GFSize.MEDIUM, value: 13, groupValue: groupValue, - onChanged: (val) { + onChanged: (dynamic val) { setState(() { groupValue = val; }); }, inactiveIcon: Icon(Icons.sentiment_dissatisfied), - custombgColor: GFColors.WARNING, - activebgColor: GFColors.SUCCESS, + customBgColor: GFColors.WARNING, + activeBgColor: GFColors.SUCCESS, activeBorderColor: GFColors.SUCCESS, ), GFRadio( @@ -333,13 +316,13 @@ class _RadioButtonState extends State { size: GFSize.SMALL, value: 14, groupValue: groupValue, - onChanged: (val) { + onChanged: (dynamic val) { setState(() { groupValue = val; }); }, inactiveIcon: null, - custombgColor: GFColors.SUCCESS, + customBgColor: GFColors.SUCCESS, activeBorderColor: GFColors.SUCCESS, ), GFRadio( @@ -347,14 +330,14 @@ class _RadioButtonState extends State { size: 25, value: 15, groupValue: groupValue, - onChanged: (val) { + onChanged: (dynamic val) { setState(() { groupValue = val; }); }, inactiveIcon: null, activeBorderColor: GFColors.SUCCESS, - custombgColor: GFColors.SUCCESS, + customBgColor: GFColors.SUCCESS, ), ], )), diff --git a/lib/screens/rating/rating.dart b/lib/screens/rating/rating.dart index eb1eab5..f02275a 100644 --- a/lib/screens/rating/rating.dart +++ b/lib/screens/rating/rating.dart @@ -46,7 +46,7 @@ class _RatingState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), GFRating( @@ -75,7 +75,7 @@ class _RatingState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), GFRating( @@ -86,7 +86,6 @@ class _RatingState extends State { color: GFColors.DANGER, ), size: GFSize.SMALL, -// halfFilledIcon:Icon(Icons.favorite_border, color: Colors.amber,), value: _iconRating, onChanged: (value) { setState(() { @@ -110,7 +109,7 @@ class _RatingState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), GFRating( @@ -138,7 +137,7 @@ class _RatingState extends State { }); }, child: const Text('Rate'), - ), + ), onChanged: (double rating) { }, ), SizedBox( height: 10, @@ -156,7 +155,7 @@ class _RatingState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), GFRating( @@ -181,7 +180,7 @@ class _RatingState extends State { }); }, child: Icon(Icons.insert_emoticon), - ), + ), onChanged: (double rating) { }, ), SizedBox( height: 20, diff --git a/lib/screens/searchbar/searchbar.dart b/lib/screens/searchbar/searchbar.dart index 5c7f540..b3ad9e7 100644 --- a/lib/screens/searchbar/searchbar.dart +++ b/lib/screens/searchbar/searchbar.dart @@ -61,35 +61,20 @@ class _SearchBarState extends State { height: 10, ), GFSearchBar( - // searchBoxInputDecoration: InputDecoration( - // enabledBorder: OutlineInputBorder( - // borderSide: BorderSide( - // color: Colors.teal, - // ), - // borderRadius: BorderRadius.circular(50)), - // ), searchList: list, -// hideSearchBoxWhenItemSelected: false, -// overlaySearchListHeight: 100.0, searchQueryBuilder: (query, list) => list .where((item) => item.toLowerCase().contains(query.toLowerCase())) .toList(), - overlaySearchListItemBuilder: (item) => Container( + overlaySearchListItemBuilder: (dynamic item) => Container( padding: const EdgeInsets.all(8), child: Text( item, style: const TextStyle(fontSize: 18), ), ), -// noItemsFoundWidget: Container( -// color: Colors.green, -// child: Text("no items found..."), -// ), - onItemSelected: (item) { - setState(() { - print('$item'); - }); + onItemSelected: (dynamic item) { + setState(() {}); }), const Padding( padding: EdgeInsets.only(left: 15, top: 30, bottom: 10), @@ -127,59 +112,35 @@ class _SearchBarState extends State { borderRadius: BorderRadius.circular(50)), ), searchList: list, -// hideSearchBoxWhenItemSelected: false, -// overlaySearchListHeight: 100.0, searchQueryBuilder: (query, list) => list .where((item) => item.toLowerCase().contains(query.toLowerCase())) .toList(), - overlaySearchListItemBuilder: (item) => Container( + overlaySearchListItemBuilder: (dynamic item) => Container( padding: const EdgeInsets.all(8), child: Text( item, style: const TextStyle(fontSize: 18), ), ), -// noItemsFoundWidget: Container( -// color: Colors.green, -// child: Text("no items found..."), -// ), - onItemSelected: (item) { - setState(() { - print('$item'); - }); + onItemSelected: (dynamic item) { + setState(() {}); }), GFSearchBar( -// searchBoxInputDecoration: InputDecoration( -// enabledBorder: OutlineInputBorder( -// borderSide: BorderSide( -// color: Colors.teal, -// ), -// borderRadius: BorderRadius.circular(50) -// ), -// ), searchList: list, -// hideSearchBoxWhenItemSelected: false, -// overlaySearchListHeight: 100.0, searchQueryBuilder: (query, list) => list .where((item) => item.toLowerCase().contains(query.toLowerCase())) .toList(), - overlaySearchListItemBuilder: (item) => Container( + overlaySearchListItemBuilder: (dynamic item) => Container( padding: const EdgeInsets.all(8), child: Text( item, style: const TextStyle(fontSize: 18), ), ), -// noItemsFoundWidget: Container( -// color: Colors.green, -// child: Text("no items found..."), -// ), - onItemSelected: (item) { - setState(() { - print('selected item $item'); - }); + onItemSelected: (dynamic item) { + setState(() {}); }), ], ), diff --git a/lib/screens/shimmer/shimmer.dart b/lib/screens/shimmer/shimmer.dart index 59332e9..1de536d 100644 --- a/lib/screens/shimmer/shimmer.dart +++ b/lib/screens/shimmer/shimmer.dart @@ -40,7 +40,7 @@ class _ShimmerState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), GFShimmer( @@ -103,7 +103,7 @@ class _ShimmerState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), GFShimmer( diff --git a/lib/screens/stickyheader/basic.dart b/lib/screens/stickyheader/basic.dart new file mode 100644 index 0000000..c2ec90c --- /dev/null +++ b/lib/screens/stickyheader/basic.dart @@ -0,0 +1,124 @@ +import 'package:flutter/material.dart'; +import 'package:getwidget/getwidget.dart'; +import 'package:gf_web/screens/layout/layout.dart'; +import 'package:gf_web/styles/styles.dart'; + +class BasicStickyHeader extends StatefulWidget { + @override + _BasicStickyHeaderState createState() => _BasicStickyHeaderState(); +} + +class _BasicStickyHeaderState extends State + with SingleTickerProviderStateMixin { + final List imageList = [ + "lib/assets/images/s1.png", + "lib/assets/images/s2.png", + "lib/assets/images/s3.png", + "lib/assets/images/s4.png", + "lib/assets/images/s5.png", + ]; + bool check = true; + + @override + void initState() { + super.initState(); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + body: Layout( + demoImageUrl: 'lib/assets/gif/Sticky.gif', + body: ListView( + children: [ + Text( + 'Basic Sticky Header', + style: hintStyleTextblackbolder(), + ), + SizedBox( + height: 20, + ), + Text( + "Sticky navigation is a term used to describe a fixed navigation menu on a webpage that remains visible and in the same position as the user scrolls down and moves about a site.", + style: hintStyleTextblackdull(), + ), + SizedBox( + height: 30, + ), + Container( + height: 600, + child: ListView.builder( + itemCount: imageList.length, + itemBuilder: (context, index) => GFStickyHeader( + stickyContent: Container( + child: Container( + alignment: AlignmentDirectional.center, + height: 50, + width: MediaQuery.of(context).size.width, + color: Color(0xFF42335d), + padding: EdgeInsets.symmetric(horizontal: 16.0), + child: Row( + children: [ + Text( + 'Contact Group $index', + style: const TextStyle(color: Colors.white), + ), + ], + ), + ), + ), + content: Container( + height: 300, + child: ListView.builder( + physics: ScrollPhysics(), + shrinkWrap: true, + scrollDirection: Axis.vertical, + itemCount: 8, + itemBuilder: (BuildContext context, int index) { + return SingleChildScrollView( + child: Column( + children: [ + GFCheckboxListTile( + titleText: 'Eva Mendez', + subTitleText: 'Hello', + avatar: GFAvatar( + backgroundImage: AssetImage( + 'lib/assets/images/img.png'), + ), + size: 25, + activeBgColor: Colors.green, + activeIcon: Icon( + Icons.check, + size: 15, + color: Colors.white, + ), + type: GFCheckboxType.circle, + onChanged: (val) { + setState(() { + check = val; + }); + }, + value: check, + inactiveIcon: null, + ), + Padding( + padding: const EdgeInsets.symmetric( + horizontal: 20.0), + child: Divider(), + ), + ], + ), + ); + }), + ), + )), + ), + SizedBox( + height: 20, + ) + ], + ), + ), + ); + } +} diff --git a/lib/screens/stickyheader/custom.dart b/lib/screens/stickyheader/custom.dart new file mode 100644 index 0000000..1627c99 --- /dev/null +++ b/lib/screens/stickyheader/custom.dart @@ -0,0 +1,219 @@ +import 'package:flutter/material.dart'; +import 'package:getwidget/getwidget.dart'; +import 'package:gf_web/screens/layout/layout.dart'; +import 'package:gf_web/styles/styles.dart'; + +class CustomStickyHeader extends StatefulWidget { + @override + _CustomStickyHeaderState createState() => _CustomStickyHeaderState(); +} + +class _CustomStickyHeaderState extends State + with SingleTickerProviderStateMixin { + final List imageList = [ + "lib/assets/images/e1.png", + "lib/assets/images/e2.png", + "lib/assets/images/e3.png", + "lib/assets/images/e5.png", + "lib/assets/images/e1.png", + "lib/assets/images/s3.png", + "lib/assets/images/s4.png", + "lib/assets/images/s5.png", + ]; + int groupValue = 0; + + @override + void initState() { + super.initState(); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + body: Layout( + demoImageUrl: 'lib/assets/gif/Sticky.gif', + body: ListView( + children: [ + Text( + 'Custom Sticky Header', + style: hintStyleTextblackbolder(), + ), + SizedBox( + height: 20, + ), + Text( + "Sticky navigation is a term used to describe a fixed navigation menu on a webpage that remains visible and in the same position as the user scrolls down and moves about a site.", + style: hintStyleTextblackdull(), + ), + SizedBox( + height: 30, + ), + Container( + height: 600, + child: ListView.builder( + itemCount: imageList.length, + itemBuilder: (context, index) => GFStickyHeaderBuilder( + direction: Axis.horizontal, + stickyContentBuilder: + (BuildContext context, double stuckValue) { + stuckValue = 1.0 - stuckValue.clamp(0.0, 1.0); + return Column( + children: [ + Container( + height: 50, + width: MediaQuery.of(context).size.width * 0.5, + color: Color.lerp( + Color(0xFF42335d).withOpacity(0.6), + Color(0xFF42335d), + stuckValue), + padding: + const EdgeInsets.symmetric(horizontal: 16), + alignment: Alignment.centerLeft, + child: Row( + children: [ + Expanded( + child: Text( + 'Product Name $index', + style: const TextStyle( + color: Colors.white), + ), + ), + ], + ), + ), + Container( + width: MediaQuery.of(context).size.width * 0.5, + child: ListView.builder( + physics: ScrollPhysics(), + shrinkWrap: true, + scrollDirection: Axis.vertical, + itemCount: 1, + itemBuilder: + (BuildContext context, int index) { + return SingleChildScrollView( + child: Container( + padding: EdgeInsets.symmetric( + horizontal: 15), + child: Column( + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + SizedBox(height: 15), + Row( + children: [ + GFRadio( + type: GFRadioType.blunt, + size: 23, + value: 1, + groupValue: groupValue, + onChanged: (dynamic val) { + setState(() { + groupValue = val; + }); + }, + inactiveIcon: null, + activeBorderColor: + GFColors.SUCCESS, + customBgColor: + GFColors.SUCCESS, + ), + SizedBox(width: 5), + Text('Large') + ], + ), + SizedBox(height: 8), + Row( + children: [ + GFRadio( + type: GFRadioType.blunt, + size: 23, + value: 2, + groupValue: groupValue, + onChanged: (dynamic val) { + setState(() { + groupValue = val; + }); + }, + inactiveIcon: null, + activeBorderColor: + GFColors.SUCCESS, + customBgColor: + GFColors.SUCCESS, + ), + SizedBox(width: 5), + Text('Medium') + ], + ), + SizedBox(height: 8), + Row( + children: [ + GFRadio( + type: GFRadioType.blunt, + size: 23, + value: 3, + groupValue: groupValue, + onChanged: (dynamic val) { + setState(() { + groupValue = val; + }); + }, + inactiveIcon: null, + activeBorderColor: + GFColors.SUCCESS, + customBgColor: + GFColors.SUCCESS, + ), + SizedBox(width: 5), + Text('Small') + ], + ), + SizedBox(height: 8), + Row( + children: [ + GFRadio( + type: GFRadioType.blunt, + size: 23, + value: 3, + groupValue: groupValue, + onChanged: (dynamic val) { + setState(() { + groupValue = val; + }); + }, + inactiveIcon: null, + activeBorderColor: + GFColors.SUCCESS, + customBgColor: + GFColors.SUCCESS, + ), + SizedBox(width: 5), + Text('Extra Small') + ], + ), + ], + ), + ), + ); + }), + ), + ], + ); + }, + content: Container( + height: 200, + width: MediaQuery.of(context).size.width * 0.1, + color: Colors.teal, + child: Image.asset(imageList[index], + fit: BoxFit.fill, width: 100, height: 200), + ), + )), + ), + SizedBox( + height: 20, + ) + ], + ), + ), + ); + } +} diff --git a/lib/screens/tabs/bottom-icon.dart b/lib/screens/tabs/bottom-icon.dart index c7451a9..b19e252 100644 --- a/lib/screens/tabs/bottom-icon.dart +++ b/lib/screens/tabs/bottom-icon.dart @@ -10,7 +10,7 @@ class BottomIconTabs extends StatefulWidget { class _BottomIconTabsState extends State with TickerProviderStateMixin { - TabController tabController; + TabController? tabController; @override void initState() { @@ -20,7 +20,7 @@ class _BottomIconTabsState extends State @override void dispose() { - tabController.dispose(); + tabController!.dispose(); super.dispose(); } @@ -102,7 +102,6 @@ class _BottomIconTabsState extends State ), ], indicatorColor: GFColors.SUCCESS, -// indicatorSize: TabBarIndicatorSize.label, labelColor: GFColors.SUCCESS, labelPadding: const EdgeInsets.all(8), tabBarColor: GFColors.DARK, diff --git a/lib/screens/tabs/bottom-labeled.dart b/lib/screens/tabs/bottom-labeled.dart index ef3dfad..fed3209 100644 --- a/lib/screens/tabs/bottom-labeled.dart +++ b/lib/screens/tabs/bottom-labeled.dart @@ -10,7 +10,7 @@ class BottomLabeledTabs extends StatefulWidget { class _BottomLabeledTabsState extends State with TickerProviderStateMixin { - TabController tabController; + TabController? tabController; @override void initState() { @@ -20,7 +20,7 @@ class _BottomLabeledTabsState extends State @override void dispose() { - tabController.dispose(); + tabController!.dispose(); super.dispose(); } @@ -143,7 +143,6 @@ class _BottomLabeledTabsState extends State ), ], indicatorColor: GFColors.SUCCESS, -// indicatorSize: TabBarIndicatorSize.label, labelColor: GFColors.SUCCESS, labelPadding: const EdgeInsets.all(8), tabBarColor: GFColors.DARK, diff --git a/lib/screens/tabs/icon-tabs.dart b/lib/screens/tabs/icon-tabs.dart index f958b7e..e903490 100644 --- a/lib/screens/tabs/icon-tabs.dart +++ b/lib/screens/tabs/icon-tabs.dart @@ -9,7 +9,7 @@ class IconTabs extends StatefulWidget { } class _IconTabsState extends State with TickerProviderStateMixin { - TabController tabController; + TabController? tabController; @override void initState() { @@ -19,7 +19,7 @@ class _IconTabsState extends State with TickerProviderStateMixin { @override void dispose() { - tabController.dispose(); + tabController!.dispose(); super.dispose(); } @@ -62,8 +62,6 @@ class _IconTabsState extends State with TickerProviderStateMixin { ), ], indicatorColor: Colors.teal, - -// indicatorSize: TabBarIndicatorSize.label, labelColor: GFColors.SUCCESS, labelPadding: const EdgeInsets.all(8), tabBarColor: GFColors.WHITE, diff --git a/lib/screens/tabs/labeled-tabs.dart b/lib/screens/tabs/labeled-tabs.dart index 82e0c78..1074cc2 100644 --- a/lib/screens/tabs/labeled-tabs.dart +++ b/lib/screens/tabs/labeled-tabs.dart @@ -10,7 +10,7 @@ class LabeledTabs extends StatefulWidget { class _LabeledTabsState extends State with TickerProviderStateMixin { - TabController tabController; + TabController? tabController; @override void initState() { @@ -20,7 +20,7 @@ class _LabeledTabsState extends State @override void dispose() { - tabController.dispose(); + tabController!.dispose(); super.dispose(); } @@ -107,11 +107,8 @@ class _LabeledTabsState extends State ), ], indicatorColor: Colors.teal, - -// indicatorSize: TabBarIndicatorSize.label, labelColor: GFColors.SUCCESS, labelPadding: const EdgeInsets.all(8), - tabBarColor: GFColors.WHITE, unselectedLabelColor: GFColors.LIGHT, labelStyle: TextStyle( @@ -120,7 +117,6 @@ class _LabeledTabsState extends State color: Colors.white, fontFamily: 'OpenSansBold', ), - unselectedLabelStyle: TextStyle( fontWeight: FontWeight.w500, fontSize: 13, diff --git a/lib/screens/tabs/segmented-tabs.dart b/lib/screens/tabs/segmented-tabs.dart index 49022b1..aad3bf7 100644 --- a/lib/screens/tabs/segmented-tabs.dart +++ b/lib/screens/tabs/segmented-tabs.dart @@ -9,7 +9,7 @@ class SegmentTab extends StatefulWidget { } class _SegmentTabState extends State with TickerProviderStateMixin { - TabController tabController; + TabController? tabController; @override void initState() { @@ -19,7 +19,7 @@ class _SegmentTabState extends State with TickerProviderStateMixin { @override void dispose() { - tabController.dispose(); + tabController!.dispose(); super.dispose(); } @@ -49,7 +49,6 @@ class _SegmentTabState extends State with TickerProviderStateMixin { margin: const EdgeInsets.only(top: 20, left: 25, right: 25), child: GFSegmentTabs( tabController: tabController, -// height: 38.0, width: 280, length: 3, tabs: const [ @@ -79,14 +78,11 @@ class _SegmentTabState extends State with TickerProviderStateMixin { width: 3, ), ), -// borderRadius: BorderRadius.circular(2.0) ), indicatorPadding: const EdgeInsets.all(8), indicatorWeight: 2, border: Border.all(color: Colors.white, width: 2), ), -// -// ), Container( height: MediaQuery.of(context).size.height - 140, diff --git a/lib/screens/tabs/tabs.dart b/lib/screens/tabs/tabs.dart index 38424bc..e7283f7 100644 --- a/lib/screens/tabs/tabs.dart +++ b/lib/screens/tabs/tabs.dart @@ -9,7 +9,7 @@ class Tabs extends StatefulWidget { } class _TabsState extends State with TickerProviderStateMixin { - TabController tabController; + TabController? tabController; @override void initState() { @@ -19,7 +19,7 @@ class _TabsState extends State with TickerProviderStateMixin { @override void dispose() { - tabController.dispose(); + tabController!.dispose(); super.dispose(); } @@ -47,14 +47,11 @@ class _TabsState extends State with TickerProviderStateMixin { SizedBox( height: 20, ), -// GFCard( - // content: Column( Container( height: 40, margin: EdgeInsets.only(top: 20), child: GFSegmentTabs( tabController: tabController, -// height: 38.0, width: 280.0, length: 4, tabs: [ @@ -93,14 +90,11 @@ class _TabsState extends State with TickerProviderStateMixin { width: 3.0, ), ), -// borderRadius: BorderRadius.circular(2.0) ), indicatorPadding: EdgeInsets.all(8.0), indicatorWeight: 2.0, border: Border.all(color: Colors.white, width: 2.0), ), -// -// ), Container( height: MediaQuery.of(context).size.height - 140, @@ -110,57 +104,7 @@ class _TabsState extends State with TickerProviderStateMixin { color: GFColors.WHITE, child: Column( mainAxisAlignment: MainAxisAlignment.center, - children: [ -// GFTabBar( -// initialIndex: 0, -// length: 4, -// controller: tabController, -// tabs: [ -// Tab( -// icon: Icon( -// Icons.home, -// ), -// ), -// Tab( -// icon: Icon( -// Icons.music_note, -// ), -// ), -// Tab( -// icon: Icon( -// Icons.games, -// ), -// ), -// Tab( -// icon: Icon( -// Icons.notifications, -// ), -// ), -// // GFIconButton( -// // icon: Icon(Icons.home,), -// // onPressed: (){}, -// // ), -// ], -// indicatorColor: GFColors.SUCCESS, -// // indicatorSize: TabBarIndicatorSize.label, -// labelColor: GFColors.SUCCESS, -// labelPadding: EdgeInsets.all(8.0), -// tabBarColor: GFColors.DARK, -// unselectedLabelColor: GFColors.WHITE, -// labelStyle: TextStyle( -// fontWeight: FontWeight.w500, -// fontSize: 13.0, -// color: Colors.white, -// fontFamily: 'OpenSansBold', -// ), -// unselectedLabelStyle: TextStyle( -// fontWeight: FontWeight.w500, -// fontSize: 13.0, -// color: Colors.black, -// fontFamily: 'OpenSansBold', -// ), -// ), - ], + children: [], )), Container( height: 30, @@ -174,51 +118,6 @@ class _TabsState extends State with TickerProviderStateMixin { border: Border( top: BorderSide(color: GFColors.LIGHT))), ), -// GFTabBar( -// initialIndex: 0, -// length: 4, -// controller: tabController, -// tabs: [ -// Tab( -// icon: Icon( -// Icons.home, -// ), -// ), -// Tab( -// icon: Icon(Icons.music_note), -// ), -// Tab( -// icon: Icon( -// Icons.games, -// ), -// ), -// Tab( -// icon: Icon( -// Icons.notifications, -// ), -// ), -// ], -// indicatorColor: Colors.teal, - -// // indicatorSize: TabBarIndicatorSize.label, -// labelColor: GFColors.SUCCESS, -// labelPadding: EdgeInsets.all(8.0), -// tabBarColor: GFColors.WHITE, -// unselectedLabelColor: GFColors.LIGHT, -// labelStyle: TextStyle( -// fontWeight: FontWeight.w500, -// fontSize: 13.0, -// color: Colors.white, -// fontFamily: 'OpenSansBold', -// ), - -// unselectedLabelStyle: TextStyle( -// fontWeight: FontWeight.w500, -// fontSize: 13.0, -// color: Colors.black, -// fontFamily: 'OpenSansBold', -// ), -// ), ], )), Container( @@ -233,87 +132,6 @@ class _TabsState extends State with TickerProviderStateMixin { border: Border( top: BorderSide(color: GFColors.LIGHT))), ), -// GFTabBar( -// initialIndex: 0, -// length: 4, -// controller: tabController, -// tabs: [ -// Column( -// mainAxisAlignment: MainAxisAlignment.center, -// children: [ -// Icon( -// Icons.home, -// ), -// Text( -// 'Home', -// style: TextStyle( -// fontSize: 10, -// ), -// ) -// ], -// ), -// Column( -// mainAxisAlignment: MainAxisAlignment.center, -// children: [ -// Icon(Icons.music_note, -// color: GFColors.LIGHT), -// Text( -// 'Music', -// style: TextStyle( -// fontSize: 10, -// ), -// ) -// ], -// ), -// Column( -// mainAxisAlignment: MainAxisAlignment.center, -// children: [ -// Icon( -// Icons.games, -// ), -// Text( -// 'Games', -// style: TextStyle( -// fontSize: 10, -// ), -// ) -// ], -// ), -// Column( -// mainAxisAlignment: MainAxisAlignment.center, -// children: [ -// Icon( -// Icons.notifications, -// ), -// Text( -// 'Notifications', -// style: TextStyle( -// fontSize: 10, -// ), -// ) -// ], -// ), -// ], -// indicatorColor: Colors.teal, - -// // indicatorSize: TabBarIndicatorSize.label, -// labelColor: GFColors.SUCCESS, -// labelPadding: EdgeInsets.all(8.0), -// tabBarColor: GFColors.DARK, -// unselectedLabelColor: GFColors.LIGHT, -// labelStyle: TextStyle( -// fontWeight: FontWeight.w500, -// fontSize: 13.0, -// color: Colors.white, -// fontFamily: 'OpenSansBold', -// ), -// unselectedLabelStyle: TextStyle( -// fontWeight: FontWeight.w500, -// fontSize: 13.0, -// color: Colors.black, -// fontFamily: 'OpenSansBold', -// ), -// ), ], )), Container( @@ -328,94 +146,10 @@ class _TabsState extends State with TickerProviderStateMixin { border: Border( top: BorderSide(color: GFColors.LIGHT))), ), -// GFTabBar( -// initialIndex: 0, -// length: 4, -// controller: tabController, -// tabs: [ -// Column( -// mainAxisAlignment: MainAxisAlignment.center, -// children: [ -// Icon( -// Icons.home, -// ), -// Text( -// 'Home', -// style: TextStyle( -// fontSize: 10, -// ), -// ) -// ], -// ), -// Column( -// mainAxisAlignment: MainAxisAlignment.center, -// children: [ -// Icon( -// Icons.music_note, -// ), -// Text( -// 'Music', -// style: TextStyle( -// fontSize: 10, -// ), -// ) -// ], -// ), -// Column( -// mainAxisAlignment: MainAxisAlignment.center, -// children: [ -// Icon( -// Icons.games, -// ), -// Text( -// 'Games', -// style: TextStyle( -// fontSize: 10, -// ), -// ) -// ], -// ), -// Column( -// mainAxisAlignment: MainAxisAlignment.center, -// children: [ -// Icon( -// Icons.notifications, -// ), -// Text( -// 'Notifications', -// style: TextStyle( -// fontSize: 10, -// ), -// ) -// ], -// ), -// ], -// indicatorColor: Colors.teal, - -// // indicatorSize: TabBarIndicatorSize.label, -// labelColor: GFColors.SUCCESS, -// labelPadding: EdgeInsets.all(8.0), -// tabBarColor: GFColors.WHITE, -// unselectedLabelColor: GFColors.LIGHT, -// labelStyle: TextStyle( -// fontWeight: FontWeight.w500, -// fontSize: 13.0, -// color: Colors.white, -// fontFamily: 'OpenSansBold', -// ), -// unselectedLabelStyle: TextStyle( -// fontWeight: FontWeight.w500, -// fontSize: 13.0, -// color: Colors.black, -// fontFamily: 'OpenSansBold', -// ), -// ), ], )), ]), ), - // ), - // ), SizedBox( height: 30, ), diff --git a/lib/screens/tiles/tiles.dart b/lib/screens/tiles/tiles.dart index 633c501..5760f98 100644 --- a/lib/screens/tiles/tiles.dart +++ b/lib/screens/tiles/tiles.dart @@ -38,6 +38,7 @@ class _TilesState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'With Label', style: hintStyleTextblackbold(), @@ -48,7 +49,6 @@ class _TilesState extends State { height: 20, ), GFCard( - // content: Text("fj"), title: GFListTile( title: Text( 'Title', @@ -60,7 +60,6 @@ class _TilesState extends State { ), description: Text(""), icon: Icon(Icons.favorite), - // showDivider: false, ), ), GFCard( @@ -76,7 +75,6 @@ class _TilesState extends State { ), description: Container(), subTitle: Container(), - // showDivider: false, ), ), SizedBox( @@ -90,6 +88,7 @@ class _TilesState extends State { type: GFTypographyType.typo5, dividerWidth: 50, dividerColor: Color(0xFF19CA4B), + text: '', child: Text( 'With Avatar', style: hintStyleTextblackbold(), @@ -113,7 +112,6 @@ class _TilesState extends State { 'Lorem ipsum dolor sit amet, consectetur adipiscing', style: TextStyle(fontSize: 16.0), ), - // showDivider: false, ), ), GFCard( @@ -132,7 +130,6 @@ class _TilesState extends State { 'Caption', style: TextStyle(fontSize: 19.0), ), - // showDivider: false, ), ), ], diff --git a/lib/screens/toasts/toasts.dart b/lib/screens/toasts/toasts.dart index c95e2b9..af349b0 100644 --- a/lib/screens/toasts/toasts.dart +++ b/lib/screens/toasts/toasts.dart @@ -43,7 +43,7 @@ class _ToastsState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), SizedBox( @@ -79,7 +79,7 @@ class _ToastsState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), SizedBox( @@ -127,7 +127,7 @@ class _ToastsState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), SizedBox( @@ -177,7 +177,7 @@ class _ToastsState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), SizedBox( diff --git a/lib/screens/toggles/toggle.dart b/lib/screens/toggles/toggle.dart index 6517963..c300d5c 100644 --- a/lib/screens/toggles/toggle.dart +++ b/lib/screens/toggles/toggle.dart @@ -45,7 +45,7 @@ class _ToggleState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), SizedBox( @@ -61,30 +61,22 @@ class _ToggleState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ GFToggle( - onChanged: (val) { - print('on change val $val'); - }, + onChanged: (val) {}, value: true, ), GFToggle( enabledTrackColor: GFColors.DANGER, - onChanged: (val) { - print('on change val $val'); - }, + onChanged: (val) {}, value: true, ), GFToggle( enabledTrackColor: GFColors.WARNING, - onChanged: (val) { - print('on change val $val'); - }, + onChanged: (val) {}, value: true, ), GFToggle( enabledTrackColor: GFColors.INFO, - onChanged: (val) { - print('on change val $val'); - }, + onChanged: (val) {}, value: true, ) ], @@ -108,7 +100,7 @@ class _ToggleState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), SizedBox( @@ -124,33 +116,25 @@ class _ToggleState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ GFToggle( - onChanged: (v) { - print('ios val $v'); - }, + onChanged: (v) {}, value: true, type: GFToggleType.ios, ), GFToggle( enabledTrackColor: GFColors.DANGER, - onChanged: (v) { - print('ios val $v'); - }, + onChanged: (v) {}, value: true, type: GFToggleType.ios, ), GFToggle( enabledTrackColor: GFColors.WARNING, - onChanged: (v) { - print('ios val $v'); - }, + onChanged: (v) {}, value: true, type: GFToggleType.ios, ), GFToggle( enabledTrackColor: GFColors.INFO, - onChanged: (v) { - print('ios val $v'); - }, + onChanged: (v) {}, value: true, type: GFToggleType.ios, ) @@ -175,7 +159,7 @@ class _ToggleState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), SizedBox( @@ -191,33 +175,25 @@ class _ToggleState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ GFToggle( - onChanged: (val) { - print('on change val $val'); - }, + onChanged: (val) {}, value: true, type: GFToggleType.square, ), GFToggle( enabledTrackColor: GFColors.DANGER, - onChanged: (val) { - print('on change val $val'); - }, + onChanged: (val) {}, value: true, type: GFToggleType.square, ), GFToggle( enabledTrackColor: GFColors.WARNING, - onChanged: (val) { - print('on change val $val'); - }, + onChanged: (val) {}, value: true, type: GFToggleType.square, ), GFToggle( enabledTrackColor: GFColors.INFO, - onChanged: (val) { - print('on change val $val'); - }, + onChanged: (val) {}, value: true, type: GFToggleType.square, ) @@ -242,7 +218,7 @@ class _ToggleState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), ), SizedBox( @@ -258,25 +234,19 @@ class _ToggleState extends State { mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ GFToggle( - onChanged: (val) { - print('on change val $val'); - }, + onChanged: (val) {}, value: true, type: GFToggleType.custom, ), GFToggle( - onChanged: (val) { - print('on change val $val'); - }, + onChanged: (val) {}, value: true, type: GFToggleType.android, boxShape: BoxShape.rectangle, enabledTrackColor: GFColors.DANGER, ), GFToggle( - onChanged: (val) { - print('on change val $val'); - }, + onChanged: (val) {}, value: true, type: GFToggleType.ios, boxShape: BoxShape.rectangle, @@ -285,9 +255,7 @@ class _ToggleState extends State { const BorderRadius.all(Radius.circular(0)), ), GFToggle( - onChanged: (val) { - print('on change val $val'); - }, + onChanged: (val) {}, value: true, type: GFToggleType.ios, boxShape: BoxShape.rectangle, diff --git a/lib/screens/typography/heading.dart b/lib/screens/typography/heading.dart index 7cbea13..bc9ac98 100644 --- a/lib/screens/typography/heading.dart +++ b/lib/screens/typography/heading.dart @@ -41,7 +41,7 @@ class _TypographyState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), SizedBox( height: 20, @@ -117,7 +117,7 @@ class _TypographyState extends State { ), type: GFTypographyType.typo5, dividerWidth: 45, - dividerColor: Color(0xFF19CA4B), + dividerColor: Color(0xFF19CA4B), text: '', ), SizedBox( height: 20, diff --git a/pubspec.lock b/pubspec.lock index 6fee1cc..f053a5f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,63 +7,56 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.5.0-nullsafety" + version: "2.5.0" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety" + version: "2.1.0" characters: dependency: transitive description: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety.2" + version: "1.1.0" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety" + version: "1.2.0" clock: dependency: transitive description: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety" + version: "1.1.0" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0-nullsafety.2" - convert: - dependency: transitive - description: - name: convert - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.1" + version: "1.15.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "1.0.2" fake_async: dependency: transitive description: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety" + version: "1.2.0" flutter: dependency: "direct main" description: flutter @@ -75,7 +68,7 @@ packages: name: flutter_svg url: "https://pub.dartlang.org" source: hosted - version: "0.18.1" + version: "0.21.0-nullsafety.0" flutter_test: dependency: "direct dev" description: flutter @@ -89,59 +82,66 @@ packages: getwidget: dependency: "direct main" description: - name: getwidget + path: "D:\\Flutter_Apps\\Get_Widget\\getwidget\\" + relative: false + source: path + version: "2.0.1-nullsafety.4" + js: + dependency: transitive + description: + name: js url: "https://pub.dartlang.org" source: hosted - version: "1.1.3" + version: "0.6.3" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.10-nullsafety" + version: "0.12.10" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.2" + version: "1.3.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0-nullsafety" + version: "1.8.0" path_drawing: dependency: transitive description: name: path_drawing url: "https://pub.dartlang.org" source: hosted - version: "0.4.1+1" + version: "0.5.0-nullsafety.0" path_parsing: dependency: transitive description: name: path_parsing url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.2.0-nullsafety.0" petitparser: dependency: transitive description: name: petitparser url: "https://pub.dartlang.org" source: hosted - version: "3.1.0" + version: "4.0.2" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "2.0.0" sky_engine: dependency: transitive description: flutter @@ -153,91 +153,105 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.0-nullsafety" + version: "1.8.0" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.10.0-nullsafety" + version: "1.10.0" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety" + version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0-nullsafety" + version: "1.1.0" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0-nullsafety" + version: "1.2.0" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.19-nullsafety" + version: "0.2.19" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.2" + version: "1.3.0" url_launcher: dependency: "direct main" description: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "5.4.1" + version: "6.0.2" + url_launcher_linux: + dependency: transitive + description: + name: url_launcher_linux + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" url_launcher_macos: dependency: transitive description: name: url_launcher_macos url: "https://pub.dartlang.org" source: hosted - version: "0.0.1+2" + version: "2.0.0" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "2.0.2" url_launcher_web: dependency: transitive description: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "0.1.0+2" + version: "2.0.0" + url_launcher_windows: + dependency: transitive + description: + name: url_launcher_windows + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.0" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0-nullsafety.2" + version: "2.1.0" xml: dependency: transitive description: name: xml url: "https://pub.dartlang.org" source: hosted - version: "4.5.0" + version: "5.0.2" sdks: - dart: ">=2.10.0-0.0.dev <2.10.0" - flutter: ">=1.18.0-6.0.pre <2.0.0" + dart: ">=2.12.0 <3.0.0" + flutter: ">=1.24.0-7.0" diff --git a/pubspec.yaml b/pubspec.yaml index 6ec851f..76eecd5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,15 +4,16 @@ description: A new Flutter project. version: 1.0.0+1 environment: - sdk: ">=2.1.0 <3.0.0" + sdk: '>=2.12.0 <3.0.0' dependencies: flutter: sdk: flutter - cupertino_icons: ^0.1.2 - flutter_svg: ^0.18.0 - url_launcher: ^5.4.1 - getwidget: ^1.1.3 + cupertino_icons: ^1.0.2 + flutter_svg: ^0.21.0-nullsafety.0 + url_launcher: ^6.0.2 + getwidget: + path: D:\Flutter_Apps\Get_Widget\getwidget\ dev_dependencies: flutter_test: @@ -121,6 +122,9 @@ flutter: - lib/assets/gif/accordion.gif - lib/assets/gif/searchbar.gif - lib/assets/gif/appbar.gif + - lib/assets/gif/Sticky.gif + - lib/assets/gif/Intro.gif + - lib/assets/gif/Dropdown.gif - lib/assets/images/c1.png - lib/assets/images/c2.png - lib/assets/images/c3.png @@ -143,3 +147,24 @@ flutter: - lib/assets/gif/Checkbox.gif - lib/assets/gif/bottomsheet.gif - lib/assets/images/gflogo.png + - lib/assets/images/story.jpg + - lib/assets/images/i1.png + - lib/assets/images/i2.png + - lib/assets/images/i3.png + - lib/assets/images/i4.png + - lib/assets/icons/allign.png + - lib/assets/icons/Rotation.png + - lib/assets/icons/scaling.png + - lib/assets/icons/size.png + - lib/assets/icons/slide.png + - lib/assets/icons/gflogo.png + - lib/assets/images/e5.png + - lib/assets/images/e4.png + - lib/assets/images/e3.png + - lib/assets/images/e2.png + - lib/assets/images/e1.png + - lib/assets/images/s1.png + - lib/assets/images/s2.png + - lib/assets/images/s3.png + - lib/assets/images/s4.png + - lib/assets/images/s5.png \ No newline at end of file