fix: 🔨Fixed PR issue

Author: Sahil-Simform

lib/src/constants.dart

@@ -1,3 +1,5 @@
+import 'package:flutter/material.dart';
+
 class Constants {
   Constants._();
 
@@ -25,4 +27,16 @@ class Constants {
   /// i.e if it is bottom position then centerBottom + [extraAlignmentOffset]
   /// in bottom
   static const double extraAlignmentOffset = 5;
+
+  static const defaultTargetRadius = Radius.circular(3.0);
+
+  static const ShapeBorder defaultTargetShapeBorder = RoundedRectangleBorder(
+    borderRadius: BorderRadius.all(Radius.circular(8)),
+  );
+
+  static const Widget defaultProgressIndicator = CircularProgressIndicator(
+    valueColor: AlwaysStoppedAnimation(Colors.white),
+  );
+
+  static const Duration defaultAnimationDuration = Duration(milliseconds: 2000);
 }

lib/src/enum.dart

@@ -94,7 +94,7 @@ enum TooltipDefaultActionType {
   void onTap(ShowCaseWidgetState showCaseState) {
     switch (this) {
       case TooltipDefaultActionType.next:
-        showCaseState.next(true);
+        showCaseState.next(fromAutoPlayOrAction: true);
         break;
       case TooltipDefaultActionType.previous:
         showCaseState.previous();

lib/src/get_position.dart

@@ -32,7 +32,7 @@ class GetPosition {
     this.padding = EdgeInsets.zero,
     this.rootRenderObject,
   }) {
-    getRenderBox();
+    _getRenderBox();
   }
 
   final BuildContext context;
@@ -41,18 +41,13 @@ class GetPosition {
   final double screenHeight;
   final RenderObject? rootRenderObject;
 
-  late final RenderBox? _box;
-  late final Offset? _boxOffset;
-  late final Offset? overlayOffset;
+  RenderBox? _box;
+  Offset? _boxOffset;
 
   RenderBox? get box => _box;
 
-  void getRenderBox() {
-    var renderBox = context.findRenderObject() as RenderBox?;
-
-    overlayOffset =
-        (rootRenderObject?.parent as RenderBox?)?.localToGlobal(Offset.zero);
-
+  void _getRenderBox() {
+    final renderBox = context.findRenderObject() as RenderBox?;
     if (renderBox == null) return;
 
     _box = renderBox;
@@ -77,9 +72,7 @@ class GetPosition {
     final bottomRight = _box!.size.bottomRight(_boxOffset!);
     final leftDx = topLeft.dx - padding.left;
     var leftDy = topLeft.dy - padding.top;
-    if (leftDy < 0) {
-      leftDy = 0;
-    }
+    if (leftDy < 0) leftDy = 0;
     final rect = Rect.fromLTRB(
       leftDx.clamp(0, leftDx),
       leftDy.clamp(0, leftDy),
@@ -131,14 +124,17 @@ class GetPosition {
 
   double getCenter() => (getLeft() + getRight()) * 0.5;
 
-  Offset topLeft() =>
-      _box?.size.topLeft(
-        _box!.localToGlobal(
-          Offset.zero,
-          ancestor: rootRenderObject,
-        ),
-      ) ??
-      Offset.zero;
+  Offset topLeft() {
+    final box = _box;
+    if (box == null) return Offset.zero;
+
+    return box.size.topLeft(
+      box.localToGlobal(
+        Offset.zero,
+        ancestor: rootRenderObject,
+      ),
+    );
+  }
 
   Offset getOffSet() => _box?.size.center(topLeft()) ?? Offset.zero;
 }

lib/src/layout_overlays.dart

@@ -24,8 +24,6 @@ import 'package:flutter/material.dart';
 
 import 'showcase_widget.dart';
 
-typedef OverlayUpdateCallback = void Function(VoidCallback updateOverlay);
-
 /// Displays an overlay Widget as constructed by the given [overlayBuilder].
 ///
 /// The overlay built by the [overlayBuilder] can be conditionally shown and
@@ -39,19 +37,19 @@ typedef OverlayUpdateCallback = void Function(VoidCallback updateOverlay);
 /// exist in [OverlayEntry]s which are inaccessible to outside Widgets. But if
 /// a better approach is found then feel free to use it.
 class OverlayBuilder extends StatefulWidget {
-  final bool showOverlay;
-  final WidgetBuilder? overlayBuilder;
-  final Widget? child;
-  final OverlayUpdateCallback updateOverlay;
-
   const OverlayBuilder({
     super.key,
+    required this.child,
     required this.updateOverlay,
     this.showOverlay = false,
     this.overlayBuilder,
-    this.child,
   });
 
+  final bool showOverlay;
+  final WidgetBuilder? overlayBuilder;
+  final Widget child;
+  final ValueSetter<VoidCallback> updateOverlay;
+
   @override
   State<OverlayBuilder> createState() => _OverlayBuilderState();
 }
@@ -66,10 +64,10 @@ class _OverlayBuilderState extends State<OverlayBuilder> {
     if (widget.showOverlay) {
       WidgetsBinding.instance.addPostFrameCallback((_) => showOverlay());
     }
-    widget.updateOverlay.call(updateOverlay);
+    widget.updateOverlay.call(_updateOverlay);
   }
 
-  void updateOverlay() {
+  void _updateOverlay() {
     buildOverlay();
     WidgetsBinding.instance.addPostFrameCallback((_) => syncWidgetAndOverlay());
   }
@@ -145,6 +143,6 @@ class _OverlayBuilderState extends State<OverlayBuilder> {
 
   @override
   Widget build(BuildContext context) {
-    return widget.child!;
+    return widget.child;
   }
 }

lib/src/models/linked_showcase_data.dart

@@ -3,15 +3,15 @@ import 'package:flutter/widgets.dart';
 /// This model is used to move linked showcase overlay data to parent
 /// showcase to crop linked showcase rect
 class LinkedShowcaseDataModel {
-  final Rect rect;
-  final EdgeInsets overlayPadding;
-  final BorderRadius? radius;
-  final bool isCircle;
-
   const LinkedShowcaseDataModel({
     required this.rect,
     required this.radius,
     required this.overlayPadding,
     required this.isCircle,
   });
+
+  final Rect rect;
+  final EdgeInsets overlayPadding;
+  final BorderRadius? radius;
+  final bool isCircle;
 }

lib/src/shape_clipper.dart

@@ -24,6 +24,7 @@ import 'dart:ui' as ui;
 
 import 'package:flutter/material.dart';
 
+import 'constants.dart';
 import 'models/linked_showcase_data.dart';
 
 class RRectClipper extends CustomClipper<ui.Path> {
@@ -44,7 +45,7 @@ class RRectClipper extends CustomClipper<ui.Path> {
   @override
   ui.Path getClip(ui.Size size) {
     final customRadius =
-        isCircle ? Radius.circular(area.height) : const Radius.circular(3.0);
+        isCircle ? Radius.circular(area.height) : Constants.defaultTargetRadius;
 
     final rect = Rect.fromLTRB(
       area.left - overlayPadding.left,
@@ -69,7 +70,7 @@ class RRectClipper extends CustomClipper<ui.Path> {
     for (final widgetRect in linkedObjectData) {
       final customRadius = widgetRect.isCircle
           ? Radius.circular(widgetRect.rect.height)
-          : const Radius.circular(3.0);
+          : Constants.defaultTargetRadius;
 
       final rect = Rect.fromLTRB(
         widgetRect.rect.left - widgetRect.overlayPadding.left,

lib/src/showcase/showcase.dart

@@ -25,6 +25,7 @@ import 'dart:async';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
+import '../constants.dart';
 import '../enum.dart';
 import '../get_position.dart';
 import '../models/linked_showcase_data.dart';
@@ -66,6 +67,11 @@ class Showcase extends StatefulWidget {
   final ShapeBorder targetShapeBorder;
 
   /// Radius of rectangle box while target widget is being showcased.
+  ///
+  /// Default value is:
+  /// ```dart
+  /// const Radius.circular(3.0),
+  /// ```
   final BorderRadius? targetBorderRadius;
 
   /// TextStyle for default tooltip title
@@ -425,7 +431,7 @@ class Showcase extends StatefulWidget {
         showcaseKey = key,
         assert(
           overlayOpacity >= 0.0 && overlayOpacity <= 1.0,
-          "overlay opacity must be between 0 and 1.",
+          'overlay opacity must be between 0 and 1.',
         ),
         assert(
           onTargetClick == null || disposeOnTap != null,
@@ -499,20 +505,14 @@ class Showcase extends StatefulWidget {
     required this.container,
     required this.child,
     this.floatingActionWidget,
-    this.targetShapeBorder = const RoundedRectangleBorder(
-      borderRadius: BorderRadius.all(
-        Radius.circular(8),
-      ),
-    ),
+    this.targetShapeBorder = Constants.defaultTargetShapeBorder,
     this.overlayColor = Colors.black45,
     this.targetBorderRadius,
     this.overlayOpacity = 0.75,
-    this.scrollLoadingWidget = const CircularProgressIndicator(
-      valueColor: AlwaysStoppedAnimation(Colors.white),
-    ),
+    this.scrollLoadingWidget = Constants.defaultProgressIndicator,
     this.onTargetClick,
     this.disposeOnTap,
-    this.movingAnimationDuration = const Duration(milliseconds: 2000),
+    this.movingAnimationDuration = Constants.defaultAnimationDuration,
     this.disableMovingAnimation,
     this.targetPadding = EdgeInsets.zero,
     this.blurValue,
@@ -532,7 +532,7 @@ class Showcase extends StatefulWidget {
         scaleAnimationDuration = const Duration(milliseconds: 300),
         scaleAnimationCurve = Curves.decelerate,
         scaleAnimationAlignment = null,
-        disableScaleAnimation = true,
+        disableScaleAnimation = null,
         title = null,
         description = null,
         titleTextAlign = TextAlign.start,
@@ -553,7 +553,7 @@ class Showcase extends StatefulWidget {
         showcaseKey = key,
         assert(
           overlayOpacity >= 0.0 && overlayOpacity <= 1.0,
-          "overlay opacity must be between 0 and 1.",
+          'overlay opacity must be between 0 and 1.',
         ),
         assert(
           onBarrierClick == null || disableBarrierInteraction == false,
@@ -573,10 +573,6 @@ class _ShowcaseState extends State<Showcase> {
   late final showCaseWidgetState = ShowCaseWidget.of(context);
   FloatingActionWidget? _globalFloatingActionWidget;
 
-  /// This variable will be true if some other showcase is linked with
-  /// this showcase and starts this widget showcase
-  // bool _isLinkedShowCaseStarted = false;
-
   bool get _isCircle => widget.targetShapeBorder is CircleBorder;
 
   BorderRadius? get _targetBorderRadius => widget.targetBorderRadius;
@@ -588,7 +584,7 @@ class _ShowcaseState extends State<Showcase> {
     super.initState();
     initRootWidget();
     final connectedShowcase =
-        showCaseWidgetState.showcaseController[widget.showcaseKey];
+        showCaseWidgetState.showcaseControllers[widget.showcaseKey];
     showcaseController = ShowcaseController(
       showcaseId: connectedShowcase?.length ?? 0,
       showcaseKey: widget.showcaseKey,
@@ -597,10 +593,10 @@ class _ShowcaseState extends State<Showcase> {
     )..startShowcase = startShowcase;
 
     if (connectedShowcase != null) {
-      showCaseWidgetState.showcaseController[widget.showcaseKey]
+      showCaseWidgetState.showcaseControllers[widget.showcaseKey]
           ?.add(showcaseController);
     } else {
-      showCaseWidgetState.showcaseController[widget.showcaseKey] = [
+      showCaseWidgetState.showcaseControllers[widget.showcaseKey] = [
         showcaseController,
       ];
     }
@@ -614,7 +610,7 @@ class _ShowcaseState extends State<Showcase> {
 
   @override
   void dispose() {
-    showCaseWidgetState.showcaseController[widget.showcaseKey]
+    showCaseWidgetState.showcaseControllers[widget.showcaseKey]
         ?.remove(showcaseController);
     super.dispose();
   }