Merge pull request #9 from coccyx-cyst/dialog-type-refactor

Improved overlay manipulating with entries
feduke-nukem · Nov 4, 2022 · f29417c · f29417c
2 parents 660ca77 + 03c82bb
commit f29417c
Show file tree

Hide file tree

Showing 12 changed files with 115 additions and 166 deletions.
diff --git a/lib/src/core/agents/fullscreen_dialog_agent/fullscreen_dialog_agent.dart b/lib/src/core/agents/fullscreen_dialog_agent/fullscreen_dialog_agent.dart
@@ -1,12 +1,9 @@
 import 'package:back_button_interceptor/back_button_interceptor.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_easy_dialogs/flutter_easy_dialogs.dart';
-import 'package:flutter_easy_dialogs/src/core/agents/dialog_agent_base.dart';
 import 'package:flutter_easy_dialogs/src/core/agents/fullscreen_dialog_agent/fullscreen_dialog_hide_params.dart';
 import 'package:flutter_easy_dialogs/src/core/agents/fullscreen_dialog_agent/fullscreen_dialog_show_params.dart';
 
-const _position = EasyDialogPosition.center;
-
 class FullScreenDialogAgent extends EasyDialogAgentBase {
   FullScreenDialogAgent({
     required super.overlayController,
@@ -38,11 +35,7 @@ class FullScreenDialogAgent extends EasyDialogAgentBase {
 
     final dialog = _createDialog(params);
 
-    super.overlayController.insertDialog(
-          child: dialog,
-          position: _position,
-          type: super.dialogFactory.dialogType,
-        );
+    super.overlayController.insertFullScreenDialog(dialog: dialog);
 
     await _animationController!.forward();
   }
@@ -76,10 +69,7 @@ class FullScreenDialogAgent extends EasyDialogAgentBase {
     _animationController!.dispose();
     _animationController = null;
 
-    super.overlayController.removeDialogByTypeAndPosition(
-          type: super.dialogFactory.dialogType,
-          position: _position,
-        );
+    super.overlayController.removeFullScreenDialog();
 
     BackButtonInterceptor.remove(_backButtonInterceptor);
   }

diff --git a/lib/src/core/agents/positioned_dialog_agent.dart/positioned_dialog_agent.dart b/lib/src/core/agents/positioned_dialog_agent.dart/positioned_dialog_agent.dart
@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_easy_dialogs/flutter_easy_dialogs.dart';
-import 'package:flutter_easy_dialogs/src/core/agents/dialog_agent_base.dart';
 import 'package:flutter_easy_dialogs/src/core/agents/positioned_dialog_agent.dart/positioned_dialog_hide_params.dart';
 
 import 'positioned_dialog_show_params.dart';
@@ -66,10 +65,9 @@ class PositionedDialogAgent extends EasyDialogAgentBase {
       animationController: newAnimationController,
     );
 
-    super.overlayController.insertDialog(
-          child: dialog,
+    super.overlayController.insertPositionedDialog(
+          dialog: dialog,
           position: params.position,
-          type: super.dialogFactory.dialogType,
         );
 
     _addAnimationControllerOfPosition(
@@ -145,8 +143,7 @@ class PositionedDialogAgent extends EasyDialogAgentBase {
     await animationController.reverse();
     animationController.dispose();
 
-    super.overlayController.removeDialogByTypeAndPosition(
-          type: super.dialogFactory.dialogType,
+    super.overlayController.removePositionedDialog(
           position: position,
         );
 

diff --git a/lib/src/core/agents/positioned_dialog_agent.dart/positioned_dialog_show_params.dart b/lib/src/core/agents/positioned_dialog_agent.dart/positioned_dialog_show_params.dart
@@ -1,6 +1,5 @@
 import 'package:flutter_easy_dialogs/flutter_easy_dialogs.dart';
 import 'package:flutter_easy_dialogs/src/core/agents/compose_interfaces.dart';
-import 'package:flutter_easy_dialogs/src/core/agents/dialog_agent_base.dart';
 
 class PositionedDialogShowParams extends AgentShowParams
     implements

diff --git a/lib/src/core/dialogs/dialogs.dart b/lib/src/core/dialogs/dialogs.dart
@@ -1,4 +1,3 @@
 export 'easy_dialog_position.dart';
-export 'easy_dialog_type.dart';
 export 'factory/i_easy_dialog_factory.dart';
 export 'pre_built/pre_built.dart';
diff --git a/lib/src/core/dialogs/easy_dialog_type.dart b/lib/src/core/dialogs/easy_dialog_type.dart
diff --git a/lib/src/core/dialogs/factory/easy_banner_factory.dart b/lib/src/core/dialogs/factory/easy_banner_factory.dart
@@ -5,9 +5,6 @@ import 'package:flutter_easy_dialogs/src/core/dialogs/pre_built/easy_banner/easy
 import 'package:flutter_easy_dialogs/src/core/dismissibles/factory/i_easy_dismissible_factory.dart';
 
 class EasyBannerFactory implements IEasyDialogFactory {
-  @override
-  final dialogType = EasyDialogType.banner;
-
   final IEasyAnimationFactory _animationFactory;
   final IEasyDismissibleFactory _dismissibleFactory;
 

diff --git a/lib/src/core/dialogs/factory/easy_modal_banner_factory.dart b/lib/src/core/dialogs/factory/easy_modal_banner_factory.dart
@@ -44,7 +44,4 @@ class EasyModalBannerFactory extends IEasyDialogFactory {
           : params.onDismissed!,
     );
   }
-
-  @override
-  final EasyDialogType dialogType = EasyDialogType.banner;
 }
diff --git a/lib/src/core/dialogs/factory/i_easy_dialog_factory.dart b/lib/src/core/dialogs/factory/i_easy_dialog_factory.dart
@@ -1,12 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_easy_dialogs/src/core/agents/dialog_agent_base.dart';
 import 'package:flutter_easy_dialogs/src/core/animations/easy_animation.dart';
-import 'package:flutter_easy_dialogs/src/core/dialogs/easy_dialog_type.dart';
 import 'package:flutter_easy_dialogs/src/core/dismissibles/easy_dismissible.dart';
 
 abstract class IEasyDialogFactory {
-  EasyDialogType get dialogType;
-
   Widget createDialog({
     required covariant AgentShowParams params,
   });

diff --git a/lib/src/core/flutter_easy_dialogs/flutter_easy_dialogs.dart b/lib/src/core/flutter_easy_dialogs/flutter_easy_dialogs.dart
@@ -55,7 +55,7 @@ class FlutterEasyDialogs extends StatelessWidget {
         child: EasyOverlay(
           customAgentBuilder: customAgentBuilder,
           initialEntries: [
-            EasyOverlayEntry.app(
+            EasyOverlayAppEntry(
               builder: (context) => child,
             ),
           ],

diff --git a/lib/src/core/overlay/easy_orverlay_entry_properties.dart b/lib/src/core/overlay/easy_orverlay_entry_properties.dart