[mob][packages] Refractor packages/account for auth

mobile/apps/auth/lib/ente_theme_data.dart

@@ -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,

mobile/apps/auth/lib/onboarding/view/onboarding_page.dart

@@ -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,

mobile/apps/auth/lib/ui/components/auth_qr_dialog.dart

@@ -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,

mobile/apps/auth/lib/ui/home/widgets/auth_logo_widget.dart

@@ -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),
     );

mobile/apps/auth/pubspec.yaml

@@ -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:

mobile/packages/accounts/lib/pages/email_entry_page.dart

@@ -8,6 +8,7 @@ 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";
 
@@ -86,7 +87,14 @@ class _EmailEntryPageState extends State<EmailEntryPage> {
         scrolledUnderElevation: 0,
         backgroundColor: colorScheme.backgroundBase,
         centerTitle: true,
-        title: Image.asset('assets/locker-logo-blue.png', height: 24),
+        title: SvgPicture.asset(
+          'assets/svg/app-logo.svg',
+          height: 24,
+          colorFilter: ColorFilter.mode(
+            colorScheme.primary700,
+            BlendMode.srcIn,
+          ),
+        ),
         leading: IconButton(
           icon: const Icon(Icons.arrow_back),
           color: colorScheme.primary700,

mobile/packages/accounts/lib/pages/login_page.dart

@@ -7,6 +7,7 @@ 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";
@@ -85,11 +86,16 @@ class _LoginPageState extends State<LoginPage> {
       backgroundColor: colorScheme.backgroundBase,
       appBar: AppBar(
         elevation: 0,
+        scrolledUnderElevation: 0,
         backgroundColor: colorScheme.backgroundBase,
         centerTitle: true,
-        title: Image.asset(
-          'assets/locker-logo-blue.png',
+        title: SvgPicture.asset(
+          'assets/svg/app-logo.svg',
           height: 24,
+          colorFilter: ColorFilter.mode(
+            colorScheme.primary700,
+            BlendMode.srcIn,
+          ),
         ),
         leading: IconButton(
           icon: const Icon(Icons.arrow_back),

mobile/packages/accounts/lib/pages/login_pwd_verification_page.dart

@@ -10,6 +10,7 @@ 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";
 
 // LoginPasswordVerificationPage is a page that allows the user to enter their password to verify their identity.
@@ -74,11 +75,16 @@ class _LoginPasswordVerificationPageState
       backgroundColor: colorScheme.backgroundBase,
       appBar: AppBar(
         elevation: 0,
+        scrolledUnderElevation: 0,
         backgroundColor: colorScheme.backgroundBase,
         centerTitle: true,
-        title: Image.asset(
-          'assets/locker-logo-blue.png',
+        title: SvgPicture.asset(
+          'assets/svg/app-logo.svg',
           height: 24,
+          colorFilter: ColorFilter.mode(
+            colorScheme.primary700,
+            BlendMode.srcIn,
+          ),
         ),
         leading: IconButton(
           icon: const Icon(Icons.arrow_back),

mobile/packages/accounts/lib/pages/ott_verification_page.dart

@@ -4,6 +4,7 @@ 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';
 import 'package:pinput/pinput.dart';
 
 class OTTVerificationPage extends StatefulWidget {
@@ -68,11 +69,16 @@ class _OTTVerificationPageState extends State<OTTVerificationPage> {
       backgroundColor: colorScheme.backgroundBase,
       appBar: AppBar(
         elevation: 0,
+        scrolledUnderElevation: 0,
         backgroundColor: colorScheme.backgroundBase,
         centerTitle: true,
-        title: Image.asset(
-          'assets/locker-logo-blue.png',
+        title: SvgPicture.asset(
+          'assets/svg/app-logo.svg',
           height: 24,
+          colorFilter: ColorFilter.mode(
+            colorScheme.primary700,
+            BlendMode.srcIn,
+          ),
         ),
         leading: IconButton(
           icon: const Icon(Icons.arrow_back),

mobile/packages/accounts/lib/pages/passkey_page.dart

@@ -12,6 +12,7 @@ import 'package:ente_ui/utils/dialog_util.dart';
 import 'package:ente_ui/utils/toast_util.dart';
 import 'package:ente_utils/navigation_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';
 
@@ -148,11 +149,16 @@ class _PasskeyPageState extends State<PasskeyPage> {
       backgroundColor: colorScheme.backgroundBase,
       appBar: AppBar(
         elevation: 0,
+        scrolledUnderElevation: 0,
         backgroundColor: colorScheme.backgroundBase,
         centerTitle: true,
-        title: Image.asset(
-          'assets/locker-logo-blue.png',
+        title: SvgPicture.asset(
+          'assets/svg/app-logo.svg',
           height: 24,
+          colorFilter: ColorFilter.mode(
+            colorScheme.primary700,
+            BlendMode.srcIn,
+          ),
         ),
         leading: IconButton(
           icon: const Icon(Icons.arrow_back),

mobile/packages/accounts/lib/pages/password_entry_page.dart

@@ -13,6 +13,7 @@ import 'package:ente_utils/navigation_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';
@@ -113,11 +114,17 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
       resizeToAvoidBottomInset: isKeypadOpen,
       backgroundColor: colorScheme.backgroundBase,
       appBar: AppBar(
+        elevation: 0,
+        scrolledUnderElevation: 0,
         backgroundColor: colorScheme.backgroundBase,
         centerTitle: true,
-        title: Image.asset(
-          'assets/locker-logo-blue.png',
+        title: SvgPicture.asset(
+          'assets/svg/app-logo.svg',
           height: 24,
+          colorFilter: ColorFilter.mode(
+            colorScheme.primary700,
+            BlendMode.srcIn,
+          ),
         ),
         leading: widget.mode == PasswordEntryMode.reset
             ? Container()
@@ -128,7 +135,6 @@ class _PasswordEntryPageState extends State<PasswordEntryPage> {
                   Navigator.of(context).pop();
                 },
               ),
-        elevation: 0,
       ),
       body: _getBody(title),
       floatingActionButton: DynamicFAB(

mobile/packages/accounts/lib/pages/password_reentry_page.dart

@@ -14,6 +14,7 @@ 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,11 +70,16 @@ class _PasswordReentryPageState extends State<PasswordReentryPage> {
       backgroundColor: colorScheme.backgroundBase,
       appBar: AppBar(
         elevation: 0,
+        scrolledUnderElevation: 0,
         backgroundColor: colorScheme.backgroundBase,
         centerTitle: true,
-        title: Image.asset(
-          'assets/locker-logo-blue.png',
+        title: SvgPicture.asset(
+          'assets/svg/app-logo.svg',
           height: 24,
+          colorFilter: ColorFilter.mode(
+            colorScheme.primary700,
+            BlendMode.srcIn,
+          ),
         ),
         leading: IconButton(
           icon: const Icon(Icons.arrow_back),

mobile/packages/accounts/lib/pages/recovery_key_page.dart

@@ -14,6 +14,7 @@ import 'package:ente_utils/share_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:share_plus/share_plus.dart';
 
 class RecoveryKeyPage extends StatefulWidget {
@@ -88,9 +89,17 @@ class _RecoveryKeyPageState extends State<RecoveryKeyPage> {
       backgroundColor: colorScheme.backgroundBase,
       appBar: AppBar(
         elevation: 0,
+        scrolledUnderElevation: 0,
         backgroundColor: colorScheme.backgroundBase,
         centerTitle: true,
-        title: Image.asset('assets/locker-logo-blue.png', height: 24),
+        title: SvgPicture.asset(
+          'assets/svg/app-logo.svg',
+          height: 24,
+          colorFilter: ColorFilter.mode(
+            colorScheme.primary700,
+            BlendMode.srcIn,
+          ),
+        ),
         leading: widget.showAppBar == false
             ? const SizedBox.shrink()
             : IconButton(

mobile/packages/accounts/lib/pages/recovery_page.dart

@@ -10,6 +10,7 @@ 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;
@@ -80,11 +81,16 @@ class _RecoveryPageState extends State<RecoveryPage> {
       backgroundColor: colorScheme.backgroundBase,
       appBar: AppBar(
         elevation: 0,
+        scrolledUnderElevation: 0,
         backgroundColor: colorScheme.backgroundBase,
         centerTitle: true,
-        title: Image.asset(
-          'assets/locker-logo-blue.png',
+        title: SvgPicture.asset(
+          'assets/svg/app-logo.svg',
           height: 24,
+          colorFilter: ColorFilter.mode(
+            colorScheme.primary700,
+            BlendMode.srcIn,
+          ),
         ),
         leading: IconButton(
           icon: const Icon(Icons.arrow_back),

mobile/packages/accounts/lib/pages/two_factor_authentication_page.dart

@@ -5,6 +5,7 @@ import 'package:ente_ui/lifecycle_event_handler.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 {
@@ -64,11 +65,16 @@ class _TwoFactorAuthenticationPageState
       backgroundColor: colorScheme.backgroundBase,
       appBar: AppBar(
         elevation: 0,
+        scrolledUnderElevation: 0,
         backgroundColor: colorScheme.backgroundBase,
         centerTitle: true,
-        title: Image.asset(
-          'assets/locker-logo-blue.png',
+        title: SvgPicture.asset(
+          'assets/svg/app-logo.svg',
           height: 24,
+          colorFilter: ColorFilter.mode(
+            colorScheme.primary700,
+            BlendMode.srcIn,
+          ),
         ),
         leading: IconButton(
           icon: const Icon(Icons.arrow_back),
@@ -143,8 +149,9 @@ class _TwoFactorAuthenticationPageState
             children: [
               const SizedBox(height: 24),
               Image.asset(
-                'packages/ente_lock_screen/assets/locker_pin.png',
-                height: 120,
+                'assets/lock_screen_icon.png',
+                width: 129,
+                height: 95,
               ),
               const SizedBox(height: 24),
               Text(

mobile/packages/accounts/lib/pages/two_factor_recovery_page.dart

@@ -4,6 +4,7 @@ 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;
@@ -55,11 +56,16 @@ class _TwoFactorRecoveryPageState extends State<TwoFactorRecoveryPage> {
       backgroundColor: colorScheme.backgroundBase,
       appBar: AppBar(
         elevation: 0,
+        scrolledUnderElevation: 0,
         backgroundColor: colorScheme.backgroundBase,
         centerTitle: true,
-        title: Image.asset(
-          'assets/locker-logo-blue.png',
+        title: SvgPicture.asset(
+          'assets/svg/app-logo.svg',
           height: 24,
+          colorFilter: ColorFilter.mode(
+            colorScheme.primary700,
+            BlendMode.srcIn,
+          ),
         ),
         leading: IconButton(
           icon: const Icon(Icons.arrow_back),

mobile/packages/accounts/pubspec.lock

@@ -501,7 +501,7 @@ packages:
     source: hosted
     version: "0.1.3"
   flutter_svg:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: flutter_svg
       sha256: b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678

mobile/packages/accounts/pubspec.yaml

@@ -36,6 +36,7 @@ dependencies:
   file_saver: ^0.3.0
   flutter:
     sdk: flutter
+  flutter_svg: ^2.0.10+1
   hugeicons: ^1.1.1
   logging: ^1.2.0
   password_strength: ^0.2.0