From dbdf19ee8df3e0e51af0195fc82f426e580d16fc Mon Sep 17 00:00:00 2001 From: vishnukvmd Date: Mon, 21 Jul 2025 15:09:01 +0530 Subject: [PATCH] Update common lockscreen --- mobile/packages/lock_screen/lib/auth_util.dart | 2 ++ .../lock_screen/lib/local_authentication_service.dart | 5 +++++ mobile/packages/lock_screen/lib/ui/app_lock.dart | 1 + mobile/packages/lock_screen/lib/ui/lock_screen.dart | 3 +++ .../packages/lock_screen/lib/ui/lock_screen_auto_lock.dart | 1 + .../lock_screen/lib/ui/lock_screen_confirm_password.dart | 1 + .../lock_screen/lib/ui/lock_screen_confirm_pin.dart | 2 ++ mobile/packages/lock_screen/lib/ui/lock_screen_options.dart | 6 ++++++ .../packages/lock_screen/lib/ui/lock_screen_password.dart | 3 +++ mobile/packages/lock_screen/lib/ui/lock_screen_pin.dart | 4 ++++ 10 files changed, 28 insertions(+) diff --git a/mobile/packages/lock_screen/lib/auth_util.dart b/mobile/packages/lock_screen/lib/auth_util.dart index f4071b0712..f529d507de 100644 --- a/mobile/packages/lock_screen/lib/auth_util.dart +++ b/mobile/packages/lock_screen/lib/auth_util.dart @@ -8,6 +8,8 @@ import 'package:flutter_local_authentication/flutter_local_authentication.dart'; import 'package:local_auth/local_auth.dart'; import 'package:local_auth_android/local_auth_android.dart'; import 'package:local_auth_darwin/types/auth_messages_ios.dart'; +import 'package:ente_lock_screen/local_authentication_service.dart'; +import 'package:ente_lock_screen/lock_screen_settings.dart'; import 'package:logging/logging.dart'; Future requestAuthentication( diff --git a/mobile/packages/lock_screen/lib/local_authentication_service.dart b/mobile/packages/lock_screen/lib/local_authentication_service.dart index eb1a65cf05..cb376120c9 100644 --- a/mobile/packages/lock_screen/lib/local_authentication_service.dart +++ b/mobile/packages/lock_screen/lib/local_authentication_service.dart @@ -12,6 +12,11 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_local_authentication/flutter_local_authentication.dart'; import 'package:local_auth/local_auth.dart'; +import 'package:ente_lock_screen/auth_util.dart'; +import 'package:ente_lock_screen/lock_screen_settings.dart'; +import 'package:ente_lock_screen/ui/app_lock.dart'; +import 'package:ente_lock_screen/ui/lock_screen_password.dart'; +import 'package:ente_lock_screen/ui/lock_screen_pin.dart'; import 'package:logging/logging.dart'; class LocalAuthenticationService { diff --git a/mobile/packages/lock_screen/lib/ui/app_lock.dart b/mobile/packages/lock_screen/lib/ui/app_lock.dart index 9098737b7f..2cf3daa915 100644 --- a/mobile/packages/lock_screen/lib/ui/app_lock.dart +++ b/mobile/packages/lock_screen/lib/ui/app_lock.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'package:ente_lock_screen/lock_screen_settings.dart'; import 'package:flutter/material.dart'; +import 'package:ente_lock_screen/lock_screen_settings.dart'; /// A widget which handles app lifecycle events for showing and hiding a lock screen. /// This should wrap around a `MyApp` widget (or equivalent). diff --git a/mobile/packages/lock_screen/lib/ui/lock_screen.dart b/mobile/packages/lock_screen/lib/ui/lock_screen.dart index 270d201eba..3d0d4f0847 100644 --- a/mobile/packages/lock_screen/lib/ui/lock_screen.dart +++ b/mobile/packages/lock_screen/lib/ui/lock_screen.dart @@ -12,6 +12,9 @@ import 'package:ente_ui/utils/dialog_util.dart'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter_animate/flutter_animate.dart'; +import 'package:ente_lock_screen/auth_util.dart'; +import 'package:ente_lock_screen/lock_screen_settings.dart'; +import 'package:ente_lock_screen/ui/app_lock.dart'; import 'package:logging/logging.dart'; class LockScreen extends StatefulWidget { diff --git a/mobile/packages/lock_screen/lib/ui/lock_screen_auto_lock.dart b/mobile/packages/lock_screen/lib/ui/lock_screen_auto_lock.dart index 16b5f45ffe..c584193c47 100644 --- a/mobile/packages/lock_screen/lib/ui/lock_screen_auto_lock.dart +++ b/mobile/packages/lock_screen/lib/ui/lock_screen_auto_lock.dart @@ -8,6 +8,7 @@ import 'package:ente_ui/components/title_bar_title_widget.dart'; import 'package:ente_ui/components/title_bar_widget.dart'; import 'package:ente_ui/theme/ente_theme.dart'; import 'package:flutter/material.dart'; +import 'package:ente_lock_screen/lock_screen_settings.dart'; class LockScreenAutoLock extends StatefulWidget { const LockScreenAutoLock({super.key}); diff --git a/mobile/packages/lock_screen/lib/ui/lock_screen_confirm_password.dart b/mobile/packages/lock_screen/lib/ui/lock_screen_confirm_password.dart index eb9e8d6824..1fc07b8462 100644 --- a/mobile/packages/lock_screen/lib/ui/lock_screen_confirm_password.dart +++ b/mobile/packages/lock_screen/lib/ui/lock_screen_confirm_password.dart @@ -6,6 +6,7 @@ import "package:ente_ui/components/text_input_widget.dart"; import "package:ente_ui/theme/ente_theme.dart"; import "package:flutter/material.dart"; import "package:flutter/services.dart"; +import "package:ente_lock_screen/lock_screen_settings.dart"; class LockScreenConfirmPassword extends StatefulWidget { const LockScreenConfirmPassword({ diff --git a/mobile/packages/lock_screen/lib/ui/lock_screen_confirm_pin.dart b/mobile/packages/lock_screen/lib/ui/lock_screen_confirm_pin.dart index ecb4418968..efa73b4b13 100644 --- a/mobile/packages/lock_screen/lib/ui/lock_screen_confirm_pin.dart +++ b/mobile/packages/lock_screen/lib/ui/lock_screen_confirm_pin.dart @@ -6,6 +6,8 @@ import "package:ente_strings/ente_strings.dart"; import "package:ente_ui/theme/ente_theme.dart"; import "package:flutter/material.dart"; import "package:flutter/services.dart"; +import "package:ente_lock_screen/lock_screen_settings.dart"; +import "package:ente_lock_screen/ui/custom_pin_keypad.dart"; import "package:pinput/pinput.dart"; class LockScreenConfirmPin extends StatefulWidget { diff --git a/mobile/packages/lock_screen/lib/ui/lock_screen_options.dart b/mobile/packages/lock_screen/lib/ui/lock_screen_options.dart index 176172af95..fb811f0e18 100644 --- a/mobile/packages/lock_screen/lib/ui/lock_screen_options.dart +++ b/mobile/packages/lock_screen/lib/ui/lock_screen_options.dart @@ -20,6 +20,12 @@ import "package:ente_ui/components/toggle_switch_widget.dart"; import "package:ente_ui/theme/ente_theme.dart"; import "package:ente_utils/platform_util.dart"; import "package:flutter/material.dart"; +import "package:ente_lock_screen/local_authentication_service.dart"; +import "package:ente_lock_screen/lock_screen_settings.dart"; +import "package:ente_lock_screen/ui/app_lock.dart"; +import "package:ente_lock_screen/ui/lock_screen_auto_lock.dart"; +import "package:ente_lock_screen/ui/lock_screen_password.dart"; +import "package:ente_lock_screen/ui/lock_screen_pin.dart"; class LockScreenOptions extends StatefulWidget { const LockScreenOptions({super.key}); diff --git a/mobile/packages/lock_screen/lib/ui/lock_screen_password.dart b/mobile/packages/lock_screen/lib/ui/lock_screen_password.dart index eb5f2b94ed..f3d857f494 100644 --- a/mobile/packages/lock_screen/lib/ui/lock_screen_password.dart +++ b/mobile/packages/lock_screen/lib/ui/lock_screen_password.dart @@ -11,6 +11,9 @@ import "package:ente_ui/components/text_input_widget.dart"; import "package:ente_ui/theme/ente_theme.dart"; import "package:flutter/material.dart"; import "package:flutter/services.dart"; +import "package:ente_lock_screen/lock_screen_settings.dart"; +import "package:ente_lock_screen/ui/lock_screen_confirm_password.dart"; +import "package:ente_lock_screen/ui/lock_screen_options.dart"; /// [isChangingLockScreenSettings] Authentication required for changing lock screen settings. /// Set to true when the app requires the user to authenticate before allowing diff --git a/mobile/packages/lock_screen/lib/ui/lock_screen_pin.dart b/mobile/packages/lock_screen/lib/ui/lock_screen_pin.dart index 603ebdd67d..5eedad5ab6 100644 --- a/mobile/packages/lock_screen/lib/ui/lock_screen_pin.dart +++ b/mobile/packages/lock_screen/lib/ui/lock_screen_pin.dart @@ -12,6 +12,10 @@ import "package:ente_ui/theme/ente_theme.dart"; import "package:ente_ui/theme/text_style.dart"; import "package:flutter/material.dart"; import "package:flutter/services.dart"; +import "package:ente_lock_screen/lock_screen_settings.dart"; +import "package:ente_lock_screen/ui/custom_pin_keypad.dart"; +import "package:ente_lock_screen/ui/lock_screen_confirm_pin.dart"; +import "package:ente_lock_screen/ui/lock_screen_options.dart"; import 'package:pinput/pinput.dart'; /// [isChangingLockScreenSettings] Authentication required for changing lock screen settings.