@@ -9,7 +9,7 @@ class SkipButton extends StatelessWidget {
99 final VoidCallback onTap;
1010 //view model
1111 final PageButtonViewModel pageButtonViewModel;
12- final Text child;
12+ final Widget child;
1313 //Constructor
1414 SkipButton ({
1515 this .onTap,
@@ -32,9 +32,9 @@ class SkipButton extends StatelessWidget {
3232 opacity = pageButtonViewModel.slidePercent;
3333 }
3434
35- return new FlatButton (
35+ return FlatButton (
3636 onPressed: onTap,
37- child: new Opacity (
37+ child: Opacity (
3838 opacity: opacity,
3939 child: DefaultTextStyle .merge (
4040 style: style,
@@ -52,7 +52,7 @@ class DoneButton extends StatelessWidget {
5252 final VoidCallback onTap;
5353 //View Model
5454 final PageButtonViewModel pageButtonViewModel;
55- final Text child;
55+ final Widget child;
5656 //Constructor
5757 DoneButton ({
5858 this .onTap,
@@ -71,9 +71,9 @@ class DoneButton extends StatelessWidget {
7171 opacity = 1.0 - pageButtonViewModel.slidePercent;
7272 }
7373
74- return new FlatButton (
74+ return FlatButton (
7575 onPressed: onTap,
76- child: new Opacity (
76+ child: Opacity (
7777 opacity: opacity,
7878 child: DefaultTextStyle .merge (
7979 style: style,
@@ -94,8 +94,8 @@ class PageIndicatorButtons extends StatelessWidget {
9494 final double slidePercent;
9595 final bool showSkipButton;
9696
97- final Text doneText;
98- final Text skipText;
97+ final Widget doneText;
98+ final Widget skipText;
9999 final TextStyle textStyle;
100100
101101 final bool doneButtonPersist;
@@ -123,49 +123,48 @@ class PageIndicatorButtons extends StatelessWidget {
123123 bottom: 0.0 ,
124124 child: DefaultTextStyle (
125125 style: textStyle,
126- child: new Row (
126+ child: Row (
127127 mainAxisAlignment: MainAxisAlignment .spaceBetween,
128128 crossAxisAlignment: CrossAxisAlignment .center,
129129 mainAxisSize: MainAxisSize .max,
130130 children: < Widget > [
131- new Padding (
131+ Padding (
132132 padding: const EdgeInsets .only (bottom: 10.0 ),
133133 child: ((acitvePageIndex < totalPages - 1 ||
134134 (acitvePageIndex == totalPages - 1 &&
135135 slideDirection == SlideDirection .leftToRight)) &&
136136 showSkipButton)
137- ? new SkipButton (
137+ ? SkipButton (
138138 child: skipText,
139139 onTap: onPressedSkipButton,
140- pageButtonViewModel: new PageButtonViewModel (
140+ pageButtonViewModel: PageButtonViewModel (
141141 //View Model
142142 activePageIndex: acitvePageIndex,
143143 totalPages: totalPages,
144144 slidePercent: slidePercent,
145145 slideDirection: slideDirection,
146146 ),
147147 )
148- : new Container (), //Row
148+ : Container (), //Row
149149 ), //Padding
150-
151- new Padding (
150+ Padding (
152151 padding: const EdgeInsets .only (bottom: 10.0 ),
153152 child: (acitvePageIndex == totalPages - 1 ||
154153 (acitvePageIndex == totalPages - 2 &&
155154 slideDirection == SlideDirection .rightToLeft ||
156155 doneButtonPersist))
157- ? new DoneButton (
156+ ? DoneButton (
158157 child: doneText,
159158 onTap: onPressedDoneButton,
160- pageButtonViewModel: new PageButtonViewModel (
159+ pageButtonViewModel: PageButtonViewModel (
161160 //view Model
162161 activePageIndex: acitvePageIndex,
163162 totalPages: totalPages,
164163 slidePercent: doneButtonPersist ? 0.0 : slidePercent,
165164 slideDirection: slideDirection,
166165 ),
167166 )
168- : new Container (), //Row
167+ : Container (), //Row
169168 ),
170169 ],
171170 ),
0 commit comments