diff --git a/packages/deriv_auth/example/lib/core/example_auth_error_state_handler.dart b/packages/deriv_auth/example/lib/core/example_auth_error_state_handler.dart index 478000d8e..78374d67e 100644 --- a/packages/deriv_auth/example/lib/core/example_auth_error_state_handler.dart +++ b/packages/deriv_auth/example/lib/core/example_auth_error_state_handler.dart @@ -1,5 +1,4 @@ import 'package:deriv_auth/deriv_auth.dart'; -import 'package:deriv_auth_ui/deriv_auth_ui.dart'; import 'package:flutter/material.dart'; final class ExampleAuthErrorStateHandler extends AuthErrorStateHandler { diff --git a/packages/deriv_auth/example/lib/features/get_started/pages/get_started_page.dart b/packages/deriv_auth/example/lib/features/get_started/pages/get_started_page.dart index a89b5e67f..5c45466c4 100644 --- a/packages/deriv_auth/example/lib/features/get_started/pages/get_started_page.dart +++ b/packages/deriv_auth/example/lib/features/get_started/pages/get_started_page.dart @@ -1,4 +1,6 @@ -import 'package:deriv_auth_ui/deriv_auth_ui.dart'; + +import 'package:deriv_auth/features/get_started/models/deriv_get_started_slide_model.dart'; +import 'package:deriv_auth/features/get_started/presentation/layouts/deriv_get_started_layout.dart'; import 'package:example/features/login/pages/login_page.dart'; import 'package:example/features/signup/pages/signup_page.dart'; import 'package:flutter/material.dart'; diff --git a/packages/deriv_auth/example/lib/features/login/pages/login_page.dart b/packages/deriv_auth/example/lib/features/login/pages/login_page.dart index 2c6ad3518..e0a3a8279 100644 --- a/packages/deriv_auth/example/lib/features/login/pages/login_page.dart +++ b/packages/deriv_auth/example/lib/features/login/pages/login_page.dart @@ -1,5 +1,5 @@ import 'package:deriv_auth/features/auth/cubit/deriv_auth_cubit.dart'; -import 'package:deriv_auth_ui/deriv_auth_ui.dart'; +import 'package:deriv_auth/features/login/presentation/layouts/deriv_login_layout.dart'; import 'package:example/core/example_auth_error_state_handler.dart'; import 'package:example/features/home/pages/home_page.dart'; import 'package:example/features/reset_pass/pages/reset_pass_page.dart'; @@ -27,7 +27,7 @@ class _LoginPageState extends State { welcomeLabel: 'Welcome back!', greetingLabel: 'Log in to your Deriv account to start trading and investing.', - onLoggedIn: (_) => Navigator.pushReplacement( + onLoggedIn: (_, __) => Navigator.pushReplacement( context, MaterialPageRoute( builder: (context) => const HomePage(), @@ -48,6 +48,9 @@ class _LoginPageState extends State { ), ), onSocialAuthButtonPressed: (_) {}, + socialAuthStateHandler: (SocialAuthState) {}, + redirectURL: '', + onWebViewError: (String) {}, ); } } diff --git a/packages/deriv_auth/example/lib/features/reset_pass/pages/choose_new_password_page.dart b/packages/deriv_auth/example/lib/features/reset_pass/pages/choose_new_password_page.dart index 49dbbd6c9..f1dc5ce0f 100644 --- a/packages/deriv_auth/example/lib/features/reset_pass/pages/choose_new_password_page.dart +++ b/packages/deriv_auth/example/lib/features/reset_pass/pages/choose_new_password_page.dart @@ -1,5 +1,5 @@ import 'package:deriv_auth/features/reset_password/cubit/reset_password_cubit.dart'; -import 'package:deriv_auth_ui/deriv_auth_ui.dart'; +import 'package:deriv_auth/features/reset_password/presentation/layouts/deriv_choose_new_pass_layout.dart'; import 'package:example/features/reset_pass/pages/reset_pass_success_page.dart'; import 'package:flutter/material.dart'; @@ -19,7 +19,7 @@ class ChooseNewPasswordPage extends StatelessWidget { ), ); }, - onResetPassError: (_) {}, + onResetPassError: ({String? error, required bool isLinkExpired}) {}, ); } } diff --git a/packages/deriv_auth/example/lib/features/reset_pass/pages/reset_pass_success_page.dart b/packages/deriv_auth/example/lib/features/reset_pass/pages/reset_pass_success_page.dart index a0de6729d..bc0de7ed1 100644 --- a/packages/deriv_auth/example/lib/features/reset_pass/pages/reset_pass_success_page.dart +++ b/packages/deriv_auth/example/lib/features/reset_pass/pages/reset_pass_success_page.dart @@ -1,5 +1,4 @@ import 'package:deriv_auth/deriv_auth.dart'; -import 'package:deriv_auth_ui/deriv_auth_ui.dart'; import 'package:example/features/get_started/pages/get_started_page.dart'; import 'package:example/features/login/pages/login_page.dart'; import 'package:flutter/material.dart'; diff --git a/packages/deriv_auth/example/lib/features/signup/pages/set_password_page.dart b/packages/deriv_auth/example/lib/features/signup/pages/set_password_page.dart index 32b6b7cfa..7d6e5d311 100644 --- a/packages/deriv_auth/example/lib/features/signup/pages/set_password_page.dart +++ b/packages/deriv_auth/example/lib/features/signup/pages/set_password_page.dart @@ -1,5 +1,4 @@ import 'package:deriv_auth/deriv_auth.dart'; -import 'package:deriv_auth_ui/deriv_auth_ui.dart'; import 'package:example/core/example_auth_error_state_handler.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; diff --git a/packages/deriv_auth/example/lib/features/signup/pages/signup_page.dart b/packages/deriv_auth/example/lib/features/signup/pages/signup_page.dart index c275b0dc7..80f4f1443 100644 --- a/packages/deriv_auth/example/lib/features/signup/pages/signup_page.dart +++ b/packages/deriv_auth/example/lib/features/signup/pages/signup_page.dart @@ -1,4 +1,4 @@ -import 'package:deriv_auth_ui/deriv_auth_ui.dart'; +import 'package:deriv_auth/features/signup/presentation/layouts/deriv_signup_layout.dart'; import 'package:example/core/example_auth_error_state_handler.dart'; import 'package:example/features/login/pages/login_page.dart'; import 'package:example/features/signup/pages/verify_email_page.dart'; @@ -35,5 +35,8 @@ class _SignupPageState extends State { builder: (context) => const LoginPage(), ), ), + socialAuthStateHandler: (SocialAuthState) {}, + redirectURL: '', + onWebViewError: (String) {}, ); } diff --git a/packages/deriv_auth/example/pubspec.yaml b/packages/deriv_auth/example/pubspec.yaml index 44b8282a0..4235fdabb 100644 --- a/packages/deriv_auth/example/pubspec.yaml +++ b/packages/deriv_auth/example/pubspec.yaml @@ -12,10 +12,15 @@ dependencies: flutter: sdk: flutter cupertino_icons: ^1.0.2 - deriv_auth_ui: - path: ../ + deriv_auth: + git: + url: git@github.com:regentmarkets/flutter-deriv-packages.git + path: packages/deriv_auth + ref: deriv_auth-v6.4.0 + flutter_bloc: ^8.1.3 http: ^0.13.6 + device_preview: ^1.1.0 dev_dependencies: flutter_test: