Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
15727dc
[mob][auth] Pin shared packages to main SHA for locker refactoring
AmanRajSinghMourya Dec 21, 2025
849273d
refactor: Remove unused LoginPage and update UI components for better…
AmanRajSinghMourya Dec 21, 2025
69037e8
refactor: Update OTT verification page to use Pinput for code entry a…
AmanRajSinghMourya Dec 21, 2025
e1a6bf2
refactor: Simplify PasswordReentryPage UI and enhance theme integration
AmanRajSinghMourya Dec 21, 2025
8c97933
refactor: Enhance RecoveryPage UI with improved theming and layout ad…
AmanRajSinghMourya Dec 22, 2025
fd853d1
refactor: Improve UI consistency and theming in password verification…
AmanRajSinghMourya Dec 22, 2025
4505fb9
refactor: Update OnboardingPage to enhance sign-up navigation and UI …
AmanRajSinghMourya Dec 22, 2025
77c8fde
refactor: Enhance EmailEntryPage and TwoFactorAuthenticationPage UI w…
AmanRajSinghMourya Dec 22, 2025
f98c385
refactor: Enhance TwoFactorRecoveryPage UI with improved theming and …
AmanRajSinghMourya Dec 22, 2025
bb8d9f5
minor changes
AmanRajSinghMourya Dec 22, 2025
470d111
refactor: Update RecoveryKeyPage UI with improved layout and theming …
AmanRajSinghMourya Dec 22, 2025
4aefeb3
Minor UI fixes
AmanRajSinghMourya Dec 22, 2025
266bc0e
refactor: Simplify UI code in EmailEntryPage for improved readability…
AmanRajSinghMourya Dec 22, 2025
be61383
refactor: Enhance UI in multiple pages with improved layouts and Dots…
AmanRajSinghMourya Dec 22, 2025
78cd3d9
minor fix
AmanRajSinghMourya Dec 22, 2025
1789355
refactor: Update RecoveryPage to allow more lines in recovery key inp…
AmanRajSinghMourya Dec 22, 2025
7fd55bd
refactor: Enhance password verification page with contextual prompt f…
AmanRajSinghMourya Dec 23, 2025
b589a2c
minor change
AmanRajSinghMourya Dec 23, 2025
32360a4
Merge branch 'main' into login
AmanRajSinghMourya Dec 23, 2025
d72cf05
refactor: remove unused alert bottom sheet and button components from…
AmanRajSinghMourya Dec 23, 2025
c3e3274
refactor: replace error dialogs with alert bottom sheets
AmanRajSinghMourya Dec 23, 2025
5347443
refactor: replace error dialogs with alert bottom sheets in recovery …
AmanRajSinghMourya Dec 23, 2025
ae84e84
Extract strings
AmanRajSinghMourya Dec 23, 2025
d255f57
refactor: improve lifecycle management and error handling in user ser…
AmanRajSinghMourya Dec 23, 2025
54ead69
Minor changes
AmanRajSinghMourya Dec 23, 2025
2305e13
refactor: update padding and improve layout in two factor recovery page
AmanRajSinghMourya Dec 23, 2025
9fe38ff
feat: add dots_indicator package with version 3.1.0 to pubspec.lock f…
AmanRajSinghMourya Dec 23, 2025
fcddccd
refactor: replace showErrorDialog with showAlertBottomSheet for impro…
AmanRajSinghMourya Dec 23, 2025
62e1ef0
minor changes
AmanRajSinghMourya Dec 23, 2025
959d8ed
refactor: replace showAlertBottomSheet with _showContactSupportDialog
AmanRajSinghMourya Dec 23, 2025
47df15e
refactor: replace shareDialog with showShareSheet for improved sharin…
AmanRajSinghMourya Dec 26, 2025
0206623
refactor: update UI components for Passkey and Two-Factor Recovery pa…
AmanRajSinghMourya Dec 26, 2025
6a24eab
refactor: replace showErrorDialog with showAlertBottomSheet for impro…
AmanRajSinghMourya Dec 26, 2025
f63d756
refactor: remove ChangeEmailDialogLocker and integrate ChangeEmailDia…
AmanRajSinghMourya Dec 26, 2025
a31bdf9
refactor: replace showChoiceActionSheet with showAlertBottomSheet for…
AmanRajSinghMourya Dec 26, 2025
2ccd263
refactor: update logout confirmation logic to prevent accidental sign…
AmanRajSinghMourya Dec 27, 2025
3cc4f85
minor fix
AmanRajSinghMourya Dec 27, 2025
1fcfe56
show change password option in settings
AmanRajSinghMourya Dec 27, 2025
ef7a047
Merge branch 'main' into login
AmanRajSinghMourya Dec 29, 2025
7da2a94
chore: update SDWebImage to version 5.21.5 and remove unused script p…
AmanRajSinghMourya Dec 29, 2025
d73808b
refactor: enhance alert bottom sheet to support dismissible and close…
AmanRajSinghMourya Dec 30, 2025
c31f435
refactor: remove redundant 401 handling from trash service
AmanRajSinghMourya Jan 6, 2026
8dc78b7
refactor: update package paths to use git source and remove pubspec_o…
AmanRajSinghMourya Jan 7, 2026
2738161
Unpin auth packages
AmanRajSinghMourya Jan 7, 2026
436d81b
Add new assets
AmanRajSinghMourya Jan 7, 2026
ddcfa7a
rename auth logo and fix naming
AmanRajSinghMourya Jan 7, 2026
a36ba20
minor fix
AmanRajSinghMourya Jan 7, 2026
9efc335
feat: replace locker logo with SVG app logo across multiple pages
AmanRajSinghMourya Jan 7, 2026
51a0d5c
added more icons
AmanRajSinghMourya Jan 7, 2026
67f0b8f
chore: remove unused locker logo and pin assets
AmanRajSinghMourya Jan 7, 2026
e6e1606
refactor: remove LockScreenConfig usage and update UI components to u…
AmanRajSinghMourya Jan 7, 2026
851f836
feat: add flutter_svg dependency to accounts and lock_screen packages
AmanRajSinghMourya Jan 7, 2026
16aad0c
minor fix
AmanRajSinghMourya Jan 7, 2026
d0fdd44
chore: update version to 4.4.16+672 in pubspec.yaml
AmanRajSinghMourya Jan 8, 2026
a0bb1d0
[mob][packages] Refractor packages/account for auth (#8644)
AmanRajSinghMourya Jan 8, 2026
1a4eda5
refactor: remove fixed height from app-logo SVG assets
AmanRajSinghMourya Jan 8, 2026
bf73509
feat: add SVG assets directory to flutter assets
AmanRajSinghMourya Jan 8, 2026
c266e80
feat: enhance logout functionality with null check and close button
AmanRajSinghMourya Jan 8, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added mobile/apps/auth/assets/2.0x/lock_screen_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mobile/apps/auth/assets/2.0x/upload_file.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mobile/apps/auth/assets/2.0x/warning-grey.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mobile/apps/auth/assets/3.0x/lock_screen_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mobile/apps/auth/assets/3.0x/upload_file.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mobile/apps/auth/assets/3.0x/warning-grey.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mobile/apps/auth/assets/lock_screen_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mobile/apps/auth/assets/upload_file.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added mobile/apps/auth/assets/warning-grey.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 0 additions & 7 deletions mobile/apps/auth/lib/ente_theme_data.dart
Original file line number Diff line number Diff line change
Expand Up @@ -165,13 +165,6 @@ final darkThemeData = ThemeData(
),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
),
inputDecorationTheme: const InputDecorationTheme().copyWith(
focusedBorder: const UnderlineInputBorder(
borderSide: BorderSide(
color: Color.fromARGB(255, 152, 77, 244),
),
),
),
checkboxTheme: CheckboxThemeData(
side: const BorderSide(
color: Colors.grey,
Expand Down
2 changes: 1 addition & 1 deletion mobile/apps/auth/lib/onboarding/view/onboarding_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class _OnboardingPageState extends State<OnboardingPage> {
backgroundColor: accentColor,
appBar: AppBar(
leading: const SizedBox(),
title: SvgPicture.asset("assets/svg/auth-logo.svg"),
title: SvgPicture.asset("assets/svg/app-logo.svg"),
backgroundColor: accentColor,
elevation: 0,
scrolledUnderElevation: 0,
Expand Down
2 changes: 1 addition & 1 deletion mobile/apps/auth/lib/ui/components/auth_qr_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ class _AuthQrDialogState extends State<AuthQrDialog> {
Align(
alignment: Alignment.centerRight,
child: SvgPicture.asset(
'assets/svg/auth-logo.svg',
'assets/svg/app-logo.svg',
height: 16,
colorFilter: const ColorFilter.mode(
accentColor,
Expand Down
2 changes: 1 addition & 1 deletion mobile/apps/auth/lib/ui/home/widgets/auth_logo_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class AuthLogoWidget extends StatelessWidget {
final logoColor = color ?? colorScheme.textBase;

return SvgPicture.asset(
'assets/svg/auth-logo.svg',
'assets/svg/app-logo.svg',
height: height,
colorFilter: ColorFilter.mode(logoColor, BlendMode.srcIn),
);
Expand Down
2 changes: 1 addition & 1 deletion mobile/apps/auth/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: ente_auth
description: ente two-factor authenticator
version: 4.4.16+600
version: 4.4.16+672
publish_to: none

environment:
Expand Down
2 changes: 1 addition & 1 deletion mobile/apps/auth/pubspec_overrides.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# melos_managed_dependency_overrides: ente_accounts,ente_base,ente_configuration,ente_events,ente_lock_screen,ente_logging,ente_network,ente_strings,ente_ui,ente_utils,dir_utils
# melos_managed_dependency_overrides: dir_utils,ente_accounts,ente_base,ente_configuration,ente_events,ente_lock_screen,ente_logging,ente_network,ente_strings,ente_ui,ente_utils
dependency_overrides:
dir_utils:
path: ../../packages/dir_utils
Expand Down
Binary file removed mobile/apps/locker/assets/2.0x/locker-logo-blue.png
Binary file not shown.
Binary file removed mobile/apps/locker/assets/3.0x/locker-logo-blue.png
Binary file not shown.
Binary file removed mobile/apps/locker/assets/locker-logo-blue.png
Binary file not shown.
8 changes: 8 additions & 0 deletions mobile/apps/locker/assets/svg/app-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions mobile/apps/locker/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ PODS:
- FlutterMacOS
- privacy_screen (0.0.1):
- Flutter
- SDWebImage (5.21.3):
- SDWebImage/Core (= 5.21.3)
- SDWebImage/Core (5.21.3)
- SDWebImage (5.21.5):
- SDWebImage/Core (= 5.21.5)
- SDWebImage/Core (5.21.5)
- Sentry/HybridSDK (8.46.0)
- sentry_flutter (8.14.2):
- Flutter
Expand Down Expand Up @@ -215,7 +215,7 @@ SPEC CHECKSUMS:
package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
privacy_screen: 3159a541f5d3a31bea916cfd4e58f9dc722b3fd4
SDWebImage: 16309af6d214ba3f77a7c6f6fdda888cb313a50a
SDWebImage: e9c98383c7572d713c1a0d7dd2783b10599b9838
Sentry: da60d980b197a46db0b35ea12cb8f39af48d8854
sentry_flutter: 27892878729f42701297c628eb90e7c6529f3684
share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
Expand Down
25 changes: 3 additions & 22 deletions mobile/apps/locker/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -459,28 +459,6 @@
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
95EA1C55C1859216DB1FDA66 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
Expand Down Expand Up @@ -694,6 +672,7 @@
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_ENABLE_EXPLICIT_MODULES = NO;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down Expand Up @@ -734,6 +713,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_ENABLE_EXPLICIT_MODULES = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
Expand Down Expand Up @@ -773,6 +753,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_ENABLE_EXPLICIT_MODULES = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
Expand Down
67 changes: 26 additions & 41 deletions mobile/apps/locker/lib/services/trash/trash_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -205,42 +205,32 @@ class TrashService {
for (final fileID in uniqueFileIds) {
params["fileIDs"].add(fileID);
}
try {
await _enteDio.post(
"/trash/delete",
data: params,
);
await _trashDB.delete(uniqueFileIds);

await _collectionDB.deleteFilesByUploadedFileIDs(uniqueFileIds);
} catch (e, s) {
_logger.severe("failed to delete from trash", e, s);
rethrow;
}
await _enteDio.post(
"/trash/delete",
data: params,
);
await _trashDB.delete(uniqueFileIds);
await _collectionDB.deleteFilesByUploadedFileIDs(uniqueFileIds);
// no need to await on syncing trash from remote
unawaited(syncTrash());
}

Future<void> emptyTrash() async {
final params = <String, dynamic>{};
params["lastUpdatedAt"] = _getSyncTime();
try {
final trashFiles = await _trashDB.getAllTrashFiles();
final fileIDs =
trashFiles.map((trashFile) => trashFile.uploadedFileID!).toList();
final trashFiles = await _trashDB.getAllTrashFiles();
final fileIDs =
trashFiles.map((trashFile) => trashFile.uploadedFileID!).toList();

await _enteDio.post(
"/trash/empty",
data: params,
);
await _enteDio.post(
"/trash/empty",
data: params,
);

await _trashDB.clearTable();
await _collectionDB.deleteFilesByUploadedFileIDs(fileIDs);
unawaited(syncTrash());
} catch (e, s) {
_logger.severe("failed to empty trash", e, s);
rethrow;
}
await _trashDB.clearTable();
await _collectionDB.deleteFilesByUploadedFileIDs(fileIDs);
unawaited(syncTrash());
_logger.info("Successfully emptied trash");
}

Future<void> restore(List<EnteFile> files, Collection toCollection) async {
Expand All @@ -264,20 +254,15 @@ class TrashService {
).toMap(),
);
}
try {
await _enteDio.post(
"/collections/restore-files",
data: params,
);
await _trashDB.delete(files.map((e) => e.uploadedFileID!).toList());
// Refresh collections so restored files are immediately available in UI
await CollectionService.instance.sync();
Bus.instance.fire(CollectionsUpdatedEvent("file_restore"));
Bus.instance.fire(UserDetailsRefreshEvent());
} catch (e, s) {
_logger.severe("failed to restore files", e, s);
rethrow;
}
await _enteDio.post(
"/collections/restore-files",
data: params,
);
await _trashDB.delete(files.map((e) => e.uploadedFileID!).toList());
// Refresh collections so restored files are immediately available in UI
await CollectionService.instance.sync();
Bus.instance.fire(CollectionsUpdatedEvent("file_restore"));
Bus.instance.fire(UserDetailsRefreshEvent());
}
}

Expand Down
Loading