Merge branch 'dev#2.6.0' into stable

# Conflicts:
#	CHANGELOG.md
#	README.md
#	example/lib/main.dart
#	example/lib/widgets/draw_android.dart
#	example/macos/Runner.xcodeproj/project.pbxproj
#	example/pubspec.lock
#	lib/src/dart/rest.dart
#	lib/src/extensions/context_ext.dart
#	lib/src/extensions/iterable_ext.dart
#	lib/src/flutter/clippers/vx_arc.dart
#	lib/src/flutter/clippers/vx_diagonal.dart
#	lib/src/flutter/container.dart
#	lib/src/flutter/shapes.dart
#	lib/src/flutter/textfield.dart
#	lib/src/flutter/widgets.dart
#	lib/velocity_x.dart
#	pubspec.lock
#	pubspec.yaml

Author: iampawan

CHANGELOG.md

@@ -1,21 +1,37 @@
-## [1.4.1] - February 12, 2021
+## [2.6.1] - March 31, 2020
 
-- Enhancements
+- Fixed issue with ZStack.
+- Fixed issue with isEmptyOrNull String.
 
-## [1.4.0] - February 10, 2021
+## [2.6.0] - March 16, 2020
 
+- VxNavigator (Navigator 2.0) support added.
+- AStack widget added.
+
+## [2.5.0] - March 13, 2020
+
+- VxAnimator added.
+- VxLayout added for responsiveness.
+
+## [2.4.0-nullsafety.0] - March 11, 2020
+
+- Direct Text Themes support
+- Extended & Improved Color Pallete
+- New Demo Added
+- Added more gradient options
+- size percentage widget added for sizedbox and container
+- Flat button changed to Material button
 - Fixed nullOK issues
 - Added more clippers
 - Added align() method for text and richtext
 - Improvement in textfield
 - Added VxState
 - Minor bug fixes and improvements
 
-## [1.3.1] - Decemeber 29, 2020
+## [2.3.1-nullsafety.0] - Decemeber 29, 2020
 
 - Introducing VxShapes with ext: VxCircle -> .circle(), VxEllipse -> .ellipse(), VxCapsule -> .capsule(), VxContinuousRectangle -> .continuousRectangle(), VxBevel -> .bevel(), VxTriangle -> .triangle() and VxTicket -> .ticket()
 - VxPlatform added to create a common widget for different platforms.
-- VxAnimator added exposing the animator package.
 - Added widget support to badge and new positions.
 - Added isIntrinsic prop for some widgets like DataTable which doesn't support layout builder.
 - Vx.getColorFromHex() added to convert hex to color.
@@ -26,6 +42,12 @@
 - withAnimation returns AnimationController to control and dispose it manually.
 - Many Bug Fixes.
 
+## [2.0.0-nullsafety.1] - November 22, 2020
+
+- BREAKING: opt into null safety
+- upgrade Dart SDK constraints to >=2.12.0-0 <3.0.0
+- upgrade Flutter SDK constraints to >=1.24.0-0 <2.0.0
+
 ## [1.0.1] - November 21, 2020
 
 - Added isFastScrollingEnabled to fast scroll the VxSwiper or swiper ext.

README.md

@@ -1,37 +1,65 @@
 <p align="center">
   <a href="https://velocityx.dev/" target="_blank">
-    <h1>VelocityX</h1>
+    <img src="https://i.imgur.com/GcsbeIW.png"  width="800" alt="VelocityX">
   </a>
 </p>
 
