From 0c1d86f1089673bd319d69dfcd7bb71051e326a6 Mon Sep 17 00:00:00 2001
From: Sahdeep Singh <sahdeepsingh98@gmail.com>
Date: Sat, 12 Oct 2019 00:24:41 +0530
Subject: [PATCH] minor bug fixes

---
 .idea/workspace.xml                    | 124 ++++++++++++-------------
 android/.idea/caches/gradle_models.ser | Bin 31335 -> 31335 bytes
 example/lib/main.dart                  |  55 +----------
 3 files changed, 59 insertions(+), 120 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f035de7..b8d609f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,9 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="b04d5b3a-dc41-4077-ba5e-a292d819e0ae" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/Animation_Gesture/page_reveal.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/Animation_Gesture/page_reveal.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/Clippers/CircularWave.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/Clippers/CircularWave.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/Clippers/WaveLayer.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/Clippers/WaveLayer.dart" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/android/.idea/caches/gradle_models.ser" beforeDir="false" afterPath="$PROJECT_DIR$/android/.idea/caches/gradle_models.ser" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/example/lib/main.dart" beforeDir="false" afterPath="$PROJECT_DIR$/example/lib/main.dart" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.dart_tool/" />
     <ignored path="$PROJECT_DIR$/.pub/" />
@@ -24,24 +23,12 @@
   </component>
   <component name="ExecutionTargetManager" SELECTED_TARGET="Pixel_3a_API_28" />
   <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/liquid_swipe.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="125">
-              <caret line="207" column="43" selection-start-line="207" selection-start-column="43" selection-end-line="207" selection-end-column="43" />
-              <folding>
-                <element signature="e#0#20#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
+    <leaf>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="168">
-              <caret line="221" column="30" selection-start-line="221" selection-start-column="30" selection-end-line="221" selection-end-column="30" />
+            <state relative-caret-position="97">
+              <caret line="224" column="31" selection-start-line="224" selection-start-column="31" selection-end-line="224" selection-end-column="31" />
               <folding>
                 <element signature="e#0#39#0" expanded="true" />
               </folding>
@@ -50,33 +37,12 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/Clippers/WaveLayer.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="293">
-              <caret line="41" lean-forward="true" selection-start-line="41" selection-end-line="41" />
-              <folding>
-                <element signature="e#0#19#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/Clippers/CircularWave.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="33">
-              <caret line="21" column="31" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/lib/Animation_Gesture/page_reveal.dart">
+        <entry file="file://$PROJECT_DIR$/lib/liquid_swipe.dart">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="243">
-              <caret line="41" column="45" selection-start-line="41" selection-start-column="45" selection-end-line="41" selection-end-column="45" />
+            <state relative-caret-position="-107">
+              <caret line="123" column="34" selection-start-line="123" selection-start-column="21" selection-end-line="123" selection-end-column="34" />
               <folding>
-                <element signature="e#0#39#0" expanded="true" />
+                <element signature="e#0#20#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -114,11 +80,12 @@
         <option value="$PROJECT_DIR$/lib/page.dart" />
         <option value="$PROJECT_DIR$/lib/Animation_Gesture/animated_page_dragger.dart" />
         <option value="$PROJECT_DIR$/lib/Animation_Gesture/page_dragger.dart" />
-        <option value="$PROJECT_DIR$/lib/liquid_swipe.dart" />
         <option value="$PROJECT_DIR$/lib/Animation_Gesture/page_reveal.dart" />
         <option value="$PROJECT_DIR$/lib/Clippers/CircularWave.dart" />
-        <option value="$PROJECT_DIR$/example/lib/main.dart" />
         <option value="$PROJECT_DIR$/lib/Clippers/WaveLayer.dart" />
+        <option value="$PROJECT_DIR$/example/lib/secondExample.dart" />
+        <option value="$PROJECT_DIR$/example/lib/main.dart" />
+        <option value="$PROJECT_DIR$/lib/liquid_swipe.dart" />
       </list>
     </option>
   </component>
@@ -133,8 +100,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -147,6 +114,12 @@
               <item name="liquid_swipe_flutter" type="462c0819:PsiDirectoryNode" />
               <item name="example" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="liquid_swipe_flutter" type="b2602c69:ProjectViewProjectNode" />
