Add feature: customizable halo for prebuilt indicators

ProV1X · ProV1X · commit 6923792568b0 · 2024-06-29T23:26:03.000-04:00
diff --git a/lib/src/indicators/circular_slide_indicator.dart b/lib/src/indicators/circular_slide_indicator.dart
@@ -3,16 +3,17 @@ import 'package:flutter/material.dart';
 import 'slide_indicator.dart';
 
 class CircularSlideIndicator implements SlideIndicator {
-  const CircularSlideIndicator({
-    this.itemSpacing = 20,
-    this.indicatorRadius = 6,
-    this.indicatorBorderWidth = 1,
-    this.indicatorBorderColor,
-    this.padding,
-    this.alignment = Alignment.bottomCenter,
-    this.currentIndicatorColor,
-    this.indicatorBackgroundColor,
-  });
+  const CircularSlideIndicator(
+      {this.itemSpacing = 20,
+      this.indicatorRadius = 6,
+      this.indicatorBorderWidth = 1,
+      this.indicatorBorderColor,
+      this.padding,
+      this.alignment = Alignment.bottomCenter,
+      this.currentIndicatorColor,
+      this.indicatorBackgroundColor,
+      this.haloDecoration,
+      this.haloPadding});
 
   final AlignmentGeometry alignment;
   final Color? currentIndicatorColor;
@@ -22,6 +23,8 @@ class CircularSlideIndicator implements SlideIndicator {
   final double indicatorRadius;
   final double itemSpacing;
   final EdgeInsets? padding;
+  final BoxDecoration? haloDecoration;
+  final EdgeInsets? haloPadding;
 
   @override
   Widget build(int currentPage, double pageDelta, int itemCount) {
@@ -37,20 +40,24 @@ class CircularSlideIndicator implements SlideIndicator {
     return Container(
       alignment: alignment,
       padding: padding,
-      child: SizedBox(
-        width: itemCount * itemSpacing,
-        height: indicatorRadius * 2,
-        child: CustomPaint(
-          painter: CircularIndicatorPainter(
-            currentIndicatorColor: currentIndicatorColor ?? activeColor,
-            indicatorBackgroundColor:
-                indicatorBackgroundColor ?? backgroundColor,
-            currentPage: currentPage,
-            pageDelta: pageDelta,
-            itemCount: itemCount,
-            radius: indicatorRadius,
-            indicatorBorderColor: indicatorBorderColor,
-            borderWidth: indicatorBorderWidth,
+      child: Container(
+        decoration: haloDecoration,
+        padding: haloPadding,
+        child: SizedBox(
+          width: itemCount * itemSpacing,
+          height: indicatorRadius * 2,
+          child: CustomPaint(
+            painter: CircularIndicatorPainter(
+              currentIndicatorColor: currentIndicatorColor ?? activeColor,
+              indicatorBackgroundColor:
+                  indicatorBackgroundColor ?? backgroundColor,
+              currentPage: currentPage,
+              pageDelta: pageDelta,
+              itemCount: itemCount,
+              radius: indicatorRadius,
+              indicatorBorderColor: indicatorBorderColor,
+              borderWidth: indicatorBorderWidth,
+            ),
           ),
         ),
       ),
diff --git a/lib/src/indicators/circular_static_indicator.dart b/lib/src/indicators/circular_static_indicator.dart
@@ -3,17 +3,18 @@ import 'package:flutter/material.dart';
 import 'slide_indicator.dart';
 
 class CircularStaticIndicator extends SlideIndicator {
-  CircularStaticIndicator({
-    this.itemSpacing = 20,
-    this.indicatorRadius = 6,
-    this.padding,
-    this.alignment = Alignment.bottomCenter,
-    this.currentIndicatorColor,
-    this.indicatorBackgroundColor,
-    this.enableAnimation = false,
-    this.indicatorBorderWidth = 1,
-    this.indicatorBorderColor,
-  });
+  CircularStaticIndicator(
+      {this.itemSpacing = 20,
+      this.indicatorRadius = 6,
+      this.padding,
+      this.alignment = Alignment.bottomCenter,
+      this.currentIndicatorColor,
+      this.indicatorBackgroundColor,
+      this.enableAnimation = false,
+      this.indicatorBorderWidth = 1,
+      this.indicatorBorderColor,
+      this.haloDecoration,
+      this.haloPadding});
 
   final AlignmentGeometry alignment;
   final Color? currentIndicatorColor;
@@ -24,6 +25,8 @@ class CircularStaticIndicator extends SlideIndicator {
   final double indicatorRadius;
   final double itemSpacing;
   final EdgeInsets? padding;
+  final BoxDecoration? haloDecoration;
+  final EdgeInsets? haloPadding;
 
   @override
   Widget build(int currentPage, double pageDelta, int itemCount) {
@@ -39,21 +42,25 @@ class CircularStaticIndicator extends SlideIndicator {
     return Container(
       alignment: alignment,
       padding: padding,
-      child: SizedBox(
-        width: itemCount * itemSpacing,
-        height: indicatorRadius * 2,
-        child: CustomPaint(
-          painter: CircularStaticIndicatorPainter(
-            currentIndicatorColor: currentIndicatorColor ?? activeColor,
-            indicatorBackgroundColor:
-                indicatorBackgroundColor ?? backgroundColor,
-            currentPage: currentPage,
-            pageDelta: pageDelta,
-            itemCount: itemCount,
-            radius: indicatorRadius,
-            enableAnimation: enableAnimation,
-            indicatorBorderColor: indicatorBorderColor,
-            borderWidth: indicatorBorderWidth,
+      child: Container(
+        decoration: haloDecoration,
+        padding: haloPadding,
+        child: SizedBox(
+          width: itemCount * itemSpacing,
+          height: indicatorRadius * 2,
+          child: CustomPaint(
+            painter: CircularStaticIndicatorPainter(
+              currentIndicatorColor: currentIndicatorColor ?? activeColor,
+              indicatorBackgroundColor:
+                  indicatorBackgroundColor ?? backgroundColor,
+              currentPage: currentPage,
+              pageDelta: pageDelta,
+              itemCount: itemCount,
+              radius: indicatorRadius,
+              enableAnimation: enableAnimation,
+              indicatorBorderColor: indicatorBorderColor,
+              borderWidth: indicatorBorderWidth,
+            ),
           ),
         ),
       ),
diff --git a/lib/src/indicators/circular_wave_slide_indicator.dart b/lib/src/indicators/circular_wave_slide_indicator.dart
@@ -3,16 +3,17 @@ import 'package:flutter/material.dart';
 import 'slide_indicator.dart';
 
 class CircularWaveSlideIndicator implements SlideIndicator {
-  CircularWaveSlideIndicator({
-    this.itemSpacing = 20,
-    this.indicatorRadius = 6,
-    this.padding,
-    this.alignment = Alignment.bottomCenter,
-    this.currentIndicatorColor,
-    this.indicatorBackgroundColor,
-    this.indicatorBorderWidth = 1,
-    this.indicatorBorderColor,
-  });
+  CircularWaveSlideIndicator(
+      {this.itemSpacing = 20,
+      this.indicatorRadius = 6,
+      this.padding,
+      this.alignment = Alignment.bottomCenter,
+      this.currentIndicatorColor,
+      this.indicatorBackgroundColor,
+      this.indicatorBorderWidth = 1,
+      this.indicatorBorderColor,
+      this.haloDecoration,
+      this.haloPadding});
 
   final AlignmentGeometry alignment;
   final Color? currentIndicatorColor;
@@ -22,6 +23,8 @@ class CircularWaveSlideIndicator implements SlideIndicator {
   final double indicatorRadius;
   final double itemSpacing;
   final EdgeInsets? padding;
+  final BoxDecoration? haloDecoration;
+  final EdgeInsets? haloPadding;
 
   @override
   Widget build(int currentPage, double pageDelta, int itemCount) {
@@ -37,20 +40,24 @@ class CircularWaveSlideIndicator implements SlideIndicator {
     return Container(
       alignment: alignment,
       padding: padding,
-      child: SizedBox(
-        width: itemCount * itemSpacing,
-        height: indicatorRadius * 2,
-        child: CustomPaint(
-          painter: CircularWaveIndicatorPainter(
-            currentIndicatorColor: currentIndicatorColor ?? activeColor,
-            indicatorBackgroundColor:
-                indicatorBackgroundColor ?? backgroundColor,
-            currentPage: currentPage,
-            pageDelta: pageDelta,
-            itemCount: itemCount,
-            radius: indicatorRadius,
-            indicatorBorderColor: indicatorBorderColor,
-            borderWidth: indicatorBorderWidth,
+      child: Container(
+        decoration: haloDecoration,
+        padding: haloPadding,
+        child: SizedBox(
+          width: itemCount * itemSpacing,
+          height: indicatorRadius * 2,
+          child: CustomPaint(
+            painter: CircularWaveIndicatorPainter(
+              currentIndicatorColor: currentIndicatorColor ?? activeColor,
+              indicatorBackgroundColor:
+                  indicatorBackgroundColor ?? backgroundColor,
+              currentPage: currentPage,
+              pageDelta: pageDelta,
+              itemCount: itemCount,
+              radius: indicatorRadius,
+              indicatorBorderColor: indicatorBorderColor,
+              borderWidth: indicatorBorderWidth,
+            ),
           ),
         ),
       ),
diff --git a/lib/src/indicators/sequential_fill_indicator.dart b/lib/src/indicators/sequential_fill_indicator.dart
@@ -3,17 +3,18 @@ import 'package:flutter/material.dart';
 import 'slide_indicator.dart';
 
 class SequentialFillIndicator extends SlideIndicator {
-  SequentialFillIndicator({
-    this.itemSpacing = 20,
-    this.indicatorRadius = 6,
-    this.padding,
-    this.alignment = Alignment.bottomCenter,
-    this.currentIndicatorColor,
-    this.indicatorBackgroundColor,
-    this.enableAnimation = false,
-    this.indicatorBorderWidth = 1,
-    this.indicatorBorderColor,
-  });
+  SequentialFillIndicator(
+      {this.itemSpacing = 20,
+      this.indicatorRadius = 6,
+      this.padding,
+      this.alignment = Alignment.bottomCenter,
+      this.currentIndicatorColor,
+      this.indicatorBackgroundColor,
+      this.enableAnimation = false,
+      this.indicatorBorderWidth = 1,
+      this.indicatorBorderColor,
+      this.haloDecoration,
+      this.haloPadding});
 
   final AlignmentGeometry alignment;
   final Color? currentIndicatorColor;
@@ -24,6 +25,8 @@ class SequentialFillIndicator extends SlideIndicator {
   final double indicatorRadius;
   final double itemSpacing;
   final EdgeInsets? padding;
+  final BoxDecoration? haloDecoration;
+  final EdgeInsets? haloPadding;
 
   @override
   Widget build(int currentPage, double pageDelta, int itemCount) {
@@ -39,21 +42,25 @@ class SequentialFillIndicator extends SlideIndicator {
     return Container(
       alignment: alignment,
       padding: padding,
-      child: SizedBox(
-        width: itemCount * itemSpacing,
-        height: indicatorRadius * 2,
-        child: CustomPaint(
-          painter: SequentialFillIndicatorPainter(
-            currentIndicatorColor: currentIndicatorColor ?? activeColor,
-            indicatorBackgroundColor:
-                indicatorBackgroundColor ?? backgroundColor,
-            currentPage: currentPage,
-            pageDelta: pageDelta,
-            itemCount: itemCount,
-            radius: indicatorRadius,
-            enableAnimation: enableAnimation,
-            indicatorBorderColor: indicatorBorderColor,
-            borderWidth: indicatorBorderWidth,
+      child: Container(
+        decoration: haloDecoration,
+        padding: haloPadding,
+        child: SizedBox(
+          width: itemCount * itemSpacing,
+          height: indicatorRadius * 2,
+          child: CustomPaint(
+            painter: SequentialFillIndicatorPainter(
+              currentIndicatorColor: currentIndicatorColor ?? activeColor,
+              indicatorBackgroundColor:
+                  indicatorBackgroundColor ?? backgroundColor,
+              currentPage: currentPage,
+              pageDelta: pageDelta,
+              itemCount: itemCount,
+              radius: indicatorRadius,
+              enableAnimation: enableAnimation,
+              indicatorBorderColor: indicatorBorderColor,
+              borderWidth: indicatorBorderWidth,
+            ),
           ),
         ),
       ),
