Skip to content

Commit d3dfda8

Browse files
format: 🎨 Formatted project structure (#528)
1 parent 1f20db8 commit d3dfda8

16 files changed

+56
-123
lines changed

lib/showcaseview.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222

2323
library showcaseview;
2424

25-
export 'src/enum.dart';
2625
export 'src/models/action_button_icon.dart';
2726
export 'src/models/tooltip_action_button.dart';
2827
export 'src/models/tooltip_action_config.dart';
2928
export 'src/showcase/showcase.dart';
30-
export 'src/showcase_view.dart';
29+
export 'src/showcase/showcase_view.dart';
3130
export 'src/showcase_widget.dart';
32-
export 'src/tooltip_action_button_widget.dart';
31+
export 'src/utils/enum.dart';
3332
export 'src/widget/floating_action_widget.dart';
33+
export 'src/widget/tooltip_action_button_widget.dart';

lib/src/measure_size.dart

Lines changed: 0 additions & 65 deletions
This file was deleted.

lib/src/models/showcase_scope.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import 'package:flutter/widgets.dart';
2323

2424
import '../showcase/showcase_controller.dart';
25-
import '../showcase_view.dart';
25+
import '../showcase/showcase_view.dart';
2626

2727
class ShowcaseScope {
2828
ShowcaseScope({

lib/src/showcase/showcase.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222

2323
import 'package:flutter/material.dart';
2424

25-
import '../constants.dart';
26-
import '../enum.dart';
2725
import '../models/showcase_scope.dart';
2826
import '../models/tooltip_action_button.dart';
2927
import '../models/tooltip_action_config.dart';
30-
import '../overlay_manager.dart';
31-
import '../showcase_service.dart';
3228
import '../showcase_widget.dart';
29+
import '../utils/constants.dart';
30+
import '../utils/enum.dart';
31+
import '../utils/overlay_manager.dart';
3332
import '../widget/floating_action_widget.dart';
3433
import 'showcase_controller.dart';
34+
import 'showcase_service.dart';
3535

3636
class Showcase extends StatefulWidget {
3737
/// A key that is unique across the entire app.

lib/src/showcase/showcase_controller.dart

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ import 'dart:math';
2424
import 'package:flutter/foundation.dart';
2525
import 'package:flutter/widgets.dart';
2626

27-
import '../get_position.dart';
2827
import '../models/linked_showcase_data.dart';
2928
import '../models/tooltip_action_config.dart';
30-
import '../overlay_manager.dart';
31-
import '../showcase_service.dart';
32-
import '../showcase_view.dart';
3329
import '../tooltip/tooltip.dart';
34-
import '../tooltip_action_button_widget.dart';
30+
import '../utils/overlay_manager.dart';
31+
import '../utils/target_position_service.dart';
3532
import '../widget/floating_action_widget.dart';
33+
import '../widget/tooltip_action_button_widget.dart';
3634
import 'showcase.dart';
35+
import 'showcase_service.dart';
36+
import 'showcase_view.dart';
3737
import 'target_widget.dart';
3838

3939
/// Controller class for managing showcase functionality
@@ -76,7 +76,7 @@ class ShowcaseController {
7676
ShowcaseView showCaseView;
7777

7878
/// Position information for the showcase target
79-
GetPosition? position;
79+
TargetPositionService? position;
8080

8181
/// Data model for linked showcases
8282
LinkedShowcaseDataModel? linkedShowcaseDataModel;
@@ -172,7 +172,7 @@ class ShowcaseController {
172172
final renderBox = _context.findRenderObject() as RenderBox?;
173173
final screenSize = MediaQuery.of(_context).size;
174174
final size = rootWidgetSize ?? screenSize;
175-
final newPosition = GetPosition(
175+
final newPosition = TargetPositionService(
176176
rootRenderObject: rootRenderObject,
177177
renderBox: renderBox,
178178
padding: config.targetPadding,
@@ -297,7 +297,7 @@ class ShowcaseController {
297297
.getFloatingActionWidget(config.showcaseKey)
298298
?.call(_context);
299299
final size = rootWidgetSize ?? MediaQuery.of(_context).size;
300-
position ??= GetPosition(
300+
position ??= TargetPositionService(
301301
rootRenderObject: rootRenderObject,
302302
renderBox: _context.findRenderObject() as RenderBox?,
303303
padding: config.targetPadding,
@@ -437,6 +437,18 @@ class ShowcaseController {
437437
const TooltipActionConfig();
438438
}
439439

440+
/// Handles tap on barrier area
441+
///
442+
/// Respects [disableBarrierInteraction] settings from both global and local config
443+
void handleBarrierTap() {
444+
config.onBarrierClick?.call();
445+
if (showCaseView.disableBarrierInteraction ||
446+
config.disableBarrierInteraction) {
447+
return;
448+
}
449+
_nextIfAny();
450+
}
451+
440452
/// Retrieves the floating action widget if available
441453
///
442454
/// Combines local widget with global floating action widget.

lib/src/showcase_service.dart renamed to lib/src/showcase/showcase_service.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
*/
2222
import 'package:flutter/widgets.dart';
2323

24-
import 'constants.dart';
25-
import 'models/showcase_scope.dart';
26-
import 'showcase/showcase_controller.dart';
27-
import 'showcase_view.dart';
28-
import 'utils/extensions.dart';
24+
import '../../showcaseview.dart';
25+
import '../models/showcase_scope.dart';
26+
import '../utils/constants.dart';
27+
import '../utils/extensions.dart';
28+
import 'showcase_controller.dart';
2929

3030
/// A scoped service locator for showcase functionality
3131
///

lib/src/showcase_view.dart renamed to lib/src/showcase/showcase_view.dart

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,13 @@ import 'dart:async';
2323

2424
import 'package:flutter/material.dart';
2525

26-
import 'constants.dart';
27-
import 'models/tooltip_action_button.dart';
28-
import 'models/tooltip_action_config.dart';
29-
import 'overlay_manager.dart';
30-
import 'showcase/showcase.dart';
31-
import 'showcase/showcase_controller.dart';
26+
import '../models/tooltip_action_button.dart';
27+
import '../models/tooltip_action_config.dart';
28+
import '../showcase_widget.dart';
29+
import '../utils/constants.dart';
30+
import '../utils/overlay_manager.dart';
31+
import 'showcase_controller.dart';
3232
import 'showcase_service.dart';
33-
import 'showcase_widget.dart';
3433

3534
/// Callback type for showcase events that need index and key information
3635
typedef OnShowcaseCallback = void Function(int? showcaseIndex, GlobalKey key);
@@ -415,19 +414,6 @@ class ShowcaseView {
415414
});
416415
}
417416

418-
/// Handles tap on barrier area
419-
///
420-
/// * [config] - The showcase configuration for the current showcase
421-
///
422-
/// Respects [disableBarrierInteraction] settings from both global and local config
423-
void handleBarrierTap(Showcase config) {
424-
config.onBarrierClick?.call();
425-
if (disableBarrierInteraction || config.disableBarrierInteraction) {
426-
return;
427-
}
428-
next();
429-
}
430-
431417
/// Internal method to handle showcase start
432418
///
433419
/// Initializes controllers and sets up auto-play timer if enabled

lib/src/tooltip/render_object_manager.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
import 'package:flutter/rendering.dart';
2323

24-
import '../enum.dart';
24+
import '../utils/enum.dart';
2525

2626
class RenderObjectManager {
2727
RenderObjectManager({

lib/src/tooltip/tooltip.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter/rendering.dart';
33

4-
import '../constants.dart';
5-
import '../enum.dart';
64
import '../models/tooltip_action_config.dart';
75
import '../showcase/showcase_controller.dart';
6+
import '../utils/constants.dart';
7+
import '../utils/enum.dart';
88
import '../widget/action_widget.dart';
99
import '../widget/default_tooltip_text_widget.dart';
1010
import 'render_object_manager.dart';

lib/src/constants.dart renamed to lib/src/utils/constants.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
import 'package:flutter/material.dart';
2323

24-
import 'widget/showcase_circular_progress_indicator.dart';
24+
import '../widget/showcase_circular_progress_indicator.dart';
2525

2626
class Constants {
2727
Constants._();

lib/src/enum.dart renamed to lib/src/utils/enum.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import 'dart:math';
2424

2525
import 'package:flutter/widgets.dart';
2626

27-
import 'showcase_view.dart';
28-
import 'tooltip/render_object_manager.dart';
27+
import '../showcase/showcase_view.dart';
28+
import '../tooltip/render_object_manager.dart';
2929

3030
enum TooltipPosition {
3131
top(rotationAngle: pi, scaleAlignment: Alignment.topCenter),

lib/src/overlay_manager.dart renamed to lib/src/utils/overlay_manager.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ import 'dart:ui';
2424

2525
import 'package:flutter/material.dart';
2626

27-
import 'models/linked_showcase_data.dart';
27+
import '../models/linked_showcase_data.dart';
28+
import '../showcase/showcase_controller.dart';
29+
import '../showcase/showcase_service.dart';
30+
import '../showcase/showcase_view.dart';
31+
import 'extensions.dart';
2832
import 'shape_clipper.dart';
29-
import 'showcase/showcase_controller.dart';
30-
import 'showcase_service.dart';
31-
import 'showcase_view.dart';
32-
import 'utils/extensions.dart';
3333

3434
/// A singleton manager class responsible for displaying and controlling overlays
3535
/// in the ShowcaseView.
@@ -170,7 +170,7 @@ class OverlayManager {
170170
return Stack(
171171
children: [
172172
GestureDetector(
173-
onTap: () => showcaseView.handleBarrierTap(firstShowcaseConfig),
173+
onTap: () => firstController.handleBarrierTap(),
174174
child: ClipPath(
175175
clipper: RRectClipper(
176176
linkedObjectData: _getLinkedShowcasesData(controllers),

lib/src/shape_clipper.dart renamed to lib/src/utils/shape_clipper.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ import 'dart:ui' as ui;
2525
import 'package:flutter/foundation.dart';
2626
import 'package:flutter/material.dart';
2727

28+
import '../models/linked_showcase_data.dart';
2829
import 'constants.dart';
29-
import 'models/linked_showcase_data.dart';
3030

3131
class RRectClipper extends CustomClipper<ui.Path> {
3232
const RRectClipper({

lib/src/get_position.dart renamed to lib/src/utils/target_position_service.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import 'dart:math';
2424

2525
import 'package:flutter/material.dart';
2626

27-
class GetPosition {
28-
GetPosition({
27+
class TargetPositionService {
28+
TargetPositionService({
2929
required this.renderBox,
3030
required this.screenWidth,
3131
required this.screenHeight,

lib/src/widget/showcase_circular_progress_indicator.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import 'package:flutter/cupertino.dart' show CupertinoActivityIndicator;
2323
import 'package:flutter/material.dart';
2424

25-
import '../constants.dart';
25+
import '../utils/constants.dart';
2626

2727
class ShowcaseCircularProgressIndicator extends StatelessWidget {
2828
const ShowcaseCircularProgressIndicator({super.key});

lib/src/tooltip_action_button_widget.dart renamed to lib/src/widget/tooltip_action_button_widget.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
import 'package:flutter/material.dart';
2323

24-
import '../showcaseview.dart';
24+
import '../../showcaseview.dart';
2525

2626
class TooltipActionButtonWidget extends StatelessWidget {
2727
const TooltipActionButtonWidget({

0 commit comments

Comments
 (0)