code refactoring

srinivas · srinivas · commit 53987f1e333b · 2020-09-16T11:24:35.000+05:30
diff --git a/lib/components/accordian/gf_accordian.dart b/lib/components/accordian/gf_accordian.dart
@@ -95,14 +95,10 @@ class _GFAccordionState extends State<GFAccordion>
   @override
   void initState() {
     showAccordion = widget.showAccordion;
-    animationController = AnimationController(
-      duration: const Duration(seconds: 2),
-        vsync: this
-    );
+    animationController =
+        AnimationController(duration: const Duration(seconds: 2), vsync: this);
     controller = AnimationController(
-      duration: const Duration(milliseconds: 300),
-        vsync: this
-    );
+        duration: const Duration(milliseconds: 300), vsync: this);
     offset = Tween(
       begin: const Offset(0, -0.06),
       end: Offset.zero,
diff --git a/lib/components/alert/gf_alert.dart b/lib/components/alert/gf_alert.dart
@@ -67,9 +67,7 @@ class _GFAlertState extends State<GFAlert> with TickerProviderStateMixin {
   @override
   void initState() {
     animationController = AnimationController(
-      duration: const Duration(milliseconds: 300),
-        vsync: this
-    );
+        duration: const Duration(milliseconds: 300), vsync: this);
     animation = CurvedAnimation(
       parent: animationController,
       curve: Curves.fastOutSlowIn,
diff --git a/lib/components/animation/gf_animation.dart b/lib/components/animation/gf_animation.dart
@@ -118,7 +118,8 @@ class _GFAnimationState extends State<GFAnimation>
     if (widget.type == GFAnimationType.rotateTransition) {
       controller = widget.controller ??
           AnimationController(
-              duration: widget.duration ?? const Duration(seconds: 2), vsync: this);
+              duration: widget.duration ?? const Duration(seconds: 2),
+              vsync: this);
       animation = widget.turnsAnimation ??
           Tween<double>(begin: 0, end: 20).animate(controller);
       if (widget.turnsAnimation == null) {
@@ -127,15 +128,16 @@ class _GFAnimationState extends State<GFAnimation>
     } else if (widget.type == GFAnimationType.scaleTransition) {
       controller = widget.controller ??
           AnimationController(
-              duration: widget.duration ?? const Duration(seconds: 2), vsync: this);
+              duration: widget.duration ?? const Duration(seconds: 2),
+              vsync: this);
       animation = widget.scaleAnimation ??
           CurvedAnimation(
               parent: controller, curve: widget.curve ?? Curves.ease);
       controller.forward();
     } else if (widget.type == GFAnimationType.slideTransition) {
       controller = AnimationController(
-        duration: widget.duration ?? const Duration(seconds: 2), vsync: this
-      )..repeat(reverse: true);
+          duration: widget.duration ?? const Duration(seconds: 2), vsync: this)
+        ..repeat(reverse: true);
       offsetAnimation = Tween<Offset>(
         begin: Offset.zero,
         end: const Offset(1.5, 0),
diff --git a/lib/components/carousel/gf_items_carousel.dart b/lib/components/carousel/gf_items_carousel.dart
@@ -82,9 +82,8 @@ class _GFItemsCarouselState extends State<GFItemsCarousel>
   void initState() {
     offset = 0;
     animationController = AnimationController(
-      duration: const Duration(milliseconds: dragAnimationDuration),
-        vsync: this
-    );
+        duration: const Duration(milliseconds: dragAnimationDuration),
+        vsync: this);
     Future.delayed(Duration.zero, () {
       setState(() {
         final double localWidth = MediaQuery.of(context).size.width;
@@ -132,9 +131,8 @@ class _GFItemsCarouselState extends State<GFItemsCarousel>
     }
 
     animationController = AnimationController(
-      duration: const Duration(milliseconds: dragAnimationDuration),
-        vsync: this
-    );
+        duration: const Duration(milliseconds: dragAnimationDuration),
+        vsync: this);
 
     final Tween tween =
         Tween<double>(begin: offset, end: calculateOffset(0.5 * dx));
@@ -164,9 +162,8 @@ class _GFItemsCarouselState extends State<GFItemsCarousel>
     final double beginAnimation = offset;
     final double endAnimation = size * (offset / size).round().toDouble();
     animationController = AnimationController(
-      duration: const Duration(milliseconds: shiftAnimationDuration),
-        vsync: this
-    );
+        duration: const Duration(milliseconds: shiftAnimationDuration),
+        vsync: this);
     final Tween tween = Tween<double>(begin: beginAnimation, end: endAnimation);
     final Animation animation = tween.animate(animationController);
     animation.addListener(() {
diff --git a/lib/components/intro_screen/custom_clipper.dart b/lib/components/intro_screen/custom_clipper.dart
@@ -0,0 +1,28 @@
+import 'package:flutter/material.dart';
+
+class MyCustomClipper extends CustomClipper<Rect> {
+  MyCustomClipper({this.alignment = Alignment.topLeft});
+
+  final Alignment alignment;
+
+  @override
+  Rect getClip(Size size) {
+    final Rect rect = alignment == Alignment.topLeft
+        ? Rect.fromLTRB(-size.width, -size.height, size.width, size.height)
+        : alignment == Alignment.topRight
+            ? Rect.fromLTRB(-size.height, -size.width, size.width, size.height)
+            : alignment == Alignment.topCenter
+                ? Rect.fromLTRB(-size.width, -size.height, -size.width, 0)
+                : alignment == Alignment.bottomLeft
+                    ? Rect.fromLTRB(0, -size.height, size.width, size.height)
+                    : alignment == Alignment.bottomCenter
+                        ? Rect.fromLTRB(
+                            0, -size.height, size.width, size.height)
+                        : Rect.fromLTRB(
+                            0, -size.height, size.width, size.height);
+    return rect;
+  }
+
+  @override
+  bool shouldReclip(CustomClipper oldClipper) => false;
+}
diff --git a/lib/components/intro_screen/gf_intro_bubble_slide.dart b/lib/components/intro_screen/gf_intro_bubble_slide.dart
@@ -0,0 +1,35 @@
+import 'package:flutter/material.dart';
+
+import 'custom_clipper.dart';
+
+class GFIntroBubbleSlide extends StatelessWidget {
+  const GFIntroBubbleSlide(
+      {Key key, this.onNext, this.onNextTitle = 'Ok next', this.child, this.alignment})
+      : super(key: key);
+
+  final Function onNext;
+  final String onNextTitle;
+  final Widget child;
+  final Alignment alignment;
+
+  @override
+  Widget build(BuildContext context) => Stack(
+        children: <Widget>[
+          Align(
+            alignment: alignment ?? Alignment.topCenter,
+            child: ClipOval(
+              clipper: MyCustomClipper(alignment: alignment),
+              child: Container(
+                height: MediaQuery.of(context).size.height / 3,
+                padding: const EdgeInsets.only(
+                    left: 24, right: 24, top: 24, bottom: 64),
+                color: Colors.yellow,
+                child: child ??
+                    RawMaterialButton(
+                        child: Text(onNextTitle), onPressed: onNext),
+              ),
+            ),
+          ),
+        ],
+      );
+}
diff --git a/lib/components/intro_screen/gf_intro_screen.dart b/lib/components/intro_screen/gf_intro_screen.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:getwidget/components/intro_screen/gf__intro_bottom_navigation.dart';
+import 'package:getwidget/components/intro_screen/gf_intro_bubble_slide.dart';
 import 'package:getwidget/components/intro_screen/gf_intro_slide.dart';
 import 'package:getwidget/types/gf_intro_type.dart';
 
@@ -9,13 +10,15 @@ class GFIntroScreen extends StatefulWidget {
       this.slides,
       this.pageController,
       this.gfIntroBottomNavigation,
-      this.type})
+      this.type,
+      this.color = Colors.white})
       : super(key: key);
 
   final List<Widget> slides;
   final GFIntroType type;
   final PageController pageController;
   final GFIntroBottomNavigation gfIntroBottomNavigation;
+  final Color color;
 
   @override
   _GFIntroScreenState createState() => _GFIntroScreenState();
@@ -24,6 +27,7 @@ class GFIntroScreen extends StatefulWidget {
 class _GFIntroScreenState extends State<GFIntroScreen> {
   PageController _pageController = PageController(initialPage: 0);
   int page = 0;
+  List<Widget> pages;
 
   @override
   void initState() {
@@ -41,59 +45,68 @@ class _GFIntroScreenState extends State<GFIntroScreen> {
   }
 
   @override
-  Widget build(BuildContext context) => Center(
-        child: Container(
-          width: widget.type == GFIntroType.fullWidth
-              ? MediaQuery.of(context).size.width
-              : MediaQuery.of(context).size.width * 0.885,
-          height: widget.type != GFIntroType.fullWidth
-              ? MediaQuery.of(context).size.height / 2
-              : MediaQuery.of(context).size.height,
-          margin: widget.type != GFIntroType.fullWidth
-              ? const EdgeInsets.only(left: 20, right: 20)
-              : const EdgeInsets.only(left: 0, right: 0),
-          padding: widget.type == GFIntroType.fullWidth
-              ? const EdgeInsets.all(0)
-              : const EdgeInsets.all(0),
-          decoration: BoxDecoration(
-            color: Colors.transparent,
-            borderRadius: widget.type == GFIntroType.fullWidth
-                ? BorderRadius.circular(0)
-                : widget.type == GFIntroType.rounded
-                    ? BorderRadius.circular(20)
-                    : BorderRadius.zero,
-          ),
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            crossAxisAlignment: CrossAxisAlignment.center,
-            children: <Widget>[
-              Expanded(
+  Widget build(BuildContext context) => widget.type == GFIntroType.bubble
+      ? buildBubbleType()
+      : Center(
+          child: Container(
+            width: widget.type == GFIntroType.fullWidth
+                ? MediaQuery.of(context).size.width
+                : MediaQuery.of(context).size.width * 0.885,
+            height: widget.type != GFIntroType.fullWidth
+                ? MediaQuery.of(context).size.height / 2
+                : MediaQuery.of(context).size.height,
+            margin: widget.type != GFIntroType.fullWidth
+                ? const EdgeInsets.only(left: 20, right: 20)
+                : const EdgeInsets.only(left: 0, right: 0),
+            padding: widget.type == GFIntroType.fullWidth
+                ? const EdgeInsets.all(0)
+                : const EdgeInsets.all(0),
+            decoration: BoxDecoration(
+              color: widget.color,
+              borderRadius: widget.type == GFIntroType.fullWidth
+                  ? BorderRadius.circular(0)
+                  : widget.type == GFIntroType.rounded
+                      ? BorderRadius.circular(24)
+                      : BorderRadius.zero,
+            ),
+            child: Column(
+              mainAxisAlignment: MainAxisAlignment.center,
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: <Widget>[
+                Expanded(
+                    child: ClipRRect(
+                  borderRadius: widget.type == GFIntroType.rounded
+                      ? const BorderRadius.only(
+                          topLeft: Radius.circular(24),
+                          topRight: Radius.circular(24))
+                      : BorderRadius.zero,
                   child: PageView(
-                controller: _pageController,
-                children: widget.slides ?? slides(),
-              )),
-              widget.gfIntroBottomNavigation ??
-                  GFIntroBottomNavigation(
-                    onNext: () {
-                      _pageController.nextPage(
-                          duration: const Duration(milliseconds: 500),
-                          curve: Curves.linear);
-                    },
-                    pagesCount: widget.slides ?? slides().length,
-                    pageNumber: page,
-                  )
-            ],
+                    controller: _pageController,
+                    children: widget.slides ?? slides(),
+                  ),
+                )),
+                widget.gfIntroBottomNavigation ??
+                    GFIntroBottomNavigation(
+                      onNext: () {
+                        _pageController.nextPage(
+                            duration: const Duration(milliseconds: 500),
+                            curve: Curves.linear);
+                      },
+                      pagesCount: widget.slides ?? slides().length,
+                      pageNumber: page,
+                    )
+              ],
+            ),
           ),
-        ),
-      );
+        );
 
   List<Widget> slides() {
     final List<Widget> list = [];
     list.add(const GFIntroSlide(
       backgroundColor: Colors.white,
       title: 'First',
-      imageHeight: 200,
-      imageWidth: 200,
+      imageHeight: 100,
+      imageWidth: 100,
       image: NetworkImage('https://www.gstatic.com/webp/gallery/3.jpg'),
     ));
     list.add(const GFIntroSlide(
@@ -126,4 +139,35 @@ class _GFIntroScreenState extends State<GFIntroScreen> {
     ));
     return list;
   }
+
+  Widget buildBubbleType() => SafeArea(
+        child: Container(
+          height: MediaQuery.of(context).size.height,
+          width: MediaQuery.of(context).size.width,
+          child: PageView(
+            physics: const ScrollPhysics(),
+            children: bubbleSlides(),
+            controller: _pageController,
+          ),
+        ),
+      );
+
+  List<Widget> bubbleSlides() {
+    final List<Widget> list = [];
+    list.add(GFIntroBubbleSlide(
+      onNext: () => nextSlider,
+      alignment: Alignment.topLeft,
+    ));
+    list.add(GFIntroBubbleSlide(
+      onNext: () => nextSlider,
+      alignment: Alignment.topRight,
+    ));
+    return list;
+  }
+
+  // ignore: type_annotate_public_apis, always_declare_return_types
+  nextSlider() {
+    _pageController.nextPage(
+        duration: const Duration(milliseconds: 300), curve: Curves.linear);
+  }
 }
diff --git a/lib/components/loader/gf_loader.dart b/lib/components/loader/gf_loader.dart
@@ -71,10 +71,7 @@ class _GFLoaderState extends State<GFLoader>
   void initState() {
     super.initState();
 
-    controller = AnimationController(
-      duration: widget.duration,
-        vsync: this
-    );
+    controller = AnimationController(duration: widget.duration, vsync: this);
 
     loaderanimation1 = Tween<double>(begin: 0, end: 1).animate(
       CurvedAnimation(
diff --git a/lib/components/progress_bar/gf_progress_bar.dart b/lib/components/progress_bar/gf_progress_bar.dart
@@ -130,7 +130,8 @@ class _GFProgressBarState extends State<GFProgressBar>
     super.initState();
     if (widget.animation) {
       _animationController = AnimationController(
-          duration: Duration(milliseconds: widget.animationDuration), vsync: this);
+          duration: Duration(milliseconds: widget.animationDuration),
+          vsync: this);
       _animation =
           Tween(begin: 0, end: widget.percentage).animate(_animationController)
             ..addListener(() {
@@ -145,7 +146,8 @@ class _GFProgressBarState extends State<GFProgressBar>
 
     if (widget.animation) {
       circularAnimationController = AnimationController(
-          duration: Duration(milliseconds: widget.animationDuration), vsync: this);
+          duration: Duration(milliseconds: widget.animationDuration),
+          vsync: this);
       circularAnimation = Tween(begin: 0, end: widget.percentage)
           .animate(circularAnimationController)
             ..addListener(() {
diff --git a/lib/components/toast/gf_toast.dart b/lib/components/toast/gf_toast.dart
diff --git a/lib/types/gf_intro_type.dart b/lib/types/gf_intro_type.dart
diff --git a/pubspec.lock b/pubspec.lock
