Skip to content

Commit 08f33d6

Browse files
deepikahrdeepikahr
committed
changed namings
1 parent 7a6099f commit 08f33d6

File tree

5 files changed

+137
-175
lines changed

5 files changed

+137
-175
lines changed

‎example/lib/main_temp.dart‎

Lines changed: 93 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,11 @@ class _IntroScreenState extends State<IntroScreen> {
124124

125125
@override
126126
void initState() {
127-
_pageController = PageController(initialPage: 1, keepPage: false, viewportFraction: 2);
127+
_pageController = PageController(initialPage: 2, keepPage: false, viewportFraction: 2);
128128
initialPage = _pageController.initialPage;
129129
super.initState();
130130
}
131131

132-
133132
@override
134133
// ignore: prefer_expression_function_bodies
135134
Widget build(BuildContext context) {
@@ -143,11 +142,12 @@ class _IntroScreenState extends State<IntroScreen> {
143142
slides: slides(),
144143
pageController: _pageController,
145144
// showIntroBottomNavigation: false,
146-
gfIntroBottomNavigation: GFIntroBottomNavigation(
147-
pageController: _pageController,
148-
pageCount: slideList.length,
149-
currentIndex: initialPage,
150-
// child: Text('dfghj'),
145+
146+
// introScreenBottomNavigationBar: GFIntroScreenBottomNavigationBar(
147+
// pageController: _pageController,
148+
// pageCount: slideList.length,
149+
// currentIndex: initialPage,
150+
// child: Text('dfghj'),
151151

152152
// onForwardButtonTap: () {
153153
// print('fffffff');
@@ -208,7 +208,7 @@ class _IntroScreenState extends State<IntroScreen> {
208208
//
209209
// showButton: false,
210210
// showPagination: true,
211-
),
211+
// ),
212212
),
213213
);
214214
}
@@ -223,6 +223,91 @@ class _IntroScreenState extends State<IntroScreen> {
223223
),
224224
Container(
225225
color: Colors.teal,
226+
child: GFImageOverlay(
227+
width: MediaQuery.of(context).size.width,
228+
// margin: const EdgeInsets.all(16),
229+
padding: const EdgeInsets.all(16),
230+
child: Column(
231+
children: <Widget>[
232+
Text(
233+
'Hello world',
234+
style: TextStyle(color: Colors.white),
235+
),
236+
Text(
237+
'Hello world',
238+
style: TextStyle(color: Colors.white),
239+
),
240+
Text(
241+
'Hello world',
242+
style: TextStyle(color: Colors.white),
243+
),
244+
Text(
245+
'Hello world',
246+
style: TextStyle(color: Colors.white),
247+
),
248+
Text(
249+
'Hello world',
250+
style: TextStyle(color: Colors.white),
251+
),
252+
Text(
253+
'Hello world',
254+
style: TextStyle(color: Colors.white),
255+
),
256+
Text(
257+
'Hello world',
258+
style: TextStyle(color: Colors.white),
259+
),
260+
Text(
261+
'Hello world',
262+
style: TextStyle(color: Colors.white),
263+
),
264+
Text(
265+
'Hello world',
266+
style: TextStyle(color: Colors.white),
267+
),
268+
Text(
269+
'Hello world',
270+
style: TextStyle(color: Colors.white),
271+
),
272+
Text(
273+
'Hello world',
274+
style: TextStyle(color: Colors.white),
275+
),
276+
Text(
277+
'Hello world',
278+
style: TextStyle(color: Colors.white),
279+
),
280+
Text(
281+
'Hello world',
282+
style: TextStyle(color: Colors.white),
283+
),
284+
Text(
285+
'Hello world',
286+
style: TextStyle(color: Colors.white),
287+
),
288+
Text(
289+
'Hello world',
290+
style: TextStyle(color: Colors.white),
291+
),
292+
Text(
293+
'Hello world',
294+
style: TextStyle(color: Colors.white),
295+
),
296+
Text(
297+
'Hello world',
298+
style: TextStyle(color: Colors.white),
299+
),
300+
],
301+
),
302+
color: Colors.orange,
303+
image: const NetworkImage(
304+
'https://cdn.pixabay.com/photo/2017/12/13/00/23/christmas-3015776_960_720.jpg'),
305+
boxFit: BoxFit.fitHeight,
306+
colorFilter: ColorFilter.mode(
307+
Colors.black.withOpacity(0.6), BlendMode.darken),
308+
borderRadius: BorderRadius.circular(5),
309+
// border: Border.all(color: Colors.pink, width: 2.0),
310+
),
226311
),
227312
Container(
228313
color: Colors.grey,
@@ -231,45 +316,6 @@ class _IntroScreenState extends State<IntroScreen> {
231316
color: Colors.red,
232317
),
233318
];
234-
slideList.add(GFIntroSlide(
235-
// backgroundColor: Colors.yellow,
236-
// child: Container(
237-
// height: 100, color: Colors.blueGrey.withOpacity(.5),
238-
// ),
239-
image: Image.network('https://cdn.pixabay.com/photo/2017/12/03/18/04/christmas-balls-2995437_960_720.jpg', height: 100, width: 100,),
240-
title: Text('First'),
241-
// imageHeight: 200,
242-
// imageWidth: 200,
243-
// image: AssetImage('assets/images/5.png'),
244-
));
245-
slideList.add(const GFIntroSlide(
246-
backgroundColor: Colors.blue,
247-
title: Text('Second'),
248-
// imageHeight: 200,
249-
// imageWidth: 200,
250-
// image: AssetImage('assets/images/2.png'),
251-
));
252-
slideList.add(const GFIntroSlide(
253-
backgroundColor: Colors.green,
254-
title: Text('Third'),
255-
// imageHeight: 200,
256-
// imageWidth: 200,
257-
// image: AssetImage('assets/images/3.png'),
258-
));
259-
slideList.add(const GFIntroSlide(
260-
backgroundColor: Colors.red,
261-
title: Text('Fourth'),
262-
// imageHeight: 200,
263-
// imageWidth: 200,
264-
// image: AssetImage('assets/images/4.png'),
265-
));
266-
slideList.add(const GFIntroSlide(
267-
backgroundColor: Colors.deepPurple,
268-
title: Text('Fifth'),
269-
// imageHeight: 200,
270-
// imageWidth: 200,
271-
// image: AssetImage('assets/images/5.png'),
272-
));
273319
return slideList;
274320
}
275321
}

