Skip to content

Commit ec1a84c

Browse files
committed
Merge branch 'taljacobson-skip-done-override'
2 parents 116a63f + 5ae84fb commit ec1a84c

File tree

5 files changed

+195
-168
lines changed

5 files changed

+195
-168
lines changed

.idea/workspace.xml

Lines changed: 57 additions & 70 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,16 @@ You should then run `flutter packages get` in your terminal so as to get the pac
108108

109109
| Dart attribute | Datatype | Description | Default Value |
110110
| :---------------- | :------------------------------ | :----------------------------------------------------------- | :-----------: |
111-
| pages | List<PageViewMode> | Set the pages of the intro screen. | Null |
111+
| pages | List<PageViewModel> | Set the pages of the intro screen. | Null |
112112
| onTapDoneButton | VoidCallback | Method executes on tapping done button. | Null |
113113
| showSkipButton | Bool | Show the skip button at the bottom of page. | true |
114114
| pageButtonTextSize | Double | Set the button text size. | 18.0 |
115115
| pageButtonFontFamily | String | Set the font of button text. | Default |
116116
| onTapSkipButton | VoidCallback | Method executes on tapping skip button. | null |
117117
| pageButtonTextStyles | TextStyle | Configure TextStyle for skip, done buttons, overrides pageButtonFontFamily, pageButtonsColor, pageButtonTextSize. | fontSize: `18.0`, color: `Colors.white` |
118+
| skipText | Text | Override Skip Button Text and styles. | Text('SKIP') |
119+
| doneText | Text | Override Done Button Text and styles. | Text('DONE') |
120+
| doneButtonPersist | Bool | Show done Button throughout pages | false |
118121

119122
For help on editing package code, view the [flutter documentation](https://flutter.io/developing-packages/).
120123

lib/UI/page.dart

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,19 @@ class Page extends StatelessWidget {
7171
), //Transform
7272

7373
new Flexible(
74-
child: new Column(
75-
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
76-
children: <Widget>[
77-
new _TitlePageTransform(
78-
percentVisible: percentVisible,
79-
pageViewModel: pageViewModel), //Transform
80-
new _BodyPageTransform(
81-
percentVisible: percentVisible,
82-
pageViewModel: pageViewModel), //Transform
83-
],
84-
) // Column
85-
),
74+
child: new Column(
75+
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
76+
mainAxisSize: MainAxisSize.max,
77+
children: <Widget>[
78+
new _TitlePageTransform(
79+
percentVisible: percentVisible,
80+
pageViewModel: pageViewModel), //Transform
81+
new _BodyPageTransform(
82+
percentVisible: percentVisible,
83+
pageViewModel: pageViewModel), //Transform
84+
],
85+
), // Column
86+
),
8687
],
8788
);
8889
}

0 commit comments

Comments
 (0)