Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[auth] Align illustrations and header colors

laurenspriemf653fb201ad7
diff --git a/mobile/apps/auth/assets/2.0x/upload_file.png b/mobile/apps/auth/assets/2.0x/upload_file.png
index 12a9213229..180c67b1e0 100644
Binary files a/mobile/apps/auth/assets/2.0x/upload_file.png and b/mobile/apps/auth/assets/2.0x/upload_file.png differ
diff --git a/mobile/apps/auth/assets/3.0x/upload_file.png b/mobile/apps/auth/assets/3.0x/upload_file.png
index dd49cfd45d..ed9d998d6b 100644
Binary files a/mobile/apps/auth/assets/3.0x/upload_file.png and b/mobile/apps/auth/assets/3.0x/upload_file.png differ
diff --git a/mobile/apps/auth/assets/upload_file.png b/mobile/apps/auth/assets/upload_file.png
index 3340b77241..6fd30788ad 100644
Binary files a/mobile/apps/auth/assets/upload_file.png and b/mobile/apps/auth/assets/upload_file.png differ
diff --git a/mobile/apps/auth/changes/design-colors.md b/mobile/apps/auth/changes/design-colors.md
new file mode 100644
index 0000000000..ae110075a2
--- /dev/null
+++ b/mobile/apps/auth/changes/design-colors.md
@@ -0,0 +1 @@
+- Updated the email verification illustration and aligned account and app lock headers and the backup prompt with Auth's colors.
diff --git a/mobile/apps/auth/lib/ui/settings_page.dart b/mobile/apps/auth/lib/ui/settings_page.dart
index a813b2769a..07ec348646 100644
--- a/mobile/apps/auth/lib/ui/settings_page.dart
+++ b/mobile/apps/auth/lib/ui/settings_page.dart
@@ -81,6 +81,9 @@ class SettingsPage extends StatelessWidget {
title: l10n.signInToBackup,
leadingIcon: HugeIcons.strokeRoundedCloudUpload,
state: BannerComponentState.informative,
+ foregroundColor: Theme.of(context).brightness == Brightness.dark
+ ? purpleStrokeLight
+ : context.componentColors.primaryDark,
trailingWidget: const Icon(Icons.arrow_forward),
onTap: () => _showBackupReminder(context),
),
diff --git a/mobile/packages/accounts/lib/pages/email_entry_page.dart b/mobile/packages/accounts/lib/pages/email_entry_page.dart
index e30b43d355..41658be5b4 100644
--- a/mobile/packages/accounts/lib/pages/email_entry_page.dart
+++ b/mobile/packages/accounts/lib/pages/email_entry_page.dart
@@ -1,6 +1,7 @@
import 'package:dots_indicator/dots_indicator.dart';
import 'package:email_validator/email_validator.dart';
import 'package:ente_accounts/ente_accounts.dart';
+import 'package:ente_accounts/widgets/account_app_bar_logo.dart';
import 'package:ente_configuration/base_configuration.dart';
import 'package:ente_strings/ente_strings.dart';
import 'package:ente_ui/components/buttons/dynamic_fab.dart';
@@ -8,7 +9,6 @@ import 'package:ente_ui/theme/ente_theme.dart';
import 'package:ente_utils/platform_util.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
-import 'package:flutter_svg/flutter_svg.dart';
import 'package:password_strength/password_strength.dart';
import "package:styled_text/styled_text.dart";
@@ -93,13 +93,7 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
scrolledUnderElevation: 0,
backgroundColor: colorScheme.backgroundBase,
centerTitle: true,
- title: SvgPicture.asset(
- 'assets/svg/app-logo.svg',
- colorFilter: ColorFilter.mode(
- colorScheme.primary700,
- BlendMode.srcIn,
- ),
- ),
+ title: const AccountAppBarLogo(),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
color: colorScheme.primary700,
diff --git a/mobile/packages/accounts/lib/pages/login_page.dart b/mobile/packages/accounts/lib/pages/login_page.dart
index 07cf4b9450..920822a893 100644
--- a/mobile/packages/accounts/lib/pages/login_page.dart
+++ b/mobile/packages/accounts/lib/pages/login_page.dart
@@ -1,13 +1,13 @@
import "package:email_validator/email_validator.dart";
import 'package:ente_accounts/ente_accounts.dart';
import 'package:ente_accounts/models/errors.dart';
+import 'package:ente_accounts/widgets/account_app_bar_logo.dart';
import 'package:ente_configuration/base_configuration.dart';
import "package:ente_strings/ente_strings.dart";
import 'package:ente_ui/components/buttons/dynamic_fab.dart';
import 'package:ente_ui/theme/ente_theme.dart';
import 'package:ente_utils/platform_util.dart';
import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
import 'package:logging/logging.dart';
import "package:styled_text/tags/styled_text_tag_action.dart";
import "package:styled_text/widgets/styled_text.dart";
@@ -90,13 +90,7 @@ class _LoginPageState extends State<LoginPage> {
scrolledUnderElevation: 0,
backgroundColor: colorScheme.backgroundBase,
centerTitle: true,
- title: SvgPicture.asset(
- 'assets/svg/app-logo.svg',
- colorFilter: ColorFilter.mode(
- colorScheme.primary700,
- BlendMode.srcIn,
- ),
- ),
+ title: const AccountAppBarLogo(),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
color: colorScheme.primary700,
diff --git a/mobile/packages/accounts/lib/pages/login_pwd_verification_page.dart b/mobile/packages/accounts/lib/pages/login_pwd_verification_page.dart
index 56d3d059b6..cf2db38841 100644
--- a/mobile/packages/accounts/lib/pages/login_pwd_verification_page.dart
+++ b/mobile/packages/accounts/lib/pages/login_pwd_verification_page.dart
@@ -1,5 +1,6 @@
import "package:dio/dio.dart";
import "package:ente_accounts/ente_accounts.dart";
+import 'package:ente_accounts/widgets/account_app_bar_logo.dart';
import "package:ente_components/ente_components.dart";
import "package:ente_configuration/base_configuration.dart";
import "package:ente_crypto_api/ente_crypto_api.dart";
@@ -10,7 +11,6 @@ import "package:ente_ui/theme/ente_theme.dart";
import "package:ente_ui/utils/dialog_util.dart";
import "package:ente_utils/email_util.dart";
import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
import "package:logging/logging.dart";
class LoginPasswordVerificationPage extends StatefulWidget {
@@ -73,13 +73,7 @@ class _LoginPasswordVerificationPageState
scrolledUnderElevation: 0,
backgroundColor: colorScheme.backgroundBase,
centerTitle: true,
- title: SvgPicture.asset(
- 'assets/svg/app-logo.svg',
- colorFilter: ColorFilter.mode(
- colorScheme.primary700,
- BlendMode.srcIn,
- ),
- ),
+ title: const AccountAppBarLogo(),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
color: colorScheme.primary700,
diff --git a/mobile/packages/accounts/lib/pages/ott_verification_page.dart b/mobile/packages/accounts/lib/pages/ott_verification_page.dart
index de88a2cb82..ca49bbdef6 100644
--- a/mobile/packages/accounts/lib/pages/ott_verification_page.dart
+++ b/mobile/packages/accounts/lib/pages/ott_verification_page.dart
@@ -1,11 +1,11 @@
import 'package:dots_indicator/dots_indicator.dart';
import 'package:ente_accounts/ente_accounts.dart';
+import 'package:ente_accounts/widgets/account_app_bar_logo.dart';
import 'package:ente_components/ente_components.dart';
import 'package:ente_strings/ente_strings.dart';
import 'package:ente_ui/components/buttons/dynamic_fab.dart';
import 'package:ente_ui/theme/ente_theme.dart';
import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
class OTTVerificationPage extends StatefulWidget {
final String email;
@@ -89,13 +89,7 @@ class _OTTVerificationPageState extends State<OTTVerificationPage> {
scrolledUnderElevation: 0,
backgroundColor: colorScheme.backgroundBase,
centerTitle: true,
- title: SvgPicture.asset(
- 'assets/svg/app-logo.svg',
- colorFilter: ColorFilter.mode(
- colorScheme.primary700,
- BlendMode.srcIn,
- ),
- ),
+ title: const AccountAppBarLogo(),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
color: colorScheme.primary700,
diff --git a/mobile/packages/accounts/lib/pages/passkey_page.dart b/mobile/packages/accounts/lib/pages/passkey_page.dart
index 089e1bff13..635e838b0a 100644
--- a/mobile/packages/accounts/lib/pages/passkey_page.dart
+++ b/mobile/packages/accounts/lib/pages/passkey_page.dart
@@ -4,6 +4,7 @@ import 'dart:convert';
import 'package:app_links/app_links.dart';
import 'package:ente_accounts/ente_accounts.dart';
import 'package:ente_accounts/models/errors.dart';
+import 'package:ente_accounts/widgets/account_app_bar_logo.dart';
import 'package:ente_components/ente_components.dart';
import 'package:ente_configuration/base_configuration.dart';
import 'package:ente_pure_utils/ente_pure_utils.dart';
@@ -13,7 +14,6 @@ import 'package:ente_ui/theme/ente_theme.dart';
import 'package:ente_ui/utils/dialog_util.dart';
import 'package:ente_ui/utils/toast_util.dart';
import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
import 'package:logging/logging.dart';
import 'package:url_launcher/url_launcher_string.dart';
@@ -168,13 +168,7 @@ class _PasskeyPageState extends State<PasskeyPage> {
scrolledUnderElevation: 0,
backgroundColor: colorScheme.backgroundBase,
centerTitle: true,
- title: SvgPicture.asset(
- 'assets/svg/app-logo.svg',
- colorFilter: ColorFilter.mode(
- colorScheme.primary700,
- BlendMode.srcIn,
- ),
- ),
+ title: const AccountAppBarLogo(),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
color: colorScheme.primary700,
diff --git a/mobile/packages/accounts/lib/pages/password_entry_page.dart b/mobile/packages/accounts/lib/pages/password_entry_page.dart
index 24801a5d2d..e865fa0f07 100644
--- a/mobile/packages/accounts/lib/pages/password_entry_page.dart
+++ b/mobile/packages/accounts/lib/pages/password_entry_page.dart
@@ -1,4 +1,5 @@
import 'package:ente_accounts/ente_accounts.dart';
+import 'package:ente_accounts/widgets/account_app_bar_logo.dart';
import 'package:ente_components/ente_components.dart';
import 'package:ente_configuration/base_configuration.dart';
import 'package:ente_pure_utils/ente_pure_utils.dart';
@@ -13,7 +14,6 @@ import 'package:ente_ui/utils/toast_util.dart';
import 'package:ente_utils/platform_util.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
-import 'package:flutter_svg/flutter_svg.dart';
import 'package:logging/logging.dart';
import 'package:password_strength/password_strength.dart';
import 'package:styled_text/styled_text.dart';
@@ -115,13 +115,7 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
scrolledUnderElevation: 0,
backgroundColor: colorScheme.backgroundBase,
centerTitle: true,
- title: SvgPicture.asset(
- 'assets/svg/app-logo.svg',
- colorFilter: ColorFilter.mode(
- colorScheme.primary700,
- BlendMode.srcIn,
- ),
- ),
+ title: const AccountAppBarLogo(),
leading: widget.mode == PasswordEntryMode.reset
? Container()
: IconButton(
diff --git a/mobile/packages/accounts/lib/pages/password_reentry_page.dart b/mobile/packages/accounts/lib/pages/password_reentry_page.dart
index 3879846133..bd03901316 100644
--- a/mobile/packages/accounts/lib/pages/password_reentry_page.dart
+++ b/mobile/packages/accounts/lib/pages/password_reentry_page.dart
@@ -3,6 +3,7 @@ import 'dart:typed_data';
import 'package:ente_accounts/ente_accounts.dart';
import 'package:ente_accounts/models/errors.dart';
+import 'package:ente_accounts/widgets/account_app_bar_logo.dart';
import 'package:ente_components/ente_components.dart';
import 'package:ente_configuration/base_configuration.dart';
import 'package:ente_crypto_api/ente_crypto_api.dart';
@@ -14,7 +15,6 @@ import 'package:ente_ui/theme/ente_theme.dart';
import 'package:ente_ui/utils/dialog_util.dart';
import 'package:ente_utils/email_util.dart';
import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
import 'package:logging/logging.dart';
class PasswordReentryPage extends StatefulWidget {
@@ -69,13 +69,7 @@ class _PasswordReentryPageState extends State<PasswordReentryPage> {
scrolledUnderElevation: 0,
backgroundColor: colorScheme.backgroundBase,
centerTitle: true,
- title: SvgPicture.asset(
- 'assets/svg/app-logo.svg',
- colorFilter: ColorFilter.mode(
- colorScheme.primary700,
- BlendMode.srcIn,
- ),
- ),
+ title: const AccountAppBarLogo(),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
color: colorScheme.primary700,
diff --git a/mobile/packages/accounts/lib/pages/recovery_key_page.dart b/mobile/packages/accounts/lib/pages/recovery_key_page.dart
index b74013a439..bfeccb6421 100644
--- a/mobile/packages/accounts/lib/pages/recovery_key_page.dart
+++ b/mobile/packages/accounts/lib/pages/recovery_key_page.dart
@@ -3,6 +3,7 @@ import 'dart:io' as io;
import 'package:bip39/bip39.dart' as bip39;
import 'package:dots_indicator/dots_indicator.dart';
+import 'package:ente_accounts/widgets/account_app_bar_logo.dart';
import 'package:ente_components/ente_components.dart';
import 'package:ente_configuration/base_configuration.dart';
import 'package:ente_configuration/constants.dart';
@@ -14,7 +15,6 @@ import 'package:ente_utils/ente_utils.dart';
import 'package:file_saver/file_saver.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
-import 'package:flutter_svg/flutter_svg.dart';
import 'package:hugeicons/hugeicons.dart';
import 'package:share_plus/share_plus.dart';
@@ -88,13 +88,7 @@ class _RecoveryKeyPageState extends State<RecoveryKeyPage> {
scrolledUnderElevation: 0,
backgroundColor: colorScheme.backgroundBase,
centerTitle: true,
- title: SvgPicture.asset(
- 'assets/svg/app-logo.svg',
- colorFilter: ColorFilter.mode(
- colorScheme.primary700,
- BlendMode.srcIn,
- ),
- ),
+ title: const AccountAppBarLogo(),
leading: widget.showAppBar == false
? const SizedBox.shrink()
: IconButton(
diff --git a/mobile/packages/accounts/lib/pages/recovery_page.dart b/mobile/packages/accounts/lib/pages/recovery_page.dart
index 29d2136132..1ddf48373c 100644
--- a/mobile/packages/accounts/lib/pages/recovery_page.dart
+++ b/mobile/packages/accounts/lib/pages/recovery_page.dart
@@ -1,4 +1,5 @@
import 'package:ente_accounts/ente_accounts.dart';
+import 'package:ente_accounts/widgets/account_app_bar_logo.dart';
import 'package:ente_components/ente_components.dart';
import 'package:ente_configuration/base_configuration.dart';
import 'package:ente_strings/ente_strings.dart';
@@ -10,7 +11,6 @@ import 'package:ente_ui/utils/dialog_util.dart';
import 'package:ente_ui/utils/toast_util.dart';
import "package:ente_utils/email_util.dart";
import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
class RecoveryPage extends StatefulWidget {
final BaseConfiguration config;
@@ -89,13 +89,7 @@ class _RecoveryPageState extends State<RecoveryPage> {
scrolledUnderElevation: 0,
backgroundColor: colorScheme.backgroundBase,
centerTitle: true,
- title: SvgPicture.asset(
- 'assets/svg/app-logo.svg',
- colorFilter: ColorFilter.mode(
- colorScheme.primary700,
- BlendMode.srcIn,
- ),
- ),
+ title: const AccountAppBarLogo(),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
color: colorScheme.primary700,
diff --git a/mobile/packages/accounts/lib/pages/two_factor_authentication_page.dart b/mobile/packages/accounts/lib/pages/two_factor_authentication_page.dart
index ac3d70a070..eae2078133 100644
--- a/mobile/packages/accounts/lib/pages/two_factor_authentication_page.dart
+++ b/mobile/packages/accounts/lib/pages/two_factor_authentication_page.dart
@@ -1,11 +1,11 @@
import 'package:ente_accounts/ente_accounts.dart';
import 'package:ente_accounts/lifecycle_event_handler.dart';
+import 'package:ente_accounts/widgets/account_app_bar_logo.dart';
import 'package:ente_strings/ente_strings.dart';
import 'package:ente_ui/components/buttons/dynamic_fab.dart';
import 'package:ente_ui/theme/ente_theme.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
-import 'package:flutter_svg/flutter_svg.dart';
import 'package:pinput/pinput.dart';
class TwoFactorAuthenticationPage extends StatefulWidget {
@@ -68,13 +68,7 @@ class _TwoFactorAuthenticationPageState
scrolledUnderElevation: 0,
backgroundColor: colorScheme.backgroundBase,
centerTitle: true,
- title: SvgPicture.asset(
- 'assets/svg/app-logo.svg',
- colorFilter: ColorFilter.mode(
- colorScheme.primary700,
- BlendMode.srcIn,
- ),
- ),
+ title: const AccountAppBarLogo(),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
color: colorScheme.primary700,
diff --git a/mobile/packages/accounts/lib/pages/two_factor_recovery_page.dart b/mobile/packages/accounts/lib/pages/two_factor_recovery_page.dart
index 4b2e072d39..92a5170465 100644
--- a/mobile/packages/accounts/lib/pages/two_factor_recovery_page.dart
+++ b/mobile/packages/accounts/lib/pages/two_factor_recovery_page.dart
@@ -1,10 +1,10 @@
import 'package:ente_accounts/ente_accounts.dart';
+import 'package:ente_accounts/widgets/account_app_bar_logo.dart';
import 'package:ente_strings/ente_strings.dart';
import 'package:ente_ui/components/buttons/dynamic_fab.dart';
import 'package:ente_ui/theme/ente_theme.dart';
import 'package:ente_utils/email_util.dart';
import 'package:flutter/material.dart';
-import 'package:flutter_svg/flutter_svg.dart';
class TwoFactorRecoveryPage extends StatefulWidget {
final String sessionID;
@@ -59,13 +59,7 @@ class _TwoFactorRecoveryPageState extends State<TwoFactorRecoveryPage> {
scrolledUnderElevation: 0,
backgroundColor: colorScheme.backgroundBase,
centerTitle: true,
- title: SvgPicture.asset(
- 'assets/svg/app-logo.svg',
- colorFilter: ColorFilter.mode(
- colorScheme.primary700,
- BlendMode.srcIn,
- ),
- ),
+ title: const AccountAppBarLogo(),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
color: colorScheme.primary700,
diff --git a/mobile/packages/accounts/lib/widgets/account_app_bar_logo.dart b/mobile/packages/accounts/lib/widgets/account_app_bar_logo.dart
new file mode 100644
index 0000000000..f0b57e42a3
--- /dev/null
+++ b/mobile/packages/accounts/lib/widgets/account_app_bar_logo.dart
@@ -0,0 +1,23 @@
+import 'package:ente_ui/theme/ente_theme.dart';
+import 'package:ente_ui/theme/theme_config.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+
+class AccountAppBarLogo extends StatelessWidget {
+ const AccountAppBarLogo({super.key});
+
+ @override
+ Widget build(BuildContext context) {
+ final colors = getEnteColorScheme(context);
+
+ return SvgPicture.asset(
+ 'assets/svg/app-logo.svg',
+ colorFilter: ColorFilter.mode(
+ AppThemeConfig.currentApp == EnteApp.auth
+ ? colors.textBase
+ : colors.primary700,
+ BlendMode.srcIn,
+ ),
+ );
+ }
+}
diff --git a/mobile/packages/ente_components/lib/components/banner_component.dart b/mobile/packages/ente_components/lib/components/banner_component.dart
index 6c86ab26b7..0be8e72b36 100644
--- a/mobile/packages/ente_components/lib/components/banner_component.dart
+++ b/mobile/packages/ente_components/lib/components/banner_component.dart
@@ -17,6 +17,7 @@ class BannerComponent extends StatelessWidget {
this.leadingIcon,
this.leadingWidget,
this.state = BannerComponentState.neutral,
+ this.foregroundColor,
this.subtitle,
this.trailingWidget,
super.key,
@@ -32,6 +33,7 @@ class BannerComponent extends StatelessWidget {
final List<List<dynamic>>? leadingIcon;
final Widget? leadingWidget;
final BannerComponentState state;
+ final Color? foregroundColor;
final Widget? trailingWidget;
final VoidCallback onTap;
@@ -82,7 +84,7 @@ class BannerComponent extends StatelessWidget {
? HugeIcon(
icon: leadingIcon ?? _defaultLeadingIcon,
size: _leadingIconSize,
- color: accentColor,
+ color: foregroundColor ?? accentColor,
)
: SizedBox(
width: _leadingIconSize,
@@ -90,7 +92,7 @@ class BannerComponent extends StatelessWidget {
child: Center(
child: IconTheme.merge(
data: IconThemeData(
- color: accentColor,
+ color: foregroundColor ?? accentColor,
size: _leadingIconSize,
),
child: leadingWidget,
@@ -105,7 +107,7 @@ class BannerComponent extends StatelessWidget {
maxLines: 2,
overflow: TextOverflow.ellipsis,
style: TextStyles.bodyBold.copyWith(
- color: titleColor,
+ color: foregroundColor ?? titleColor,
),
)
: Column(
@@ -117,7 +119,7 @@ class BannerComponent extends StatelessWidget {
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyles.bodyBold.copyWith(
- color: titleColor,
+ color: foregroundColor ?? titleColor,
),
),
const SizedBox(height: Spacing.xs),
diff --git a/mobile/packages/lock_screen/lib/ui/lock_screen_app_bar_logo.dart b/mobile/packages/lock_screen/lib/ui/lock_screen_app_bar_logo.dart
new file mode 100644
index 0000000000..26762a7c3f
--- /dev/null
+++ b/mobile/packages/lock_screen/lib/ui/lock_screen_app_bar_logo.dart
@@ -0,0 +1,26 @@
+import 'package:ente_components/ente_components.dart';
+import 'package:ente_lock_screen/lock_screen_settings.dart';
+import 'package:ente_ui/theme/theme_config.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+
+class LockScreenAppBarLogo extends StatelessWidget {
+ const LockScreenAppBarLogo({super.key});
+
+ @override
+ Widget build(BuildContext context) {
+ final colors = context.componentColors;
+ final settings = LockScreenSettings.instance;
+
+ return SvgPicture.asset(
+ settings.appLogoAsset,
+ height: settings.appLogoHeight,
+ colorFilter: ColorFilter.mode(
+ AppThemeConfig.currentApp == EnteApp.auth
+ ? colors.textBase
+ : colors.primary,
+ BlendMode.srcIn,
+ ),
+ );
+ }
+}
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 248c1104ae..1714f9ac4d 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
@@ -1,10 +1,10 @@
import "package:ente_components/ente_components.dart";
import "package:ente_lock_screen/lock_screen_settings.dart";
+import 'package:ente_lock_screen/ui/lock_screen_app_bar_logo.dart';
import "package:ente_lock_screen/ui/lock_screen_submit_fab.dart";
import "package:ente_strings/ente_strings.dart";
import "package:flutter/material.dart";
import "package:flutter/services.dart";
-import "package:flutter_svg/flutter_svg.dart";
class LockScreenConfirmPassword extends StatefulWidget {
const LockScreenConfirmPassword({super.key, required this.password});
@@ -65,11 +65,7 @@ class _LockScreenConfirmPasswordState extends State<LockScreenConfirmPassword> {
icon: Icon(Icons.arrow_back, color: colorTheme.textBase),
),
centerTitle: true,
- title: SvgPicture.asset(
- LockScreenSettings.instance.appLogoAsset,
- height: LockScreenSettings.instance.appLogoHeight,
- colorFilter: ColorFilter.mode(colorTheme.primary, BlendMode.srcIn),
- ),
+ title: const LockScreenAppBarLogo(),
),
floatingActionButton: LockScreenSubmitFab(
label: context.strings.confirm,
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 4c2775b103..b8406f431e 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
@@ -3,11 +3,11 @@ import "dart:io";
import "package:ente_components/ente_components.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_app_bar_logo.dart';
import "package:ente_lock_screen/ui/lock_screen_pin_input.dart";
import "package:ente_strings/ente_strings.dart";
import "package:flutter/material.dart";
import "package:flutter/services.dart";
-import "package:flutter_svg/flutter_svg.dart";
class LockScreenConfirmPin extends StatefulWidget {
const LockScreenConfirmPin({super.key, required this.pin});
@@ -75,11 +75,7 @@ class _LockScreenConfirmPinState extends State<LockScreenConfirmPin> {
icon: Icon(Icons.arrow_back, color: colorTheme.textBase),
),
centerTitle: true,
- title: SvgPicture.asset(
- LockScreenSettings.instance.appLogoAsset,
- height: LockScreenSettings.instance.appLogoHeight,
- colorFilter: ColorFilter.mode(colorTheme.primary, BlendMode.srcIn),
- ),
+ title: const LockScreenAppBarLogo(),
),
floatingActionButton: isPlatformDesktop
? null
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 cc8bdd58f1..dcaace4c4c 100644
--- a/mobile/packages/lock_screen/lib/ui/lock_screen_password.dart
+++ b/mobile/packages/lock_screen/lib/ui/lock_screen_password.dart
@@ -1,12 +1,12 @@
import "package:ente_components/ente_components.dart";
import "package:ente_lock_screen/lock_screen_settings.dart";
+import 'package:ente_lock_screen/ui/lock_screen_app_bar_logo.dart';
import "package:ente_lock_screen/ui/lock_screen_confirm_password.dart";
import "package:ente_lock_screen/ui/lock_screen_options.dart";
import "package:ente_lock_screen/ui/lock_screen_submit_fab.dart";
import "package:ente_strings/ente_strings.dart";
import "package:flutter/material.dart";
import "package:flutter/services.dart";
-import "package:flutter_svg/flutter_svg.dart";
class LockScreenPassword extends StatefulWidget {
const LockScreenPassword({
@@ -66,11 +66,7 @@ class _LockScreenPasswordState extends State<LockScreenPassword> {
icon: Icon(Icons.arrow_back, color: colorTheme.textBase),
),
centerTitle: true,
- title: SvgPicture.asset(
- LockScreenSettings.instance.appLogoAsset,
- height: LockScreenSettings.instance.appLogoHeight,
- colorFilter: ColorFilter.mode(colorTheme.primary, BlendMode.srcIn),
- ),
+ title: const LockScreenAppBarLogo(),
),
floatingActionButton: LockScreenSubmitFab(
label: context.strings.next,
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 800363f155..2668f2200f 100644
--- a/mobile/packages/lock_screen/lib/ui/lock_screen_pin.dart
+++ b/mobile/packages/lock_screen/lib/ui/lock_screen_pin.dart
@@ -3,13 +3,13 @@ import "dart:io";
import "package:ente_components/ente_components.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_app_bar_logo.dart';
import "package:ente_lock_screen/ui/lock_screen_confirm_pin.dart";
import "package:ente_lock_screen/ui/lock_screen_options.dart";
import "package:ente_lock_screen/ui/lock_screen_pin_input.dart";
import "package:ente_strings/ente_strings.dart";
import "package:flutter/material.dart";
import "package:flutter/services.dart";
-import "package:flutter_svg/flutter_svg.dart";
class LockScreenPin extends StatefulWidget {
const LockScreenPin({
@@ -134,11 +134,7 @@ class _LockScreenPinState extends State<LockScreenPin> {
icon: Icon(Icons.arrow_back, color: colorTheme.textBase),
),
centerTitle: true,
- title: SvgPicture.asset(
- LockScreenSettings.instance.appLogoAsset,
- height: LockScreenSettings.instance.appLogoHeight,
- colorFilter: ColorFilter.mode(colorTheme.primary, BlendMode.srcIn),
- ),
+ title: const LockScreenAppBarLogo(),
),
floatingActionButton: isPlatformDesktop
? null