Merge upstream/main into show-tags-in-initial

Author: prateekmedia

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

@@ -348,7 +348,7 @@ class _SetupEnterSecretKeyPageState extends State<SetupEnterSecretKeyPage> {
                     width: 400,
                     child: OutlinedButton(
                       style: OutlinedButton.styleFrom(
-                        padding: const EdgeInsets.symmetric(vertical: 8),
+                        padding: const EdgeInsets.symmetric(vertical: 0),
                       ),
                       onPressed: () async {
                         final digits =

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

@@ -104,7 +104,7 @@ class ViewQrPage extends StatelessWidget {
                     child: Padding(
                       padding: const EdgeInsets.symmetric(
                         horizontal: 16.0,
-                        vertical: 4,
+                        vertical: 0,
                       ),
                       child: Text(l10n.back),
                     ),

mobile/apps/auth/lib/ui/home/home_empty_state.dart

@@ -129,7 +129,7 @@ class HomeEmptyStateWidget extends StatelessWidget {
                                 onPressed: onScanTap,
                                 style: OutlinedButton.styleFrom(
                                   padding:
-                                      const EdgeInsets.symmetric(vertical: 8),
+                                      const EdgeInsets.symmetric(vertical: 0),
                                 ),
                                 child: Text(
                                   l10n.importScanQrCode,
@@ -144,7 +144,7 @@ class HomeEmptyStateWidget extends StatelessWidget {
                               onPressed: onManuallySetupTap,
                               style: OutlinedButton.styleFrom(
                                 padding:
-                                    const EdgeInsets.symmetric(vertical: 8),
+                                    const EdgeInsets.symmetric(vertical: 0),
                               ),
                               child: Text(
                                 l10n.importEnterSetupKey,

mobile/packages/lock_screen/lib/ui/lock_screen_options.dart

@@ -18,6 +18,7 @@ import "package:ente_ui/components/title_bar_title_widget.dart";
 import "package:ente_ui/components/title_bar_widget.dart";
 import "package:ente_ui/components/toggle_switch_widget.dart";
 import "package:ente_ui/theme/ente_theme.dart";
+import "package:ente_utils/navigation_util.dart";
 import "package:ente_utils/platform_util.dart";
 import "package:flutter/material.dart";
 
@@ -382,6 +383,4 @@ class _LockScreenOptionsState extends State<LockScreenOptions> {
       ),
     );
   }
-
-  routeToPage(BuildContext context, LockScreenAutoLock lockScreenAutoLock) {}
 }