+              <item name="liquid_swipe_flutter" type="462c0819:PsiDirectoryNode" />
+              <item name="example" type="462c0819:PsiDirectoryNode" />
+              <item name="assets" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="liquid_swipe_flutter" type="b2602c69:ProjectViewProjectNode" />
               <item name="liquid_swipe_flutter" type="462c0819:PsiDirectoryNode" />
@@ -252,15 +225,22 @@
       <option name="project" value="LOCAL" />
       <updated>1569855398591</updated>
     </task>
-    <option name="localTasksCounter" value="5" />
+    <task id="LOCAL-00005" summary="thumb leading in circularReveal">
+      <created>1570817229154</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1570817229155</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="-4" width="1366" height="727" extended-state="6" />
+    <frame x="-1" y="-11" width="1368" height="735" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Captures" order="0" weight="0.25" />
-      <window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.1969697" />
+      <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.2060606" />
       <window_info id="Structure" order="2" side_tool="true" />
       <window_info id="Image Layers" order="3" />
       <window_info id="Designer" order="4" />
@@ -268,7 +248,7 @@
       <window_info id="Capture Tool" order="6" />
       <window_info id="Favorites" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Dart Analysis" order="0" weight="0.32890365" />
-      <window_info active="true" anchor="bottom" id="Run" order="1" visible="true" weight="0.19666667" />
+      <window_info anchor="bottom" id="Run" order="1" visible="true" weight="0.26833335" />
       <window_info anchor="bottom" id="TODO" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" />
       <window_info anchor="bottom" id="Terminal" order="4" show_stripe_button="false" weight="0.05" />
@@ -312,7 +292,8 @@
     <MESSAGE value="Release :: v1.2.0" />
     <MESSAGE value="making reveal follow finger" />
     <MESSAGE value="Merge branch 'master' of https://github.com/mourad-brahim/liquid_swipe_flutter into mourad-brahim-master&#10;&#10;# Conflicts:&#10;#&#9;lib/liquid_swipe.dart&#10;&#10;# Some Changes in Pull. Thanks" />
-    <option name="LAST_COMMIT_MESSAGE" value="Merge branch 'master' of https://github.com/mourad-brahim/liquid_swipe_flutter into mourad-brahim-master&#10;&#10;# Conflicts:&#10;#&#9;lib/liquid_swipe.dart&#10;&#10;# Some Changes in Pull. Thanks" />
+    <MESSAGE value="thumb leading in circularReveal" />
+    <option name="LAST_COMMIT_MESSAGE" value="thumb leading in circularReveal" />
     <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
     <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
     <option name="REARRANGE_BEFORE_PROJECT_COMMIT" value="true" />
@@ -397,49 +378,60 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/liquid_swipe.dart">
+    <entry file="file://$PROJECT_DIR$/lib/Animation_Gesture/page_reveal.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="125">
-          <caret line="207" column="43" selection-start-line="207" selection-start-column="43" selection-end-line="207" selection-end-column="43" />
+        <state relative-caret-position="555">
+          <caret line="41" column="45" selection-start-line="41" selection-start-column="45" selection-end-line="41" selection-end-column="45" />
           <folding>
-            <element signature="e#0#20#0" expanded="true" />
+            <element signature="e#0#39#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/Animation_Gesture/page_reveal.dart">
+    <entry file="file://$PROJECT_DIR$/lib/Clippers/WaveLayer.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="243">
-          <caret line="41" column="45" selection-start-line="41" selection-start-column="45" selection-end-line="41" selection-end-column="45" />
+        <state relative-caret-position="293">
+          <caret line="41" selection-start-line="41" selection-end-line="41" />
           <folding>
-            <element signature="e#0#39#0" expanded="true" />
+            <element signature="e#0#19#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/lib/Clippers/CircularWave.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="33">
+        <state relative-caret-position="198">
           <caret line="21" column="31" selection-start-line="21" selection-start-column="31" selection-end-line="21" selection-end-column="31" />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/example/lib/utyj" />
