resolve conflicts

Author: taljacobson

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 .dart_tool/
+.idea
 
 .packages
 .pub/

.idea/workspace.xml

@@ -1,3 +1,19 @@
+## 2.0.1
+**Major Updates**
+* Made intro views responsive.
+* Refracting page view model.
+  - Body title, expects Text Widget.
+  - Main image, expects Image Widget.
+  - Added TextStyle property to page view model that can be used to set styles for both title and body. 
+* Added TextStyle property for page indicator buttons which overrides previous button properties.
+* Updated Readme and example.
+
+## 1.0.3
+
+* Made intro views responsive.
+* Added onTapSkipButton voidCallback.
+* Updated Readme.
+
 ## 1.0.2
 
 * Updated Readme.

CHANGELOG.md

@@ -28,7 +28,7 @@ You should ensure that you add the `intro_views_flutter` as a dependency in your
 
 ```yaml
 dependencies:
- intro_views_flutter: "^1.0.2"
+ intro_views_flutter: "^2.0.1"
 ```
 
 You can also reference the git repository directly if you want:
@@ -49,19 +49,21 @@ You should then run `flutter packages get` in your terminal so as to get the pac
 
   ```dart
   Final page = new PageViewModel(
-        pageColor: const Color(0xFF607D8B),
-        mainImageAssetPath: 'assets/taxi.png',
-        title: 'Cabs',
-        body: 'Easy cab booking at your doorstep with cashless payment system',
+      pageColor: const Color(0xFF607D8B),
         iconImageAssetPath: 'assets/taxi-driver.png',
-        titleTextColor: Colors.white,
-        bodyTextColor: Colors.white,
         iconColor: null,
-        titleTextSize: 54.0,
-        bodyTextSize: 24.0,
-        fontFamily: "MyFont",
-        pageTitleBold: false,
-        bubbleBackgroundColor: Colors.white,
+        bubbleBackgroundColor: null,
+        body: Text(
+          'Easy  cab  booking  at  your  doorstep  with  cashless  payment  system',
+        ),
+        title: Text('Cabs'),
+        mainImage: Image.asset(
+          'assets/taxi.png',
+          height: 285.0,
+          width: 285.0,
+          alignment: Alignment.center,
+        ),
+        textStyle: TextStyle(fontFamily: 'MyFont', color: Colors.white),
       );
   ```
 
@@ -74,14 +76,18 @@ You should then run `flutter packages get` in your terminal so as to get the pac
           //Void Callback  
         },
         showSkipButton: true,
