Skip to content

Commit d997ad1

Browse files
committed
carousel pagination issue fixed and gf typography text required removed
1 parent ca5407b commit d997ad1

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

lib/components/carousel/gf_carousel.dart

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -130,20 +130,21 @@ class _GFCarouselState extends State<GFCarousel> with TickerProviderStateMixin {
130130
@override
131131
void initState() {
132132
super.initState();
133+
currentSlide = widget.initialPage;
133134
realPage = widget.enableInfiniteScroll
134135
// ignore: avoid_as
135136
? realPage + widget.initialPage
136137
// ignore: avoid_as
137138
: widget.initialPage;
138139
pageController = PageController(
139-
// ignore: avoid_as
140-
viewportFraction: widget.viewportFraction as double,
141-
initialPage: widget.enableInfiniteScroll
142-
// ignore: avoid_as
143-
? realPage + widget.initialPage
144-
// ignore: avoid_as
145-
: widget.initialPage,
146-
);
140+
// ignore: avoid_as
141+
viewportFraction: widget.viewportFraction as double,
142+
// initialPage: widget.enableInfiniteScroll
143+
// // ignore: avoid_as
144+
// ? realPage + widget.initialPage
145+
// // ignore: avoid_as
146+
// : widget.initialPage,
147+
initialPage: realPage);
147148
timer = getPlayTimer();
148149
}
149150

@@ -198,13 +199,15 @@ class _GFCarouselState extends State<GFCarousel> with TickerProviderStateMixin {
198199
scrollDirection: widget.scrollDirection,
199200
controller: pageController,
200201
reverse: widget.reverse,
201-
itemCount: widget.items.length == 1
202-
? widget.items.length
203-
: widget.enableInfiniteScroll
204-
? null
205-
: widget.items.length,
202+
// itemCount: widget.items.length == 1
203+
// ? widget.items.length
204+
// : widget.enableInfiniteScroll
205+
// ? null
206+
// : widget.items.length,
207+
itemCount: widget.enableInfiniteScroll ? null : widget.items.length,
206208
onPageChanged: (int index) {
207209
int currentPage;
210+
208211
currentPage = _getRealIndex(
209212
index + widget.initialPage, realPage, widget.items.length);
210213
if (widget.onPageChanged != null) {

lib/components/typography/gf_typography.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class GFTypography extends StatelessWidget {
88
Key? key,
99
this.type = GFTypographyType.typo4,
1010
this.child,
11-
required this.text,
11+
this.text,
1212
this.icon,
1313
this.dividerBorderRadius,
1414
this.textColor,

0 commit comments

Comments
 (0)