Skip to content

armgit / ente

Public Imported from GitHub
0

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

Refine Auth settings navigation on desktop

Neeraj Gupta07756b3ef060
diff --git a/mobile/apps/auth/lib/ui/settings/components/auth_settings_navigation.dart b/mobile/apps/auth/lib/ui/settings/components/auth_settings_navigation.dart
index c65d62140f..2ce8e7b2e9 100644
--- a/mobile/apps/auth/lib/ui/settings/components/auth_settings_navigation.dart
+++ b/mobile/apps/auth/lib/ui/settings/components/auth_settings_navigation.dart
@@ -1,7 +1,29 @@
+import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
-Future<void> pushAuthSettingsPage(BuildContext context, Widget page) async {
- await Navigator.of(
- context,
- ).push<void>(MaterialPageRoute<void>(builder: (_) => page));
+Future<T?> pushAuthSettingsPage<T extends Object?>(
+ BuildContext context,
+ Widget page,
+) {
+ return Navigator.of(context).push<T>(_settingsPageRoute(page));
}
+
+Route<T> _settingsPageRoute<T extends Object?>(Widget page) {
+ if (_isDesktop) {
+ return PageRouteBuilder<T>(
+ pageBuilder: (_, _, _) => page,
+ transitionDuration: const Duration(milliseconds: 150),
+ reverseTransitionDuration: const Duration(milliseconds: 100),
+ transitionsBuilder: (_, animation, _, child) =>
+ FadeTransition(opacity: animation, child: child),
+ );
+ }
+ return MaterialPageRoute<T>(builder: (_) => page);
+}
+
+bool get _isDesktop => switch (defaultTargetPlatform) {
+ TargetPlatform.linux ||
+ TargetPlatform.macOS ||
+ TargetPlatform.windows => true,
+ _ => false,
+};
diff --git a/mobile/apps/auth/lib/ui/settings/components/auth_settings_page_scaffold.dart b/mobile/apps/auth/lib/ui/settings/components/auth_settings_page_scaffold.dart
index c9032d9fcc..d080dfc3e2 100644
--- a/mobile/apps/auth/lib/ui/settings/components/auth_settings_page_scaffold.dart
+++ b/mobile/apps/auth/lib/ui/settings/components/auth_settings_page_scaffold.dart
@@ -23,9 +23,9 @@ class AuthSettingsPageScaffold extends StatelessWidget {
final colors = context.componentColors;
return LayoutBuilder(
builder: (context, constraints) {
- final horizontalPadding = math.max(
+ final rightPadding = math.max(
Spacing.lg,
- (constraints.maxWidth - _maxContentWidth) / 2,
+ constraints.maxWidth - Spacing.lg - _maxContentWidth,
);
return Scaffold(
@@ -34,15 +34,15 @@ class AuthSettingsPageScaffold extends StatelessWidget {
title: title,
subtitle: subtitle,
backButton: backButton,
- horizontalPadding: horizontalPadding,
+ horizontalPadding: Spacing.lg,
slivers: [
SliverSafeArea(
top: false,
sliver: SliverPadding(
padding: EdgeInsets.fromLTRB(
- horizontalPadding,
+ Spacing.lg,
0,
- horizontalPadding,
+ rightPadding,
Spacing.lg,
),
sliver: SliverList.list(children: children),
diff --git a/mobile/apps/auth/lib/ui/settings_page.dart b/mobile/apps/auth/lib/ui/settings_page.dart
index fe03b1be4c..b1a46065d0 100644
--- a/mobile/apps/auth/lib/ui/settings_page.dart
+++ b/mobile/apps/auth/lib/ui/settings_page.dart
@@ -205,9 +205,10 @@ class SettingsPage extends StatelessWidget {
}
Future<void> _openDataSettings(BuildContext context) async {
- final completed = await Navigator.of(
+ final completed = await pushAuthSettingsPage<bool>(
context,
- ).push<bool>(MaterialPageRoute(builder: (_) => const DataSettingsPage()));
+ const DataSettingsPage(),
+ );
if (completed == true) {
scaffoldKey.currentState?.closeDrawer();
}