‎lib/components/intro_screen/gf_intro_screen.dart‎

Lines changed: 40 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ class GFIntroScreen extends StatefulWidget {
1212
this.height,
1313
this.borderRadius,
1414
this.border,
15-
this.gfIntroBottomNavigation,
16-
this.showIntroBottomNavigation = true,
15+
this.introScreenBottomNavigationBar,
16+
this.showIntroSCreenBottomNavigationBar = true,
1717
this.currentIndex = 0,
1818
this.pageCount = 0,
1919
this.child,
@@ -82,10 +82,10 @@ class GFIntroScreen extends StatefulWidget {
8282

8383
final Border border;
8484

85-
/// [GFIntroScreen] bottom navigation will be used as [GFIntroBottomNavigation] component
86-
final GFIntroBottomNavigation gfIntroBottomNavigation;
85+
/// [GFIntroScreen] bottom navigation will be used as [GFIntroScreenBottomNavigationBar] component
86+
final GFIntroScreenBottomNavigationBar introScreenBottomNavigationBar;
8787

88-
final bool showIntroBottomNavigation;
88+
final bool showIntroSCreenBottomNavigationBar;
8989

9090

9191

@@ -100,7 +100,7 @@ class GFIntroScreen extends StatefulWidget {
100100
final EdgeInsets navigationBarMargin;
101101
final dynamic navigationBarColor;
102102

103-
/// defines the shape of [GFIntroBottomNavigation]
103+
/// defines the shape of [GFIntroScreenBottomNavigationBar]
104104
final ShapeBorder navigationBarShape;
105105

106106
final VoidCallback onForwardButtonTap;
@@ -186,58 +186,46 @@ class _GFIntroScreenState extends State<GFIntroScreen> {
186186
children: widget.slides,
187187
),
188188
),
189-
widget.showIntroBottomNavigation ? widget.gfIntroBottomNavigation ??
190-
GFIntroBottomNavigation(
189+
widget.showIntroSCreenBottomNavigationBar ? widget.introScreenBottomNavigationBar ??
190+
GFIntroScreenBottomNavigationBar(
191191
pageController: _pageController,
192192
pageCount: widget.slides.length,
193193
currentIndex: currentIndex,
194194
child: widget.child,
195195
navigationBarColor: widget.navigationBarColor,
196196
navigationBarHeight: widget.navigationBarHeight,
197-
navigationBarShape: widget.navigationBarWidth,
198-
navigationBarWidth,
199-
navigationBarPadding = const EdgeInsets.all(8),
200-
navigationBarMargin = const EdgeInsets.all(8),
201-
showDivider = true,
202-
dividerColor = Colors.white,
203-
dividerHeight = 1,
204-
dividerThickness = 2,
205-
dotShape,
206-
inActiveColor = GFColors.LIGHT,
207-
activeColor = GFColors.PRIMARY,
208-
dotHeight = 12,
209-
dotWidth = 12,
210-
dotMargin = const EdgeInsets.symmetric(horizontal: 2),
211-
backButton,
212-
forwardButton,
213-
doneButton,
214-
skipButton,
215-
onDoneTap,
216-
onForwardButtonTap,
217-
onBackButtonTap,
218-
onSkipTap,
219-
forwardButtonText = 'NEXT',
220-
backButtonText = 'BACK',
221-
doneButtonText = 'GO',
222-
skipButtonText = 'SKIP',
223-
skipButtonTextStyle = const TextStyle(
224-
color: Colors.black,
225-
fontSize: 16,
226-
),
227-
doneButtonTextStyle = const TextStyle(
228-
color: Colors.black,
229-
fontSize: 16,
230-
),
231-
backButtonTextStyle = const TextStyle(
232-
color: Colors.black,
233-
fontSize: 16,
234-
),
235-
forwardButtonTextStyle = const TextStyle(
236-
color: Colors.black,
237-
fontSize: 16,
238-
),
239-
showButton = true,
240-
showPagination = true,
197+
navigationBarShape: widget.navigationBarShape,
198+
navigationBarWidth: widget.navigationBarWidth,
199+
navigationBarPadding: widget.navigationBarPadding,
200+
navigationBarMargin: widget.navigationBarMargin,
201+
showDivider: widget.showDivider,
202+
dividerColor: widget.dividerColor,
203+
dividerHeight: widget.dividerHeight,
204+
dividerThickness: widget.dividerThickness,
205+
dotShape: widget.dotShape,
206+
inActiveColor: widget.inActiveColor,
207+
activeColor: widget.activeColor,
208+
dotHeight: widget.dotHeight,
209+
dotWidth: widget.dotWidth,
210+
dotMargin: widget.dotMargin,
211+
backButton: widget.backButton,
212+
forwardButton: widget.forwardButton,
213+
doneButton: widget.doneButton,
214+
skipButton: widget.skipButton,
215+
onDoneTap: widget.onDoneTap,
216+
onForwardButtonTap: widget.onForwardButtonTap,
217+
onBackButtonTap: widget.onBackButtonTap,
218+
onSkipTap: widget.onSkipTap,
219+
forwardButtonText: widget.forwardButtonText,
220+
backButtonText: widget.backButtonText,
221+
doneButtonText: widget.doneButtonText,
222+
skipButtonText: widget.skipButtonText,
223+
skipButtonTextStyle: widget.skipButtonTextStyle,
224+
doneButtonTextStyle: widget.doneButtonTextStyle,
225+
backButtonTextStyle: widget.backButtonTextStyle,
226+
forwardButtonTextStyle: widget.forwardButtonTextStyle,
227+
showButton: widget.showButton,
228+
showPagination: widget.showPagination,
241229
) : Container(),
242230
],
243231
),

‎lib/components/intro_screen/gf_intro_bottom_navigation.dart‎ renamed to ‎lib/components/intro_screen/gf_intro_screen_bottom_navigation_bar.dart‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import 'package:flutter/cupertino.dart';
22
import 'package:flutter/material.dart';
33
import 'package:getwidget/getwidget.dart';
44

5-
class GFIntroBottomNavigation extends StatelessWidget {
6-
const GFIntroBottomNavigation({
5+
class GFIntroScreenBottomNavigationBar extends StatelessWidget {
6+
const GFIntroScreenBottomNavigationBar({
77
Key key,
88
this.pageController,
99
this.currentIndex = 0,
@@ -70,7 +70,7 @@ class GFIntroBottomNavigation extends StatelessWidget {
7070
final EdgeInsets navigationBarMargin;
7171
final dynamic navigationBarColor;
7272

73-
/// defines the shape of [GFIntroBottomNavigation]
73+
/// defines the shape of [GFIntroScreenBottomNavigationBar]
7474
final ShapeBorder navigationBarShape;
7575

7676
final VoidCallback onForwardButtonTap;

‎lib/components/intro_screen/gf_intro_slide.dart‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)