@@ -6,9 +6,9 @@ import 'package:flutter/gestures.dart';
66import 'package:flutter/material.dart' ;
77import 'package:flutter_carousel_widget/src/components/overflow_page.dart' ;
88import 'package:flutter_carousel_widget/src/enums/carousel_page_changed_reason.dart' ;
9- import 'package:flutter_carousel_widget/src/helpers/flutter_carousel_controller .dart' ;
10- import 'package:flutter_carousel_widget/src/helpers/flutter_carousel_options .dart' ;
11- import 'package:flutter_carousel_widget/src/helpers/flutter_carousel_state .dart' ;
9+ import 'package:flutter_carousel_widget/src/helpers/flutter_expandable_carousel_controller .dart' ;
10+ import 'package:flutter_carousel_widget/src/helpers/flutter_expandable_carousel_options .dart' ;
11+ import 'package:flutter_carousel_widget/src/helpers/flutter_expandable_carousel_state .dart' ;
1212import 'package:flutter_carousel_widget/src/typedefs/widget_builder.dart' ;
1313import 'package:flutter_carousel_widget/src/utils/flutter_carousel_utils.dart' ;
1414
@@ -52,18 +52,19 @@ class ExpandableCarousel extends StatefulWidget {
5252 final List <Widget >? items;
5353
5454 /// [ExpandableCarouselOptions] to create a [ExpandableCarouselState] with
55- final CarouselOptions options;
55+ final ExpandableCarouselOptions options;
5656
5757 @override
58- ExpandableCarouselState createState () => ExpandableCarouselState ();
58+ ExpandableCarouselWidgetState createState () =>
59+ ExpandableCarouselWidgetState ();
5960}
6061
61- class ExpandableCarouselState extends State <ExpandableCarousel >
62+ class ExpandableCarouselWidgetState extends State <ExpandableCarousel >
6263 with TickerProviderStateMixin {
6364 /// mode is related to why the page is being changed
6465 CarouselPageChangedReason mode = CarouselPageChangedReason .controller;
6566
66- CarouselState ? _carouselState;
67+ ExpandableCarouselState ? _carouselState;
6768 int _currentPage = 0 ;
6869 bool _firstPageLoaded = false ;
6970 PageController ? _pageController;
@@ -73,7 +74,7 @@ class ExpandableCarouselState extends State<ExpandableCarousel>
7374 late List <double > _sizes;
7475 Timer ? _timer;
7576
76- CarouselOptions get options => widget.options;
77+ ExpandableCarouselOptions get options => widget.options;
7778
7879 bool get isBuilder => widget.itemBuilder != null ;
7980
@@ -155,7 +156,7 @@ class ExpandableCarouselState extends State<ExpandableCarousel>
155156 void initState () {
156157 super .initState ();
157158
158- _carouselState = CarouselState (
159+ _carouselState = ExpandableCarouselState (
159160 options,
160161 _clearTimer,
161162 _resumeTimer,
@@ -202,10 +203,10 @@ class ExpandableCarouselState extends State<ExpandableCarousel>
202203 super .dispose ();
203204 }
204205
205- CarouselControllerImpl get carouselController =>
206+ ExpandableCarouselControllerImpl get carouselController =>
206207 widget.options.controller != null
207- ? widget.options.controller as CarouselControllerImpl
208- : CarouselController () as CarouselControllerImpl ;
208+ ? widget.options.controller as ExpandableCarouselControllerImpl
209+ : ExpandableCarouselController () as ExpandableCarouselControllerImpl ;
209210
210211 /// Timer
211212 Timer ? _getTimer () {
@@ -218,6 +219,7 @@ class ExpandableCarouselState extends State<ExpandableCarousel>
218219
219220 var previousReason = mode;
220221 _changeMode (CarouselPageChangedReason .timed);
222+
221223 var nextPage = _carouselState! .pageController! .page! .round () + 1 ;
222224 var itemCount = widget.itemCount ?? widget.items! .length;
223225
0 commit comments