diff --git a/lib/flutter_login_sdk.dart b/lib/flutter_login_sdk.dart index da8d7e9..3870576 100644 --- a/lib/flutter_login_sdk.dart +++ b/lib/flutter_login_sdk.dart @@ -1,19 +1,13 @@ -import 'dart:async'; -import 'package:flutter/material.dart'; -import 'flutter_login_view.dart'; import 'sdk/screen.dart'; import 'sdk/user.dart'; mixin FlutterLoginSdk { - static final DialogService _dialogService = DialogService(); static final UserService _userService = UserService(); static final ScreenService _screenService = ScreenService(); - DialogService get dialogs => _dialogService; UserService get users => _userService; ScreenService get screens => _screenService; - static DialogService get dialogService => _dialogService; static UserService get userService => _userService; static ScreenService get screenService => _screenService; @@ -21,30 +15,3 @@ mixin FlutterLoginSdk { _userService.dispose(); } } - -class DialogService { - Future showDialog({ - required BuildContext context, - required WidgetBuilder builder, - bool barrierDismissible = true, - Color? barrierColor = Colors.black54, - String? barrierLabel, - bool useSafeArea = false, - bool useRootNavigator = true, - RouteSettings? routeSettings, - }) => - showDialog( - context: context, - barrierDismissible: barrierDismissible, - barrierColor: barrierColor, - barrierLabel: barrierLabel, - useSafeArea: useSafeArea, - useRootNavigator: useRootNavigator, - builder: (ctx) => FlutterLogin.from( - appShell: FlutterLogin.of(context), - child: Builder( - builder: builder, - ), - ), - ); -} diff --git a/lib/flutter_login_view.dart b/lib/flutter_login_view.dart index f68c92a..0145641 100644 --- a/lib/flutter_login_view.dart +++ b/lib/flutter_login_view.dart @@ -1,6 +1,5 @@ import 'package:flutter/material.dart'; import 'package:flutter_login/backend/login_repository.dart'; -import './extensions/widget.dart'; import '../default_translation.dart'; import '../plugins/login/login_email_password.dart'; import 'flutter_login_sdk.dart'; @@ -101,7 +100,7 @@ extension AppShellTranslate on BuildContext { } } -class LoginMain extends StatelessWidget with NavigateWidgetMixin { +class LoginMain extends StatelessWidget { LoginMain({ required this.child, super.key, diff --git a/lib/login_config.dart b/lib/login_config.dart index f77e4e5..cf072df 100644 --- a/lib/login_config.dart +++ b/lib/login_config.dart @@ -336,8 +336,7 @@ class LoginConfig extends StatefulWidget { State createState() => LoginConfigState(); } -class LoginConfigState extends State - with WidgetsBindingObserver, NavigateWidgetMixin { +class LoginConfigState extends State with WidgetsBindingObserver { FlutterLogin? appShell; late final ConfigData configData; late LoginRepository repository; diff --git a/lib/plugins/login/login_phone_number_verify.dart b/lib/plugins/login/login_phone_number_verify.dart index c8b356a..ede43e1 100644 --- a/lib/plugins/login/login_phone_number_verify.dart +++ b/lib/plugins/login/login_phone_number_verify.dart @@ -2,8 +2,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_login/flutter_login_view.dart'; import 'package:pinput/pinput.dart'; import '../../extensions/widget.dart'; -import '../../model/login_confirmation_result.dart'; -import '../../model/login_user.dart'; class LoginPhoneNumberVerify extends StatefulWidget { const LoginPhoneNumberVerify({ diff --git a/lib/sdk/screen.dart b/lib/sdk/screen.dart index 2847b3a..6f4af9c 100644 --- a/lib/sdk/screen.dart +++ b/lib/sdk/screen.dart @@ -1,9 +1,7 @@ import 'package:flutter/material.dart'; -import '../extensions/widget.dart'; import '../flutter_login_view.dart'; -import '../plugins/login/choose_login.dart'; -class ScreenService with NavigateWidgetMixin { +class ScreenService { late bool shouldShowIntroductionScreen; late bool shouldShowPolicyPage; @@ -39,26 +37,4 @@ class ScreenService with NavigateWidgetMixin { return child; } } - - void openLoginScreen(BuildContext context) => navigateFadeTo( - context, - (ctx) => (FlutterLogin.of(context) - .config - .loginOptions - .loginMethod - .contains(LoginMethod.LoginInteractiveWithSocial) || - FlutterLogin.of(context) - .config - .loginOptions - .loginMethod - .contains(LoginMethod.LoginInteractiveWithPhoneNumber)) - ? ChooseLogin( - allowExit: true, - child: context.login().app, - ) - : EmailPasswordLogin( - allowExit: true, - child: context.login().app, - ), - ); }