Merge pull request #236 from deepikahr/master

gf icon badge position added

Author: Sandipkakadiya

lib/components/badge/gf_icon_badge.dart

@@ -3,12 +3,13 @@ import 'package:getwidget/getwidget.dart';
 
 class GFIconBadge extends StatefulWidget {
   /// Create badges of all types, check out [GFBadge] for button badges and [GFIconBadge] for icon badges.
-  const GFIconBadge({
-    Key? key,
-    this.padding = const EdgeInsets.symmetric(horizontal: 8),
-    required this.child,
-    required this.counterChild,
-  }) : super(key: key);
+  const GFIconBadge(
+      {Key? key,
+      this.padding = const EdgeInsets.symmetric(horizontal: 8),
+      required this.child,
+      required this.counterChild,
+      this.position})
+      : super(key: key);
 
   /// child of type [Widget] is used to show icon.
   /// Use [GFIconButton] widget for compatibility.
@@ -21,21 +22,38 @@ class GFIconBadge extends StatefulWidget {
   /// The internal padding for the badge's [child].
   final EdgeInsetsGeometry padding;
 
+  /// defines the position of [GFBadge].
+  final GFBadgePosition? position;
+
   @override
   _GFIconBadgeState createState() => _GFIconBadgeState();
 }
 
+
+
 class _GFIconBadgeState extends State<GFIconBadge> {
   @override
   Widget build(BuildContext context) => Container(
-        padding: widget.padding,
-        child: Stack(
-          children: <Widget>[
-            widget.child,
-            Positioned(
-              child: widget.counterChild,
-            ),
-          ],
-        ),
-      );
+      padding: widget.padding,
+      child: Stack(
+        fit: StackFit.loose,
+        alignment: Alignment.center,
+        clipBehavior: Clip.none,
+        children: [
+          widget.child,
+          widget.position == null
+              ? PositionedDirectional(
+                  top: GFBadgePosition.topEnd().top,
+                  end: GFBadgePosition.topEnd().end,
+                  child: widget.counterChild,
+                )
+              : PositionedDirectional(
+                  top: widget.position!.top,
+                  end: widget.position!.end,
+                  bottom: widget.position!.bottom,
+                  start: widget.position!.start,
+                  child: widget.counterChild,
+                )
+        ],
+      ));
 }

lib/components/carousel/gf_carousel.dart

@@ -130,20 +130,21 @@ class _GFCarouselState extends State<GFCarousel> with TickerProviderStateMixin {
   @override
   void initState() {
     super.initState();
+    currentSlide = widget.initialPage;
     realPage = widget.enableInfiniteScroll
         // ignore: avoid_as
         ? realPage + widget.initialPage
         // ignore: avoid_as
         : widget.initialPage;
     pageController = PageController(
-      // ignore: avoid_as
-      viewportFraction: widget.viewportFraction as double,
-      initialPage: widget.enableInfiniteScroll
-          // ignore: avoid_as
-          ? realPage + widget.initialPage
-          // ignore: avoid_as
-          : widget.initialPage,
-    );
+        // ignore: avoid_as
+        viewportFraction: widget.viewportFraction as double,
+        // initialPage: widget.enableInfiniteScroll
+        //     // ignore: avoid_as
+        //     ? realPage + widget.initialPage
+        //     // ignore: avoid_as
+        //     : widget.initialPage,
+        initialPage: realPage);
     timer = getPlayTimer();
   }
 