+    <entry file="file://$PROJECT_DIR$/example/lib/secondExample.dart">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="175">
+          <caret line="60" column="48" lean-forward="true" selection-start-line="60" selection-start-column="48" selection-end-line="60" selection-end-column="48" />
+          <folding>
+            <element signature="e#0#39#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/example/lib/main.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="168">
-          <caret line="221" column="30" selection-start-line="221" selection-start-column="30" selection-end-line="221" selection-end-column="30" />
+        <state relative-caret-position="97">
+          <caret line="224" column="31" selection-start-line="224" selection-start-column="31" selection-end-line="224" selection-end-column="31" />
           <folding>
             <element signature="e#0#39#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/Clippers/WaveLayer.dart">
+    <entry file="file://$PROJECT_DIR$/lib/liquid_swipe.dart">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="293">
-          <caret line="41" lean-forward="true" selection-start-line="41" selection-end-line="41" />
+        <state relative-caret-position="-107">
+          <caret line="123" column="34" selection-start-line="123" selection-start-column="21" selection-end-line="123" selection-end-column="34" />
           <folding>
-            <element signature="e#0#19#0" expanded="true" />
+            <element signature="e#0#20#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/android/.idea/caches/gradle_models.ser b/android/.idea/caches/gradle_models.ser
index 39dde4d0fb41ea209f5fb6a2ed0601708c1fbd0d..f15af4095e013f9526b62f0182b39ae8510cf1f7 100644
GIT binary patch
delta 61
zcmV-D0K)(0^a1De0k9Jy1W(i)J+l`gh&lw4Z+!u?qg(<E1laT*%aibS6|=r*u?7e`
TK)yJBasV%r93vXDk#E)t5la|-

delta 61
zcmV-D0K)(0^a1De0k9Jy1l4vY2eTI<h&luk-`feZqg(<E1QcbW)06Oa6|=r*u?7fb
TH1{xmasV%r93vXDk#E)t3S}5r

diff --git a/example/lib/main.dart b/example/lib/main.dart
index 34322f8..d5ac8ff 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -2,9 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:liquid_swipe/Constants/Helpers.dart';
 import 'package:liquid_swipe/liquid_swipe.dart';
 
-import 'secondExample.dart';
-
-final GlobalKey<NavigatorState> navigatorKey = new GlobalKey<NavigatorState>();
 void main() {
   runApp(
     new MyApp(),
@@ -214,68 +211,18 @@ class MyApp extends StatelessWidget {
         ],
       ),
     ),
-    Container(
-      color: Colors.redAccent,
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.center,
-        mainAxisSize: MainAxisSize.max,
-        mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-        children: <Widget>[
-          Image.asset(
-            'assets/1.png',
-            fit: BoxFit.cover,
-          ),
-          Padding(padding: const EdgeInsets.all(20.0)),
-          Column(
-            children: <Widget>[
-              new Text(
-                "Lets ",
-                style: TextStyle(
-                    fontSize: 30,
-                    fontFamily: "Billy",
-                    fontWeight: FontWeight.w600),
-              ),
-              new Text(
-                "Try Another Example",
-                style: TextStyle(
-                    fontSize: 30,
-                    fontFamily: "Billy",
-                    fontWeight: FontWeight.w600),
-              ),
-              FlatButton(
-                disabledColor: Colors.deepPurpleAccent,
-                onPressed: () {
-                  Navigator.push(
-                    navigatorKey.currentContext,
-                    MaterialPageRoute(builder: (context) => SecondExample()),
-                  );
-                },
-                child: Text(
-                  "Click Here",
-                  style: TextStyle(
-                      fontSize: 30,
-                      fontFamily: "Billy",
-                      fontWeight: FontWeight.w600),
-                ),
-              ),
-            ],
-          )
-        ],
-      ),
-    ),
   ];
   int page = 0;
   UpdateType updateType;
   @override
   Widget build(BuildContext context) {
     return new MaterialApp(
-        navigatorKey: navigatorKey,
         home: new Scaffold(
             body: LiquidSwipe(
               pages: pages,
               fullTransitionValue: 200,
               enableSlideIcon: true,
-              enableLoop: false,
+              enableLoop: true,
               positionSlideIcon: 0.5,
               waveType: WaveType.liquidReveal,
               onPageChangeCallback: (page) => pageChangeCallback(page),