-        pageButtonFontFamily: "Regular",
-        pageButtonsColor: Colors.white,
-        pageButtonTextSize: 18.0,
+        pageButtonTextStyles: new TextStyle(
+            color: Colors.white, 
+            fontSize: 18.0,
+            fontFamily: "Regular",
+          ),
       );
   ```
   For further usage refer the [`example`](https://github.com/aagarwal1012/IntroViews-Flutter/tree/master/example/lib) available.
 
-  ***Note :*** If you added more than four pages in the list then there can be overlapping between `page icons` and `skip button`, so my suggestion is just make the `showSkipButton: false`.
+  For `Landscape` preview click the [link](https://github.com/aagarwal1012/IntroViews-Flutter/blob/master/display/landscape2.png?raw=true).
+
+  ***Note :*** If you added more than four pages in the list then there might be overlapping between `page icons` and `skip button`, so my suggestion is just make the `showSkipButton: false`.
 
 # Documentation
 
@@ -90,31 +96,27 @@ You should then run `flutter packages get` in your terminal so as to get the pac
 | Dart attribute  | Datatype         | Description                                                  | Default Value |
 | :---------------- | :------------------------------ | :----------------------------------------------------------- | :-----------: |
 | pageColor | Color | Set color of the page. | Null      |
-| mainImageAssetPath | String | Set the main image asset path of the page. | Null      |
-| title | String | Set the title text of the page. | Null      |
-| body | String | Set the body text of the page. | Null       |
+| mainImage | Image | Set the main image of the page. | Null      |
+| title | Text | Set the title text of the page. | Null      |
+| body | Text | Set the body text of the page. | Null       |
 | iconImageAssetPath | String | Set the icon image asset path that would be displayed in page bubble. | Null    |
-| titleTextColor | Color | Set the title text color. | Colors.white |
-| bodyTextColor | Color | Set the body text color. | Colors.white |
 | iconColor | Color | Set the page bubble icon color. | Null |
 | bubbleBackgroundColor | Color | Set the page bubble background color. | Colors.white |
-| fontFamily | String | Use your own custom font to style the title and body. | Default |
-| pageTitleBold | Bool | Set the title font weight to bold. | False |
-| titleTextSize | Double | Set the size of title text. | 34.0 |
-| bodyTextSize | Double | Set the size of body text. | 18.0 |
+| textStyle | TextStyle | Set TextStyle for both title and body | title: `color: Colors.white , fontSize: 50.0` <br> body: `color: Colors.white , fontSize: 24.0` |
 
 ### IntroViewFlutter Class
 
 | Dart attribute  | Datatype         | Description                                                  | Default Value |
 | :---------------- | :------------------------------ | :----------------------------------------------------------- | :-----------: |
 | pages | List<PageViewMode> | Set the pages of the intro screen. | Null      |
 | onTapDoneButton | VoidCallback | Method executes on tapping done button. | Null      |
-| pageButtonColor | Color | Set the color of skip and done buttons. | Colors.white |
 | showSkipButton | Bool | Show the skip button at the bottom of page. | true   |
 | pageButtonTextSize | Double | Set the button text size. | 18.0 |
 | pageButtonFontFamily | String | Set the font of button text. | Default |
-| skip | TextWidget | Override SkipButton Text and styles. | null |
-| done | TextWidget | Override DoneButton Text and styles. | null |
+| skip | Text | Override SkipButton Text and styles. | null |
+| done | Text | Override DoneButton Text and styles. | null |
+| 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` |
 
 For help on editing package code, view the [flutter documentation](https://flutter.io/developing-packages/).
 

README.md

@@ -11,52 +11,56 @@ class App extends StatelessWidget {
   //making list of pages needed to pass in IntroViewsFlutter constructor.
   final pages = [
     new PageViewModel(
-      pageColor: const Color(0xFF03A9F4),
-      mainImageAssetPath: 'assets/airplane.png',
-      title: 'Flights',
-      body:
+        pageColor: const Color(0xFF03A9F4),
+        iconImageAssetPath: 'assets/air-hostess.png',
+        iconColor: null,
+        bubbleBackgroundColor: null,
+        body: Text(
           'Haselfree  booking  of  flight  tickets  with  full  refund  on  cancelation',
-      iconImageAssetPath: 'assets/air-hostess.png',
-      titleTextColor: Colors.white,
-      bodyTextColor: Colors.white,
-      fontFamily: "MyFont",
-      titleTextSize: 50.0,
-      bodyTextSize: 24.0,
-      iconColor: null,
-      pageTitleBold: false,
-      bubbleBackgroundColor: Colors.white,
-    ),
+        ),
+        title: Text(
+          'Flights',
+        ),
+        textStyle: TextStyle(fontFamily: 'MyFont', color: Colors.white),
+        mainImage: Image.asset(
+          'assets/airplane.png',
+          height: 285.0,
+          width: 285.0,
+          alignment: Alignment.center,
+        )),
     new PageViewModel(
       pageColor: const Color(0xFF8BC34A),
-      mainImageAssetPath: 'assets/hotel.png',
-      title: 'Hotels',
-      body:
-          'We  work  for  the  comfort ,  enjoy  your  stay  at  our  beautiful  hotels',
       iconImageAssetPath: 'assets/waiter.png',
-      titleTextColor: Colors.white,
-      bodyTextColor: Colors.white,
       iconColor: null,
-      titleTextSize: 54.0,
-      bodyTextSize: 24.0,
-      fontFamily: "MyFont",
-      pageTitleBold: false,
-      bubbleBackgroundColor: Colors.white,
+      bubbleBackgroundColor: null,
+      body: Text(
+        'We  work  for  the  comfort ,  enjoy  your  stay  at  our  beautiful  hotels',
+      ),
+      title: Text('Hotels'),
+      mainImage: Image.asset(
+        'assets/hotel.png',
+        height: 285.0,
+        width: 285.0,
+        alignment: Alignment.center,
+      ),
+      textStyle: TextStyle(fontFamily: 'MyFont', color: Colors.white),
     ),
     new PageViewModel(
       pageColor: const Color(0xFF607D8B),
-      mainImageAssetPath: 'assets/taxi.png',
-      title: 'Cabs',
-      body:
-          'Easy  cab  booking  at  your  doorstep  with      cashless  payment  system',
       iconImageAssetPath: 'assets/taxi-driver.png',
-      titleTextColor: Colors.white,
-      bodyTextColor: Colors.white,
       iconColor: null,
-      titleTextSize: 54.0,
-      bodyTextSize: 24.0,
-      fontFamily: "MyFont",
-      pageTitleBold: false,
-      bubbleBackgroundColor: Colors.white,
+      bubbleBackgroundColor: null,
+      body: Text(
+        'Easy  cab  booking  at  your  doorstep  with  cashless  payment  system',
+      ),
+      title: Text('Cabs'),
+      mainImage: Image.asset(
+        'assets/taxi.png',
+        height: 285.0,
+        width: 285.0,
+        alignment: Alignment.center,
+      ),
+      textStyle: TextStyle(fontFamily: 'MyFont', color: Colors.white),
     ),
   ];
 
@@ -80,8 +84,10 @@ class App extends StatelessWidget {
               },
               showSkipButton:
                   true, //Whether you want to show the skip button or not.
-              pageButtonsColor: Colors.white,
-              pageButtonTextSize: 18.0,
+              pageButtonTextStyles: TextStyle(
+                color: Colors.white,
+                fontSize: 18.0,
+              ),
             ), //IntroViewsFlutter
       ), //Builder
     ); //Material App

