Merge remote-tracking branch 'upstream/master' into skip-done-override

Author: taljacobson

.idea/workspace.xml

@@ -1,3 +1,6 @@
+## 2.1.0
+* Fixed overflow for small screen apps.
+
 ## 2.0.1
 **Major Updates**
 * Made intro views responsive.

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: "^2.0.1"
+ intro_views_flutter: "^2.1.1"
 ```
 
 You can also reference the git repository directly if you want:

README.md

@@ -129,7 +129,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.2"
+    version: "2.1.1"
   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.58.0.flutter-f981f09760"
+  dart: ">=2.0.0-dev.52.0 <=2.0.0-dev.54.0.flutter-46ab040e58"
   flutter: ">=0.1.4 <2.0.0"

example/pubspec.lock

@@ -37,17 +37,24 @@ class Page extends StatelessWidget {
   /// when device is Portrait place title, image and body in a column
   Widget _buildPortraitPage() {
     return new Column(
-      mainAxisAlignment: MainAxisAlignment.start,
+      mainAxisAlignment: MainAxisAlignment.spaceAround,
+      mainAxisSize: MainAxisSize.max,
       children: <Widget>[
-        new _TitlePageTransform(
-            percentVisible: percentVisible,
-            pageViewModel: pageViewModel), //Transform
-        new _ImagePageTransform(
-            percentVisible: percentVisible,
-            pageViewModel: pageViewModel), //Transform
-        new _BodyPageTransform(
-            percentVisible: percentVisible,
-            pageViewModel: pageViewModel), //Transform
+        Flexible(
+          flex: 1,
+          child: new _TitlePageTransform(
+              percentVisible: percentVisible, pageViewModel: pageViewModel),
+        ), //Transform
+        Expanded(
+          flex: 4,
+          child: new _ImagePageTransform(
+              percentVisible: percentVisible, pageViewModel: pageViewModel),
+        ), //Transform
+        Flexible(
+          flex: 2,
+          child: new _BodyPageTransform(
+              percentVisible: percentVisible, pageViewModel: pageViewModel),
+        ), //Transform
       ],
     );
   }
@@ -58,9 +65,10 @@ class Page extends StatelessWidget {
       crossAxisAlignment: CrossAxisAlignment.center,
       mainAxisSize: MainAxisSize.max,
       children: <Widget>[
-        new _ImagePageTransform(
-            percentVisible: percentVisible,
-            pageViewModel: pageViewModel), //Transform
+        Expanded(
+          child: new _ImagePageTransform(
+              percentVisible: percentVisible, pageViewModel: pageViewModel),
+        ), //Transform
 
         new Flexible(
           child: new Column(
@@ -131,8 +139,6 @@ class _ImagePageTransform extends StatelessWidget {
       child: new Padding(
         padding: new EdgeInsets.only(top: 20.0, bottom: 40.0),
         child: new Container(
-          width: 285.0,
-          height: 285.0,
           child: pageViewModel.mainImage, //Loading main
         ), //Container
       ), //Padding

lib/UI/page.dart

@@ -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.0.1
+version: 2.1.1
 author: Ayush Agarwal <[email protected]>
 homepage: https://github.com/aagarwal1012/IntroViews-Flutter