Bug fix: now the next button overrides doneButtonPersist

Author: haideraltahan

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.5.0
+* Added Next Button to move to the next screen. Overriding doneButtonPersist.
+
 ## 2.4.0
 **Feature Enhancement**
 * Exposed the way to change the distance a user needs to drag for a full transition to occur using `fullTransition` and its default value is set to `300.0`.

README.md

@@ -139,13 +139,16 @@ You should then run `flutter packages get` in your terminal so as to get the pac
 | :---------------------- | :------------------ | :---------------------------------------------------------------------------------------------------------------- | :-------------------------------------: |
 | pages                   | List<PageViewModel> | Set the pages of the intro screen.                                                                                |                  Null                   |
 | onTapDoneButton         | VoidCallback        | Method executes on tapping done button.                                                                           |                  Null                   |
+| onTapNextButton         | VoidCallback        | Method executes on tapping next button.                                                                           |                  Null                   |
 | showSkipButton          | Bool                | Show the skip button at the bottom of page.                                                                       |                  true                   |
+| showNextButton          | Bool                | Show the Next button at the bottom of page. Overrides doneButtonPersist.                                                                    |                  true                   |
 | pageButtonTextSize      | Double              | Set the button text size.                                                                                         |                  18.0                   |
 | pageButtonFontFamily    | String              | Set the font of button text.                                                                                      |                 Default                 |
 | onTapSkipButton         | VoidCallback        | Method executes on tapping skip button.                                                                           |                  null                   |
 | pageButtonTextStyles    | TextStyle           | Configure TextStyle for skip, done buttons, overrides pageButtonFontFamily, pageButtonsColor, pageButtonTextSize. | fontSize: `18.0`, color: `Colors.white` |
 | skipText                | Text / Widget       | Override Skip Button Text and styles.                                                                             |              Text('SKIP')               |
 | doneText                | Text / Widget       | Override Done Button Text and styles.                                                                             |              Text('DONE')               |
+| nextText                | Text / Widget       | Override Next Button Text and styles.                                                                             |              Text('NEXT')               |
 | doneButtonPersist       | Bool                | Show done Button throughout pages                                                                                 |                  false                  |
 | columnMainAxisAlignment | MainAxisAlignment   | Control [MainAxisAlignment] for column                                                                            |      MainAxisAlignment.spaceAround      |
 | fullTransition          | double              | Adjust scroll distance for full transition                                                                        |                  300.0                  |

example/lib/main.dart

@@ -68,7 +68,8 @@ class App extends StatelessWidget {
         primarySwatch: Colors.blue,
       ), //ThemeData
       home: Builder(
-        builder: (context) => IntroViewsFlutter(
+        builder: (context) =>
+            IntroViewsFlutter(
               pages,
               onTapDoneButton: () {
                 Navigator.push(
@@ -79,7 +80,7 @@ class App extends StatelessWidget {
                 );
               },
               showSkipButton:
-                  true, //Whether you want to show the skip button or not.
+              true, //Whether you want to show the skip button or not.
               pageButtonTextStyles: TextStyle(
                 color: Colors.white,
                 fontSize: 18.0,

lib/UI/page_indicator_buttons.dart

@@ -153,22 +153,7 @@ class PageIndicatorButtons extends StatelessWidget {
   final bool doneButtonPersist;
 
   Widget _getDoneORNextButton(){
-    if (acitvePageIndex == totalPages - 1 ||
-        (acitvePageIndex == totalPages - 2 &&
-            slideDirection == SlideDirection.rightToLeft ||
-            doneButtonPersist)){
-      return DoneButton(
-        child: doneText,
-        onTap: onPressedDoneButton,
-        pageButtonViewModel: PageButtonViewModel(
-          //view Model
-          activePageIndex: acitvePageIndex,
-          totalPages: totalPages,
-          slidePercent: doneButtonPersist ? 0.0 : slidePercent,
-          slideDirection: slideDirection,
-        ),
-      );
-    }else if ((acitvePageIndex < totalPages - 1 ||
+    if ((acitvePageIndex < totalPages - 1 ||
         (acitvePageIndex == totalPages - 1 &&
             slideDirection == SlideDirection.leftToRight)) &&
         showNextButton){
@@ -183,7 +168,22 @@ class PageIndicatorButtons extends StatelessWidget {
           slideDirection: slideDirection,
         ),
       );
-    }else{
+    }else if (acitvePageIndex == totalPages - 1 ||
+        (acitvePageIndex == totalPages - 2 &&
+            slideDirection == SlideDirection.rightToLeft ||
+            doneButtonPersist)){
+      return DoneButton(
+        child: doneText,
+        onTap: onPressedDoneButton,
+        pageButtonViewModel: PageButtonViewModel(
+          //view Model
+          activePageIndex: acitvePageIndex,
+          totalPages: totalPages,
+          slidePercent: doneButtonPersist ? 0.0 : slidePercent,
+          slideDirection: slideDirection,
+        ),
+      );
+    }else {
       return Container();
     }
   }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: intro_views_flutter
 description: A Flutter package for simple material design app intro screens with some cool animations.
-version: 2.4.0
+version: 2.5.0
 author: Ayush Agarwal <[email protected]>
 homepage: https://github.com/aagarwal1012/IntroViews-Flutter