@@ -198,13 +199,15 @@ class _GFCarouselState extends State<GFCarousel> with TickerProviderStateMixin {
             scrollDirection: widget.scrollDirection,
             controller: pageController,
             reverse: widget.reverse,
-            itemCount: widget.items.length == 1
-                ? widget.items.length
-                : widget.enableInfiniteScroll
-                    ? null
-                    : widget.items.length,
+            // itemCount: widget.items.length == 1
+            //     ? widget.items.length
+            //     : widget.enableInfiniteScroll
+            //         ? null
+            //         : widget.items.length,
+            itemCount: widget.enableInfiniteScroll ? null : widget.items.length,
             onPageChanged: (int index) {
               int currentPage;
+
               currentPage = _getRealIndex(
                   index + widget.initialPage, realPage, widget.items.length);
               if (widget.onPageChanged != null) {

lib/components/progress_bar/gf_progress_bar.dart

@@ -5,6 +5,7 @@ class GFProgressBar extends StatefulWidget {
   /// Shows progress as a completed and remaining percentage in bar of given state
   GFProgressBar({
     Key? key,
+    this.margin = const EdgeInsets.only(left: 10, right: 10),
     this.percentage = 0.2,
     this.circleWidth = 5.0,
     this.circleStartAngle = 0.0,
@@ -72,6 +73,9 @@ class GFProgressBar extends StatefulWidget {
   /// type of EdgeInsets which gives padding to the GFProgressBar
   final EdgeInsets? padding;
 
+  /// type of EdgeInsets which gives margin to the GFProgressBar
+  final EdgeInsets? margin;
+
   /// set true if you want to animate the progress bar  from the last percentage value you set
   final bool animateFromLastPercentage;
 
@@ -228,7 +232,7 @@ class _GFProgressBarState extends State<GFProgressBar>
 
     final hasSetWidth = widget.width != null;
     final containerWidget = Container(
-        margin: const EdgeInsets.only(left: 10, right: 10),
+        margin: widget.margin,
         width: hasSetWidth ? widget.width : MediaQuery.of(context).size.width,
         height: widget.lineHeight,
         padding: widget.padding,

lib/components/typography/gf_typography.dart

@@ -8,7 +8,7 @@ class GFTypography extends StatelessWidget {
     Key? key,
     this.type = GFTypographyType.typo4,
     this.child,
-    required this.text,
+    this.text,
     this.icon,
     this.dividerBorderRadius,
     this.textColor,

lib/getwidget.dart

@@ -26,8 +26,8 @@ export 'package:getwidget/components/dropdown/gf_dropdown.dart';
 export 'package:getwidget/components/dropdown/gf_multiselect.dart';
 export 'package:getwidget/components/floating_widget/gf_floating_widget.dart';
 export 'package:getwidget/components/image/gf_image_overlay.dart';
-export 'package:getwidget/components/intro_screen/gf_intro_screen_bottom_navigation_bar.dart';
 export 'package:getwidget/components/intro_screen/gf_intro_screen.dart';
+export 'package:getwidget/components/intro_screen/gf_intro_screen_bottom_navigation_bar.dart';
 export 'package:getwidget/components/list_tile/gf_list_tile.dart';
 export 'package:getwidget/components/loader/gf_loader.dart';
 export 'package:getwidget/components/progress_bar/gf_progress_bar.dart';
@@ -49,6 +49,7 @@ export 'package:getwidget/components/typography/gf_typography.dart';
 
 export 'colors/gf_color.dart';
 export 'direction/gf_shimmer_direction.dart';
+export 'position/gf_badge_position.dart';
 export 'position/gf_position.dart';
 export 'shape/gf_avatar_shape.dart';
 export 'shape/gf_badge_shape.dart';

lib/position/gf_badge_position.dart

@@ -0,0 +1,32 @@
+/// [GFBadgePosition] is used to position the badges to top start, top bottom,
+/// bottom start or bottom end of the icon button
+/// See GFIconBadge
+
+class GFBadgePosition {
+  const GFBadgePosition({this.top, this.end, this.bottom, this.start});
+
+  factory GFBadgePosition.topStart({double top = -5, double start = -10}) =>
+      GFBadgePosition(top: top, start: start);
+
+  factory GFBadgePosition.topEnd({double top = -8, double end = -10}) =>
+      GFBadgePosition(top: top, end: end);
+
+  factory GFBadgePosition.bottomEnd({double bottom = -8, double end = -10}) =>
+      GFBadgePosition(bottom: bottom, end: end);
+
+  factory GFBadgePosition.bottomStart(
+          {double bottom = -8, double start = -10}) =>
+      GFBadgePosition(bottom: bottom, start: start);
+
+  /// defines the position of badge
+  final double? top;
+
+  /// defines the position of badge
+  final double? end;
+
+  /// defines the position of badge
+  final double? start;
+
+  /// defines the position of badge
+  final double? bottom;
+}