display/landscape2.png

@@ -129,7 +129,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.1"
+    version: "1.0.2"
   io:
     dependency: transitive
     description:
@@ -374,5 +374,5 @@ packages:
     source: hosted
     version: "2.1.13"
 sdks:
-  dart: ">=2.0.0-dev.52.0 <=2.0.0-dev.54.0.flutter-46ab040e58"
+  dart: ">=2.0.0-dev.52.0 <=2.0.0-dev.58.0.flutter-f981f09760"
   flutter: ">=0.1.4 <2.0.0"

display/page3.png

@@ -1,4 +1,3 @@
-import 'package:flutter/material.dart';
 import 'package:intro_views_flutter/Constants/constants.dart';
 
 /// This is view model for the skip and done buttons.
@@ -8,17 +7,11 @@ class PageButtonViewModel {
   final int totalPages;
   final int activePageIndex;
   final SlideDirection slideDirection;
-  final String fontFamily;
-  final double pageButtonTextSize;
-  final Color pageButtonColor;
 
   PageButtonViewModel({
     this.slidePercent,
     this.totalPages,
     this.activePageIndex,
     this.slideDirection,
-    this.fontFamily,
-    this.pageButtonTextSize = 18.0,
-    this.pageButtonColor = Colors.white,
   });
 }

example/lib/main.dart

@@ -3,34 +3,53 @@ import 'package:flutter/material.dart';
 //view model for pages
 
 class PageViewModel {
+  /// Page BackGround Color
   final Color pageColor;
-  //main image path
-  final String mainImageAssetPath;
-  final String title;
-  final String body;
+
+  ///icon image path
   final String iconImageAssetPath;
-  final Color titleTextColor;
-  final Color bodyTextColor;
+
+  /// iconColor
   final Color iconColor;
+
+  /// color for background of progress bubbles
+  ///
+  /// @Default `const Color(0x88FFFFFF)`
   final Color bubbleBackgroundColor;
-  final String fontFamily;
-  final bool pageTitleBold;
-  final double titleTextSize;
-  final double bodyTextSize;
-
-  PageViewModel({
-    this.pageColor,
-    this.mainImageAssetPath,
-    this.title,
-    this.body,
-    this.iconImageAssetPath,
-    this.bodyTextColor = const Color(0x88FFFFFF),
-    this.titleTextColor = const Color(0x88FFFFFF),
-    this.bubbleBackgroundColor = const Color(0x88FFFFFF),
-    this.iconColor,
-    this.fontFamily,
-    this.pageTitleBold = false,
-    this.titleTextSize = 34.0,
-    this.bodyTextSize = 18.0,
-  });
+
+  /// Text widget for the title
+  ///
+  /// @Default style `color: Colors.white , fontSize: 50.0`
+  final Text title;
+
+  /// Text widget for the title
+  ///
+  /// @Default style `color: Colors.white, fontSize: 24.0`
+  final Text body;
+
+  /// set default TextStyle for both title and body
+  final TextStyle textStyle;
+
+  /// Image Widget
+  final Image mainImage;
+
+  PageViewModel(
+      {this.pageColor,
+      this.iconImageAssetPath,
+      this.bubbleBackgroundColor = const Color(0x88FFFFFF),
+      this.iconColor,
+      @required this.title,
+      @required this.body,
+      @required this.mainImage,
+      this.textStyle});
+
+  TextStyle get titleTextStyle {
+    return new TextStyle(color: Colors.white, fontSize: 50.0)
+        .merge(this.textStyle);
+  }
+
+  TextStyle get bodyTextStyle {
+    return new TextStyle(color: Colors.white, fontSize: 24.0)
+        .merge(this.textStyle);
+  }
 }