Skip to content

armgit / ente

Public Imported from GitHub
0

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

[auth] Align account back arrows and dark backup prompt

laurenspriemf1498e315a38
diff --git a/mobile/apps/auth/changes/design-colors.md b/mobile/apps/auth/changes/design-colors.md
index ae110075a2..b9c85630dc 100644
--- a/mobile/apps/auth/changes/design-colors.md
+++ b/mobile/apps/auth/changes/design-colors.md
@@ -1 +1 @@
-- Updated the email verification illustration and aligned account and app lock headers and the backup prompt with Auth's colors.
+- Updated the email verification illustration, aligned account and app lock headers and account back arrows with Auth's colors, and styled the backup prompt with Auth purple.
diff --git a/mobile/apps/auth/lib/ui/settings_page.dart b/mobile/apps/auth/lib/ui/settings_page.dart
index 07ec348646..2830ad02d0 100644
--- a/mobile/apps/auth/lib/ui/settings_page.dart
+++ b/mobile/apps/auth/lib/ui/settings_page.dart
@@ -41,6 +41,8 @@ class SettingsPage extends StatelessWidget {
final ValueNotifier<String?> emailNotifier;
final GlobalKey<ScaffoldState> scaffoldKey;
+ static const _darkBackupPromptColor = Color(0xFFB868E7);
+
@override
Widget build(BuildContext context) {
final hasLoggedIn = Configuration.instance.hasConfiguredAccount();
@@ -82,7 +84,7 @@ class SettingsPage extends StatelessWidget {
leadingIcon: HugeIcons.strokeRoundedCloudUpload,
state: BannerComponentState.informative,
foregroundColor: Theme.of(context).brightness == Brightness.dark
- ? purpleStrokeLight
+ ? _darkBackupPromptColor
: 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 41658be5b4..996cdbafb6 100644
--- a/mobile/packages/accounts/lib/pages/email_entry_page.dart
+++ b/mobile/packages/accounts/lib/pages/email_entry_page.dart
@@ -96,7 +96,7 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
title: const AccountAppBarLogo(),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
- color: colorScheme.primary700,
+ color: getAccountAppBarColor(context),
onPressed: () => Navigator.of(context).pop(),
),
),
diff --git a/mobile/packages/accounts/lib/pages/login_page.dart b/mobile/packages/accounts/lib/pages/login_page.dart
index 920822a893..f7e0430823 100644
--- a/mobile/packages/accounts/lib/pages/login_page.dart
+++ b/mobile/packages/accounts/lib/pages/login_page.dart
@@ -93,7 +93,7 @@ class _LoginPageState extends State<LoginPage> {
title: const AccountAppBarLogo(),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
- color: colorScheme.primary700,
+ color: getAccountAppBarColor(context),
onPressed: () {
Navigator.of(context).pop();
},
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 cf2db38841..d4d021e412 100644
--- a/mobile/packages/accounts/lib/pages/login_pwd_verification_page.dart
+++ b/mobile/packages/accounts/lib/pages/login_pwd_verification_page.dart
@@ -76,7 +76,7 @@ class _LoginPasswordVerificationPageState
title: const AccountAppBarLogo(),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
- color: colorScheme.primary700,
+ color: getAccountAppBarColor(context),
onPressed: () {
Navigator.of(context).pop();
},
diff --git a/mobile/packages/accounts/lib/pages/ott_verification_page.dart b/mobile/packages/accounts/lib/pages/ott_verification_page.dart
index ca49bbdef6..f4f63476cc 100644
--- a/mobile/packages/accounts/lib/pages/ott_verification_page.dart
+++ b/mobile/packages/accounts/lib/pages/ott_verification_page.dart
@@ -92,7 +92,7 @@ class _OTTVerificationPageState extends State<OTTVerificationPage> {
title: const AccountAppBarLogo(),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
- color: colorScheme.primary700,
+ color: getAccountAppBarColor(context),
onPressed: () {
Navigator.of(context).pop();
},
diff --git a/mobile/packages/accounts/lib/pages/passkey_page.dart b/mobile/packages/accounts/lib/pages/passkey_page.dart
index 635e838b0a..7f957c7089 100644
--- a/mobile/packages/accounts/lib/pages/passkey_page.dart
+++ b/mobile/packages/accounts/lib/pages/passkey_page.dart
@@ -171,7 +171,7 @@ class _PasskeyPageState extends State<PasskeyPage> {
title: const AccountAppBarLogo(),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
- color: colorScheme.primary700,
+ color: getAccountAppBarColor(context),
onPressed: () {
Navigator.of(context).pop();
},
diff --git a/mobile/packages/accounts/lib/pages/password_entry_page.dart b/mobile/packages/accounts/lib/pages/password_entry_page.dart
index e865fa0f07..d167cb20ed 100644
--- a/mobile/packages/accounts/lib/pages/password_entry_page.dart
+++ b/mobile/packages/accounts/lib/pages/password_entry_page.dart
@@ -120,7 +120,7 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
? Container()
: IconButton(
icon: const Icon(Icons.arrow_back),
- color: colorScheme.primary700,
+ color: getAccountAppBarColor(context),
onPressed: () {
Navigator.of(context).pop();
},
diff --git a/mobile/packages/accounts/lib/pages/password_reentry_page.dart b/mobile/packages/accounts/lib/pages/password_reentry_page.dart
index bd03901316..37d988937a 100644
--- a/mobile/packages/accounts/lib/pages/password_reentry_page.dart
+++ b/mobile/packages/accounts/lib/pages/password_reentry_page.dart
@@ -72,7 +72,7 @@ class _PasswordReentryPageState extends State<PasswordReentryPage> {
title: const AccountAppBarLogo(),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
- color: colorScheme.primary700,
+ color: getAccountAppBarColor(context),
onPressed: () {
Navigator.of(context).pop();
},
diff --git a/mobile/packages/accounts/lib/pages/recovery_key_page.dart b/mobile/packages/accounts/lib/pages/recovery_key_page.dart
index bfeccb6421..9fa52cc81e 100644
--- a/mobile/packages/accounts/lib/pages/recovery_key_page.dart
+++ b/mobile/packages/accounts/lib/pages/recovery_key_page.dart
@@ -96,7 +96,7 @@ class _RecoveryKeyPageState extends State<RecoveryKeyPage> {
onPressed: () {
Navigator.of(context).pop();
},
- color: colorScheme.primary700,
+ color: getAccountAppBarColor(context),
),
),
body: SafeArea(
diff --git a/mobile/packages/accounts/lib/pages/recovery_page.dart b/mobile/packages/accounts/lib/pages/recovery_page.dart
index 1ddf48373c..b5c125b792 100644
--- a/mobile/packages/accounts/lib/pages/recovery_page.dart
+++ b/mobile/packages/accounts/lib/pages/recovery_page.dart
@@ -92,7 +92,7 @@ class _RecoveryPageState extends State<RecoveryPage> {
title: const AccountAppBarLogo(),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
- color: colorScheme.primary700,
+ color: getAccountAppBarColor(context),
onPressed: () {
Navigator.of(context).pop();
},
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 eae2078133..f46e60c140 100644
--- a/mobile/packages/accounts/lib/pages/two_factor_authentication_page.dart
+++ b/mobile/packages/accounts/lib/pages/two_factor_authentication_page.dart
@@ -71,7 +71,7 @@ class _TwoFactorAuthenticationPageState
title: const AccountAppBarLogo(),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
- color: colorScheme.primary700,
+ color: getAccountAppBarColor(context),
onPressed: () {
Navigator.of(context).pop();
},
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 92a5170465..3ea15e20d2 100644
--- a/mobile/packages/accounts/lib/pages/two_factor_recovery_page.dart
+++ b/mobile/packages/accounts/lib/pages/two_factor_recovery_page.dart
@@ -62,7 +62,7 @@ class _TwoFactorRecoveryPageState extends State<TwoFactorRecoveryPage> {
title: const AccountAppBarLogo(),
leading: IconButton(
icon: const Icon(Icons.arrow_back),
- color: colorScheme.primary700,
+ color: getAccountAppBarColor(context),
onPressed: () {
Navigator.of(context).pop();
},
diff --git a/mobile/packages/accounts/lib/widgets/account_app_bar_logo.dart b/mobile/packages/accounts/lib/widgets/account_app_bar_logo.dart
index f0b57e42a3..7f486a74e2 100644
--- a/mobile/packages/accounts/lib/widgets/account_app_bar_logo.dart
+++ b/mobile/packages/accounts/lib/widgets/account_app_bar_logo.dart
@@ -3,19 +3,22 @@ import 'package:ente_ui/theme/theme_config.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
+Color getAccountAppBarColor(BuildContext context) {
+ final colors = getEnteColorScheme(context);
+ return AppThemeConfig.currentApp == EnteApp.auth
+ ? colors.textBase
+ : colors.primary700;
+}
+
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,
+ getAccountAppBarColor(context),
BlendMode.srcIn,
),
);