Skip to content

Commit d046d84

Browse files
committed
Bumped to version 2.3.0
1 parent 66311fe commit d046d84

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

example/lib/main.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,8 @@ class _ExpandableCarouselDemoState extends State<ExpandableCarouselDemo> {
540540
ExpandableCarousel(
541541
options: ExpandableCarouselOptions(
542542
// viewportFraction: 1.0,
543+
enableInfiniteScroll: false,
544+
// initialPage: 3,
543545
autoPlay: true,
544546
controller: _controller,
545547
floatingIndicator: false,

lib/src/_expandable_carousel_widget.dart

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import 'package:flutter/gestures.dart';
66
import 'package:flutter/material.dart';
77
import 'package:flutter_carousel_widget/src/components/overflow_page.dart';
88
import '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';
1212
import 'package:flutter_carousel_widget/src/typedefs/widget_builder.dart';
1313
import '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

lib/src/_flutter_carousel_widget.dart

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ class FlutterCarouselState extends State<FlutterCarousel>
165165
var previousReason = changeReasonMode;
166166
changeMode(CarouselPageChangedReason.timed);
167167

168-
var itemCount = widget.itemCount ?? widget.items!.length;
169168
var nextPage = _carouselState!.pageController!.page!.round() + 1;
169+
var itemCount = widget.itemCount ?? widget.items!.length;
170170

171171
if (nextPage >= itemCount &&
172172
widget.options.enableInfiniteScroll == false) {
@@ -432,10 +432,8 @@ class FlutterCarouselState extends State<FlutterCarousel>
432432

433433
/// The method to build the slide indicator
434434
Widget _buildSlideIndicator() {
435-
final _newCurrentPage =
436-
(widget.options.initialPage + _currentPage) % widget.itemCount!;
437435
return widget.options.slideIndicator!.build(
438-
_newCurrentPage,
436+
(widget.options.initialPage + _currentPage) % widget.itemCount!,
439437
_pageDelta,
440438
widget.itemCount!,
441439
);

0 commit comments

Comments
 (0)