-<p align="center">
-  <a href="https://velocityx.dev/" target="_blank">
-    <img src="https://i.imgur.com/CXEiorH.png"  width="800" alt="VelocityX">
-  </a>
-</p>
+[![VelocityX](https://img.shields.io/badge/velocityx-fast-red)](https://github.com/iampawan/velocityx)
+[![Pub release](https://img.shields.io/pub/v/velocity_x.svg?style=flat-square)](https://pub.dev/packages/velocity_x)
+[![GitHub Release Date](https://img.shields.io/github/release-date/iampawan/velocityx.svg?style=flat-square)](https://github.com/iampawan/velocityx)
+[![GitHub issues](https://img.shields.io/github/issues/iampawan/velocityx.svg?style=flat-square)](https://github.com/iampawan/velocityx/issues)
+[![GitHub top language](https://img.shields.io/github/languages/top/iampawan/velocityx.svg?style=flat-square)](https://github.com/iampawan/velocityx)
+[![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/iampawan/velocityx.svg?style=flat-square)](https://github.com/iampawan/velocityx)
+[![Likes](https://badges.bar/velocity_x/likes)](https://pub.dev/packages/velocity_x/score)
+[![Popularity](https://badges.bar/velocity_x/popularity)](https://pub.dev/packages/velocity_x/score)
+[![Pub points](https://badges.bar/flutter_week_view/pub%20points)](https://pub.dev/packages/velocity_x/score)
+<a href="https://discord.gg/9tXYvNq"><img src="https://img.shields.io/discord/746087597759004835.svg?logo=discord&color=blue" alt="Discord"></a>
+
+### Show some :heart: and star the repo.
+
+[![GitHub followers](https://img.shields.io/github/followers/iampawan.svg?style=social&label=Follow)](https://github.com/iampawan/)
+[![Twitter Follow](https://img.shields.io/twitter/follow/imthepk.svg?style=social)](https://twitter.com/imthepk)
+
+[![Open Source Love](https://badges.frapsoft.com/os/v1/open-source.svg?v=102)](https://opensource.org/licenses/Apache-2.0)
 
 [**VelocityX**](https://velocityx.dev/) is a 100% free Flutter open-source minimalist UI Framework built with <a href="https://flutter.dev/" target="_blank">Flutter SDK</a> to make Flutter development easier and more joyful than ever.
 
 ## Inspired from Tailwindcss and SwiftUI.
 
 ```dart
-"Web".text.white.xl4.bold.center.makeCentered().box.roundedLg.red500.shadow2xl.make().whHalf(context).centered();
+"Welcome to VelocityX".text.white.xl4.bold.center.makeCentered().box.roundedLg.red500.shadow2xl.make().whHalf(context).centered();
 ```
 
 ---
 
+### 📌 &nbsp; Bulletin
+
+- Now supports null-safety
+- [Video Tutorials on YouTube](https://www.youtube.com/watch?v=IOhJCN4T1V4&list=PLR2qQy0Zxs_UHLXSYbK50jEapx0ORmLYv) for updates & walk through videos.
+- [Join the discord](https://discord.gg/9tXYvNq)
+
 ## Why use VelocityX?
 
-<img src="https://i.imgur.com/UNf4fE6.png" width="300">
-<img src="https://i.imgur.com/UAzM6iT.png" width="290">
-<img src="https://i.imgur.com/rE46nEL.png" width="245">
+VelocityX is known for :
 
-### Show some :heart: and star the repo.
+|      Vx                              |          Vx                   |
+| :--------------------------------- | :-------------------------- |
+| 100% fast, performant & compatible | 100% free & open-source     |
+| 100% ready for production          | 200% faster for writing UIs |
 
-[![GitHub followers](https://img.shields.io/github/followers/iampawan.svg?style=social&label=Follow)](https://github.com/iampawan/)
-[![Twitter Follow](https://img.shields.io/twitter/follow/imthepk.svg?style=social)](https://twitter.com/imthepk)
+---
 
-[![Open Source Love](https://badges.frapsoft.com/os/v1/open-source.svg?v=102)](https://opensource.org/licenses/Apache-2.0)
+## Features
+
+✅ &nbsp; [State Management](https://velocityx.dev/docs/vxstate/getting_started) </br>
+✅ &nbsp; [Navigator 2.0](https://velocityx.dev/docs/vxnavigator/getting_started)  
+✅ &nbsp; [Animations](https://velocityx.dev/docs/supervx/vxanimator)  
+✅ &nbsp; [Custom UIs](https://velocityx.dev/docs/install)  
+✅ &nbsp; [Custom Shapes](https://velocityx.dev/docs/shapes/vxcircle)  
+✅ &nbsp; [Super VX](https://velocityx.dev/docs/supervx/vxswiper)  
+✅ &nbsp; [Extension Methods](https://velocityx.dev/docs/extensions/context)  
+✅ &nbsp; [Responsive Layout](https://velocityx.dev/docs/features/responsive)  
+✅ &nbsp; [Color Palette](https://velocityx.dev/docs/colors)
 
 # Quick start
 
@@ -43,25 +71,24 @@ Read the [Getting started page of VelocityX](https://velocityx.dev/docs/install)
 
 ---
 
-<a href="https://www.buymeacoffee.com/mtechviral"><img src="https://img.buymeacoffee.com/button-api/?text=Buy me a coffee&emoji=&slug=mtechviral&button_colour=5F7FFF&font_colour=ffffff&font_family=Cookie&outline_colour=000000&coffee_colour=FFDD00"></a>
+<a href="https://www.buymeacoffee.com/mtechviral"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png"></a>
 
 ---
 
-## Some popular Vx widgets
+## Some popular Super Vx widgets
 
-| [VxTimeline]()                                                                  | [VxAnimation]()                                                                         | [VxSwiper]()                                                                          | [VxResponsive]()                                                                      |
-| ------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- |
-| <img src="https://imagizer.imageshack.com/img922/3315/lYf8pd.png"  width="400"> | <img src="https://imagizer.imageshack.com/img924/6697/M7az7V.png" width="400" />        | <img src="https://imagizer.imageshack.com/img923/4109/Mmsi87.png" width="400">        | <img src="https://imagizer.imageshack.com/img924/1754/lry31m.png" width="400">        |
-| Demo 1                                                                          | Demo 2                                                                                  | Demo 3                                                                                | Demo 4                                                                                |
-| <img src="https://i.imgur.com/xtUOjiV.gif"  width="400">                        | <img src="https://imagizer.imageshack.com/v2/1024x768q90/922/YgXVGd.png" width="400" /> | <img src="https://imagizer.imageshack.com/v2/1024x768q90/924/u5VAhU.png" width="400"> | <img src="https://imagizer.imageshack.com/v2/1024x768q90/922/kNs9eC.png" width="400"> |
+| [VxAnimation](https://velocityx.dev/docs/supervx/vxanimator) | [VxSwiper](https://velocityx.dev/docs/supervx/vxswiper) | [VxResponsive](https://velocityx.dev/docs/features/responsive) | [VxPlatform](https://velocityx.dev/docs/supervx/vxplatform) | [VxToast](https://velocityx.dev/docs/supervx/vxtoast) | [VxRating](https://velocityx.dev/docs/supervx/vxrating) | [VxStepper](https://velocityx.dev/docs/supervx/vxstepper) |
 
-## Some quick UIs made using VelocityX
+## Some Quick UIs made using VelocityX
 
-| Demo                                                      | Demo2                                                     |
-| --------------------------------------------------------- | --------------------------------------------------------- |
-| <img src="https://i.imgur.com/Uk28KcB.png" width="300"/>  | <img src="https://i.imgur.com/V0mr3S9.png" width="300"/>  |
-| <img src="https://i.imgur.com/50tJKqU.png"  width="300"/> | <img src="https://i.imgur.com/vNPjDMs.png"  width="300"/> |
-| <img src="https://i.imgur.com/cWlCo6P.png" width="300"/>  | <img src= "https://i.imgur.com/Xpdx9UP.png" width="300">  |
+<p float="left">
+<img src="https://i.imgur.com/DlSuaOG.png" width="500"/>
+<img src="https://i.imgur.com/JZ9tOoy.png" width="500"/>
+<img src="https://i.imgur.com/JFpw795.png" width="500"/>
+<img src="https://i.imgur.com/nuGnpG1.png" width="500"/>
+<img src="https://i.imgur.com/DlSuaOG.png" width="500"/>
+<img src="https://i.imgur.com/41kZ4Hd.png" width="500"/>
+</p>
 
 ## Contributing
 
@@ -86,7 +113,8 @@ If you found this project useful, then please consider giving it a :star: on Git
 
 ### YouTube Channel
 
-[MTechViral](https://www.youtube.com/mtechviral)
+[mtechviral](https://www.youtube.com/mtechviral) </br>
+[codepur](https://www.youtube.com/codepur)
 
 ### Facebook Group
 

example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -10,8 +10,8 @@ class AnimatedBoxExample extends StatefulWidget {
 }
 
 class _AnimatedBoxExampleState extends State<AnimatedBoxExample> {
-  double _width, _height, _radius;
-  Color _color;
+  double? _width, _height, _radius;
+  Color? _color;
 
   @override
   void initState() {
@@ -43,10 +43,10 @@ class _AnimatedBoxExampleState extends State<AnimatedBoxExample> {
     return VxAnimatedBox()
         .seconds(sec: 5)
         .fastOutSlowIn
-        .width(_width + 50)
-        .height(_height)
-        .color(_color)
-        .withRounded(value: _radius)
+        .width(_width! + 50)
+        .height(_height!)
+        .color(_color!)
+        .withRounded(value: _radius!)
         .p16
         .alignCenter
         .make()

example/lib/examples/animated_box_example.dart

@@ -37,7 +37,7 @@ class _AnimatedPageViewState extends State<AnimatedPageView> {
         itemCount: pics.length,
         controller: PageController(),
         itemBuilder: (context, index) {
-          final String imgUrl = pics.elementAt(index);
+          final String? imgUrl = pics.elementAt(index);
           final double w = context.screenWidth;
           final double h = w * calculateImgScale(index);
           return GestureDetector(
@@ -60,7 +60,7 @@ class _AnimatedPageViewState extends State<AnimatedPageView> {
       itemCount: pics.length,
       currentPageIndex: _currentIndex,
       computeAspectRadio: (index) {
-        return calculateImgScale(index);
+        return calculateImgScale(index!);
       },
       notifyScroll: (scrollNotification) {},
     );

example/lib/examples/animated_page_view.dart

@@ -20,7 +20,7 @@ class _VxAnimationExampleState extends State<VxAnimationExample>
       duration: 5.seconds,
       isRepeatReversed: true,
       callBack: (value, percent) {
-        anim = value;
+        anim = value as num;
         setState(() {});
         // print(anim);
       },
@@ -34,7 +34,7 @@ class _VxAnimationExampleState extends State<VxAnimationExample>
         .semiBold
         .center
         .makeCentered()
-        .scale(scaleValue: anim)
+        .scale(scaleValue: anim as double)
         .p16();
   }
 }

example/lib/examples/animation_example.dart

@@ -1,3 +1,4 @@
+import 'package:example/new/demo_list.dart';
 import 'package:example/widgets/platform_widget.dart';
 import 'package:example/widgets/vx_shapes.dart';
 import 'package:flutter/cupertino.dart';
@@ -7,15 +8,19 @@ import 'package:velocity_x/velocity_x.dart';
 import 'examples/animated_page_view.dart';
 import 'examples/second_page.dart';
 import 'models/dummy.dart';
-import 'new/vx_demo.dart';
 import 'widgets/draw_android.dart';
 
 void main() {
   runApp(
-    MaterialApp(
-      home: Material(child: SafeArea(child: VxDemo())),
+    MaterialApp.router(
+      routeInformationParser: VxInformationParser(),
+      routerDelegate: VxNavigator(routes: {
+        "/": (uri, param) => MaterialPage(child: DemoList()),
+        "/demo": (uri, param) => MaterialPage(child: Demo()),
+      }),
       theme: ThemeData(
-        primarySwatch: Colors.teal,
+        primarySwatch: Colors.blue,
+        primaryColor: Vx.blue500,
         brightness: Brightness.light,
       ),
       debugShowCheckedModeBanner: false,
@@ -53,16 +58,16 @@ class _DemoState extends State<Demo> {
         // TimelineExample(),
         // AnimatedBoxExample(),
         // VxAnimationExample(),
-        VxAnimator<double>(
-          builder: (context, animState, child) {
-            return VxBox()
-                .rounded
-                .alignCenter
-                .pink400
-                .square(animState.value)
-                .makeCentered();
-          },
-        ).easeInCubic.doubleTween(10.0, 200.0).seconds(sec: 10).infinite.make(),
+        // VxAnimator<double>(
+        //   builder: (context, animState, child) {
+        //     return VxBox()
+        //         .rounded
+        //         .alignCenter
+        //         .pink400
+        //         .square(animState.value)
+        //         .makeCentered();
+        //   },
+        // ).easeInCubic.doubleTween(10.0, 200.0).seconds(sec: 10).infinite.make(),
         20.heightBox,
         "Hello"
             .text
@@ -285,7 +290,7 @@ class _DemoState extends State<Demo> {
             .textDropDown(
               selectedValue: "Item 1",
               onChanged: (value) {
-                Vx.log(value);
+                Vx.log(value!);
               },
             )
             .make(),
@@ -308,7 +313,7 @@ class TapMeWidget extends StatelessWidget {
           .make(),
       "assets/vxbox.png".circularAssetImage(radius: 50)
     ].row().onInkTap(() {
-      context.navigator.push(const SecondPage("assets/vxbox.png")
+      context.navigator!.push(const SecondPage("assets/vxbox.png")
           .vxPreviewRoute(parentContext: context));
     });
   }