Skip to content

Commit 6e9047c

Browse files
committed
Merge branch 'taljacobson-issue-small-screen'
2 parents 0e7871c + 82ffd79 commit 6e9047c

File tree

1 file changed

+21
-15
lines changed

1 file changed

+21
-15
lines changed

lib/UI/page.dart

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,24 @@ class Page extends StatelessWidget {
3737
/// when device is Portrait place title, image and body in a column
3838
Widget _buildPortraitPage() {
3939
return new Column(
40-
mainAxisAlignment: MainAxisAlignment.start,
40+
mainAxisAlignment: MainAxisAlignment.spaceAround,
41+
mainAxisSize: MainAxisSize.max,
4142
children: <Widget>[
42-
new _TitlePageTransform(
43-
percentVisible: percentVisible,
44-
pageViewModel: pageViewModel), //Transform
45-
new _ImagePageTransform(
46-
percentVisible: percentVisible,
47-
pageViewModel: pageViewModel), //Transform
48-
new _BodyPageTransform(
49-
percentVisible: percentVisible,
50-
pageViewModel: pageViewModel), //Transform
43+
Flexible(
44+
flex: 1,
45+
child: new _TitlePageTransform(
46+
percentVisible: percentVisible, pageViewModel: pageViewModel),
47+
), //Transform
48+
Expanded(
49+
flex: 4,
50+
child: new _ImagePageTransform(
51+
percentVisible: percentVisible, pageViewModel: pageViewModel),
52+
), //Transform
53+
Flexible(
54+
flex: 2,
55+
child: new _BodyPageTransform(
56+
percentVisible: percentVisible, pageViewModel: pageViewModel),
57+
), //Transform
5158
],
5259
);
5360
}
@@ -58,9 +65,10 @@ class Page extends StatelessWidget {
5865
crossAxisAlignment: CrossAxisAlignment.center,
5966
mainAxisSize: MainAxisSize.max,
6067
children: <Widget>[
61-
new _ImagePageTransform(
62-
percentVisible: percentVisible,
63-
pageViewModel: pageViewModel), //Transform
68+
Expanded(
69+
child: new _ImagePageTransform(
70+
percentVisible: percentVisible, pageViewModel: pageViewModel),
71+
), //Transform
6472

6573
new Flexible(
6674
child: new Column(
@@ -130,8 +138,6 @@ class _ImagePageTransform extends StatelessWidget {
130138
child: new Padding(
131139
padding: new EdgeInsets.only(top: 20.0, bottom: 40.0),
132140
child: new Container(
133-
width: 285.0,
134-
height: 285.0,
135141
child: pageViewModel.mainImage, //Loading main
136142
), //Container
137143
), //Padding

0 commit comments

Comments
 (0)