Merge branch 'master' of github.com-nixrajput:nixrajput/flutter_carousel_widget

# Conflicts:
#	lib/src/_expandable_carousel_widget.dart

Author: nixrajput

lib/src/_expandable_carousel_widget.dart

@@ -4,8 +4,11 @@ import 'dart:async';
 
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_carousel_widget/flutter_carousel_widget.dart';
 import 'package:flutter_carousel_widget/src/components/overflow_page.dart';
+import 'package:flutter_carousel_widget/src/enums/carousel_page_changed_reason.dart';
+import 'package:flutter_carousel_widget/src/helpers/flutter_carousel_controller.dart';
+import 'package:flutter_carousel_widget/src/helpers/flutter_carousel_options.dart';
+import 'package:flutter_carousel_widget/src/helpers/flutter_carousel_state.dart';
 import 'package:flutter_carousel_widget/src/typedefs/widget_builder.dart';
 import 'package:flutter_carousel_widget/src/utils/flutter_carousel_utils.dart';
 
@@ -48,20 +51,19 @@ class ExpandableCarousel extends StatefulWidget {
   /// The widgets to be shown in the carousel of default constructor
   final List<Widget>? items;
 
-  /// [ExpandableCarouselOptions] to create a [ExpandableCarouselWidgetState] with
-  final ExpandableCarouselOptions options;
+  /// [ExpandableCarouselOptions] to create a [ExpandableCarouselState] with
+  final CarouselOptions options;
 
   @override
-  ExpandableCarouselWidgetState createState() =>
-      ExpandableCarouselWidgetState();
+  ExpandableCarouselState createState() => ExpandableCarouselState();
 }
 
-class ExpandableCarouselWidgetState extends State<ExpandableCarousel>
+class ExpandableCarouselState extends State<ExpandableCarousel>
     with TickerProviderStateMixin {
   /// mode is related to why the page is being changed
   CarouselPageChangedReason mode = CarouselPageChangedReason.controller;
 
-  ExpandableCarouselState? _carouselState;
+  CarouselState? _carouselState;
   int _currentPage = 0;
   bool _firstPageLoaded = false;
   PageController? _pageController;
@@ -71,7 +73,7 @@ class ExpandableCarouselWidgetState extends State<ExpandableCarousel>
   late List<double> _sizes;
   Timer? _timer;
 
-  ExpandableCarouselOptions get options => widget.options;
+  CarouselOptions get options => widget.options;
 
   bool get isBuilder => widget.itemBuilder != null;
 
@@ -153,7 +155,7 @@ class ExpandableCarouselWidgetState extends State<ExpandableCarousel>
   void initState() {
     super.initState();
 
-    _carouselState = ExpandableCarouselState(
+    _carouselState = CarouselState(
       options,
       _clearTimer,
       _resumeTimer,
@@ -200,10 +202,10 @@ class ExpandableCarouselWidgetState extends State<ExpandableCarousel>
     super.dispose();
   }
 
-  ExpandableCarouselControllerImpl get carouselController =>
+  CarouselControllerImpl get carouselController =>
       widget.options.controller != null
-          ? widget.options.controller as ExpandableCarouselControllerImpl
-          : ExpandableCarouselController() as ExpandableCarouselControllerImpl;
+          ? widget.options.controller as CarouselControllerImpl
+          : CarouselController() as CarouselControllerImpl;
 
   /// Timer
   Timer? _getTimer() {

lib/src/_flutter_carousel_widget.dart

@@ -3,7 +3,7 @@ library flutter_carousel_widget;
 import 'dart:async';
 
 import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide CarouselController;
 import 'package:flutter_carousel_widget/src/enums/carousel_page_changed_reason.dart';
 import 'package:flutter_carousel_widget/src/enums/center_page_enlarge_strategy.dart';
 import 'package:flutter_carousel_widget/src/helpers/flutter_carousel_controller.dart';

lib/src/helpers/flutter_carousel_options.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' hide CarouselController;
 import 'package:flutter_carousel_widget/src/enums/carousel_page_changed_reason.dart';
 import 'package:flutter_carousel_widget/src/enums/center_page_enlarge_strategy.dart';
 import 'package:flutter_carousel_widget/src/helpers/flutter_carousel_controller.dart';