Skip to content

armgit / ente

Public Imported from GitHub
0

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

Share settings page scaffold across mobile apps

Neeraj Gupta18b14f142605
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 d080dfc3e2..e64cf15141 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
@@ -3,7 +3,7 @@ import 'dart:math' as math;
import 'package:ente_components/ente_components.dart';
import 'package:flutter/material.dart';
-/// Auth-local settings scaffold composed from [AppBarComponent].
+/// Applies Auth's left-aligned desktop content width to the shared scaffold.
class AuthSettingsPageScaffold extends StatelessWidget {
const AuthSettingsPageScaffold({
super.key,
@@ -20,7 +20,6 @@ class AuthSettingsPageScaffold extends StatelessWidget {
@override
Widget build(BuildContext context) {
- final colors = context.componentColors;
return LayoutBuilder(
builder: (context, constraints) {
final rightPadding = math.max(
@@ -28,28 +27,12 @@ class AuthSettingsPageScaffold extends StatelessWidget {
constraints.maxWidth - Spacing.lg - _maxContentWidth,
);
- return Scaffold(
- backgroundColor: colors.backgroundBase,
- body: AppBarComponent(
- title: title,
- subtitle: subtitle,
- backButton: backButton,
- horizontalPadding: Spacing.lg,
- slivers: [
- SliverSafeArea(
- top: false,
- sliver: SliverPadding(
- padding: EdgeInsets.fromLTRB(
- Spacing.lg,
- 0,
- rightPadding,
- Spacing.lg,
- ),
- sliver: SliverList.list(children: children),
- ),
- ),
- ],
- ),
+ return SettingsPageScaffold(
+ title: title,
+ subtitle: subtitle,
+ backButton: backButton,
+ padding: EdgeInsets.fromLTRB(Spacing.lg, 0, rightPadding, Spacing.lg),
+ children: children,
);
},
);
diff --git a/mobile/apps/auth/test/ui/settings/components/auth_settings_components_test.dart b/mobile/apps/auth/test/ui/settings/components/auth_settings_components_test.dart
deleted file mode 100644
index fe57b94616..0000000000
--- a/mobile/apps/auth/test/ui/settings/components/auth_settings_components_test.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-import 'package:ente_auth/ui/settings/components/auth_settings_page_scaffold.dart';
-import 'package:ente_components/ente_components.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-void main() {
- testWidgets('settings scaffold uses the component surface and renders body', (
- tester,
- ) async {
- await _pump(
- tester,
- const AuthSettingsPageScaffold(
- title: 'Data',
- children: [Text('Import codes')],
- ),
- );
-
- expect(find.text('Data'), findsOneWidget);
- expect(find.text('Import codes'), findsOneWidget);
- expect(find.byType(AppBarComponent), findsOneWidget);
- final scaffold = tester.widget<Scaffold>(find.byType(Scaffold));
- expect(scaffold.backgroundColor, ColorTokens.light.backgroundBase);
- });
-}
-
-Future<void> _pump(WidgetTester tester, Widget child) {
- return tester.pumpWidget(
- MaterialApp(
- theme: ComponentTheme.lightTheme(app: ComponentApp.auth),
- home: child,
- ),
- );
-}
diff --git a/mobile/apps/locker/lib/ui/settings/language_selector_page.dart b/mobile/apps/locker/lib/ui/settings/language_selector_page.dart
index bd0b66e415..048cb29ebe 100644
--- a/mobile/apps/locker/lib/ui/settings/language_selector_page.dart
+++ b/mobile/apps/locker/lib/ui/settings/language_selector_page.dart
@@ -3,7 +3,6 @@ import "package:ente_pure_utils/ente_pure_utils.dart";
import "package:ente_strings/ente_strings.dart";
import "package:flutter/foundation.dart";
import "package:flutter/material.dart";
-import "package:locker/ui/settings/components/settings_page_scaffold.dart";
class LanguageSelectorPage extends StatelessWidget {
final List<Locale> supportedLocales;
diff --git a/mobile/apps/locker/lib/ui/settings/pages/about_page.dart b/mobile/apps/locker/lib/ui/settings/pages/about_page.dart
index 2721dde38f..095135b0ff 100644
--- a/mobile/apps/locker/lib/ui/settings/pages/about_page.dart
+++ b/mobile/apps/locker/lib/ui/settings/pages/about_page.dart
@@ -5,7 +5,6 @@ import "package:ente_utils/platform_util.dart";
import "package:flutter/material.dart";
import "package:hugeicons/hugeicons.dart";
import "package:locker/services/update_service.dart";
-import "package:locker/ui/settings/components/settings_page_scaffold.dart";
import "package:locker/ui/settings/widgets/app_update_dialog.dart";
import "package:url_launcher/url_launcher.dart";
diff --git a/mobile/apps/locker/lib/ui/settings/pages/account_settings_page.dart b/mobile/apps/locker/lib/ui/settings/pages/account_settings_page.dart
index 70bb0579c0..a29a5fcc2a 100644
--- a/mobile/apps/locker/lib/ui/settings/pages/account_settings_page.dart
+++ b/mobile/apps/locker/lib/ui/settings/pages/account_settings_page.dart
@@ -15,7 +15,6 @@ import "package:hugeicons/hugeicons.dart";
import "package:locker/services/configuration.dart";
import "package:locker/ui/components/recovery_key_sheet.dart";
import "package:locker/ui/pages/home_page.dart";
-import "package:locker/ui/settings/components/settings_page_scaffold.dart";
class AccountSettingsPage extends StatelessWidget {
const AccountSettingsPage({super.key});
diff --git a/mobile/apps/locker/lib/ui/settings/pages/general_settings_page.dart b/mobile/apps/locker/lib/ui/settings/pages/general_settings_page.dart
index 1f35e1dd40..5fd4455d08 100644
--- a/mobile/apps/locker/lib/ui/settings/pages/general_settings_page.dart
+++ b/mobile/apps/locker/lib/ui/settings/pages/general_settings_page.dart
@@ -4,7 +4,6 @@ import "package:flutter/material.dart";
import "package:hugeicons/hugeicons.dart";
import "package:locker/app.dart";
import "package:locker/core/locale.dart";
-import "package:locker/ui/settings/components/settings_page_scaffold.dart";
import "package:locker/ui/settings/language_selector_page.dart";
class GeneralSettingsPage extends StatelessWidget {
diff --git a/mobile/apps/locker/lib/ui/settings/pages/security_settings_page.dart b/mobile/apps/locker/lib/ui/settings/pages/security_settings_page.dart
index 813aaf162d..dfd19464eb 100644
--- a/mobile/apps/locker/lib/ui/settings/pages/security_settings_page.dart
+++ b/mobile/apps/locker/lib/ui/settings/pages/security_settings_page.dart
@@ -15,7 +15,6 @@ import "package:ente_utils/email_util.dart";
import "package:flutter/material.dart";
import "package:hugeicons/hugeicons.dart";
import "package:locker/services/configuration.dart";
-import "package:locker/ui/settings/components/settings_page_scaffold.dart";
import "package:locker/utils/bottom_sheet_illustration.dart";
import "package:logging/logging.dart";
diff --git a/mobile/apps/locker/lib/ui/settings/pages/support_page.dart b/mobile/apps/locker/lib/ui/settings/pages/support_page.dart
index 3b56f724b7..2359df7f6a 100644
--- a/mobile/apps/locker/lib/ui/settings/pages/support_page.dart
+++ b/mobile/apps/locker/lib/ui/settings/pages/support_page.dart
@@ -10,7 +10,6 @@ import "package:flutter/foundation.dart";
import "package:flutter/material.dart";
import "package:hugeicons/hugeicons.dart";
import "package:locker/core/constants.dart";
-import "package:locker/ui/settings/components/settings_page_scaffold.dart";
import "package:url_launcher/url_launcher_string.dart";
class SupportPage extends StatelessWidget {
diff --git a/mobile/apps/locker/lib/ui/settings/pages/theme_settings_page.dart b/mobile/apps/locker/lib/ui/settings/pages/theme_settings_page.dart
index 132238dcf9..9b6cad204b 100644
--- a/mobile/apps/locker/lib/ui/settings/pages/theme_settings_page.dart
+++ b/mobile/apps/locker/lib/ui/settings/pages/theme_settings_page.dart
@@ -3,7 +3,6 @@ import "package:ente_components/ente_components.dart";
import "package:ente_strings/ente_strings.dart";
import "package:flutter/material.dart";
import "package:hugeicons/hugeicons.dart";
-import "package:locker/ui/settings/components/settings_page_scaffold.dart";
class ThemeSettingsPage extends StatefulWidget {
const ThemeSettingsPage({super.key});
diff --git a/mobile/apps/photos/lib/ui/account/sessions_page.dart b/mobile/apps/photos/lib/ui/account/sessions_page.dart
index 78bf11d4ce..4acb4188a9 100644
--- a/mobile/apps/photos/lib/ui/account/sessions_page.dart
+++ b/mobile/apps/photos/lib/ui/account/sessions_page.dart
@@ -8,7 +8,6 @@ import 'package:photos/gateways/users/models/sessions.dart';
import 'package:photos/services/account/user_service.dart';
import 'package:photos/ui/common/loading_widget.dart';
import 'package:photos/ui/notification/toast.dart';
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
import 'package:photos/utils/dialog_util.dart';
class SessionsPage extends StatefulWidget {
diff --git a/mobile/apps/photos/lib/ui/growth/code_success_screen.dart b/mobile/apps/photos/lib/ui/growth/code_success_screen.dart
index 78fd201653..d610623f98 100644
--- a/mobile/apps/photos/lib/ui/growth/code_success_screen.dart
+++ b/mobile/apps/photos/lib/ui/growth/code_success_screen.dart
@@ -7,7 +7,6 @@ import "package:hugeicons/hugeicons.dart";
import "package:photos/gateways/storage_bonus/models/storage_bonus.dart";
import "package:photos/models/user_details.dart";
import "package:photos/ui/growth/storage_details_screen.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
import "package:photos/utils/share_util.dart";
class CodeSuccessScreen extends StatelessWidget {
diff --git a/mobile/apps/photos/lib/ui/growth/referral_screen.dart b/mobile/apps/photos/lib/ui/growth/referral_screen.dart
index d30de96dd1..d538bd8790 100644
--- a/mobile/apps/photos/lib/ui/growth/referral_screen.dart
+++ b/mobile/apps/photos/lib/ui/growth/referral_screen.dart
@@ -12,7 +12,6 @@ import "package:photos/ui/common/web_page.dart";
import "package:photos/ui/growth/apply_code_sheet.dart";
import "package:photos/ui/growth/referral_code_widget.dart";
import "package:photos/ui/growth/storage_details_screen.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
import "package:photos/utils/share_util.dart";
import "package:tuple/tuple.dart";
diff --git a/mobile/apps/photos/lib/ui/growth/storage_details_screen.dart b/mobile/apps/photos/lib/ui/growth/storage_details_screen.dart
index 00027caa60..2c3abd17aa 100644
--- a/mobile/apps/photos/lib/ui/growth/storage_details_screen.dart
+++ b/mobile/apps/photos/lib/ui/growth/storage_details_screen.dart
@@ -8,7 +8,6 @@ import "package:photos/gateways/storage_bonus/models/storage_bonus.dart";
import "package:photos/models/user_details.dart";
import "package:photos/service_locator.dart";
import "package:photos/ui/common/loading_widget.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
class StorageDetailsScreen extends StatefulWidget {
final ReferralView referralView;
diff --git a/mobile/apps/photos/lib/ui/settings/about/about_us_page.dart b/mobile/apps/photos/lib/ui/settings/about/about_us_page.dart
index 908793573d..d397c00bd9 100644
--- a/mobile/apps/photos/lib/ui/settings/about/about_us_page.dart
+++ b/mobile/apps/photos/lib/ui/settings/about/about_us_page.dart
@@ -6,7 +6,6 @@ import "package:photos/service_locator.dart";
import "package:photos/ui/common/web_page.dart";
import "package:photos/ui/notification/toast.dart";
import "package:photos/ui/settings/app_update_dialog.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
import "package:photos/utils/dialog_util.dart";
import "package:url_launcher/url_launcher.dart";
diff --git a/mobile/apps/photos/lib/ui/settings/account/account_settings_page.dart b/mobile/apps/photos/lib/ui/settings/account/account_settings_page.dart
index 9755607edc..e2c13e9116 100644
--- a/mobile/apps/photos/lib/ui/settings/account/account_settings_page.dart
+++ b/mobile/apps/photos/lib/ui/settings/account/account_settings_page.dart
@@ -13,7 +13,6 @@ import "package:photos/ui/account/change_email_dialog.dart";
import "package:photos/ui/account/password_entry_page.dart";
import "package:photos/ui/account/recovery_key_page.dart";
import "package:photos/ui/payment/subscription.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
import "package:photos/utils/dialog_util.dart";
import "package:url_launcher/url_launcher_string.dart";
diff --git a/mobile/apps/photos/lib/ui/settings/app_icon_selection_screen.dart b/mobile/apps/photos/lib/ui/settings/app_icon_selection_screen.dart
index 1f469dfe4c..5a10d320c4 100644
--- a/mobile/apps/photos/lib/ui/settings/app_icon_selection_screen.dart
+++ b/mobile/apps/photos/lib/ui/settings/app_icon_selection_screen.dart
@@ -6,7 +6,6 @@ import "package:launcher_icon_switcher/launcher_icon_switcher.dart";
import "package:logging/logging.dart";
import "package:photos/theme/ente_theme.dart";
import "package:photos/ui/common/loading_widget.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
enum AppIcon {
iconGreen("Default", "IconGreen", "assets/launcher_icon/icon-green.png"),
diff --git a/mobile/apps/photos/lib/ui/settings/appearance/appearance_settings_page.dart b/mobile/apps/photos/lib/ui/settings/appearance/appearance_settings_page.dart
index 773442843f..6bf5086b0a 100644
--- a/mobile/apps/photos/lib/ui/settings/appearance/appearance_settings_page.dart
+++ b/mobile/apps/photos/lib/ui/settings/appearance/appearance_settings_page.dart
@@ -10,7 +10,6 @@ import "package:hugeicons/hugeicons.dart";
import "package:photos/app.dart";
import "package:photos/locale.dart";
import "package:photos/ui/settings/app_icon_selection_screen.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
import "package:photos/ui/settings/gallery_settings_screen.dart";
import "package:photos/ui/settings/language_picker.dart";
diff --git a/mobile/apps/photos/lib/ui/settings/backup/backup_settings_page.dart b/mobile/apps/photos/lib/ui/settings/backup/backup_settings_page.dart
index d1f8835e2b..9aefb0b7dd 100644
--- a/mobile/apps/photos/lib/ui/settings/backup/backup_settings_page.dart
+++ b/mobile/apps/photos/lib/ui/settings/backup/backup_settings_page.dart
@@ -6,7 +6,6 @@ import "package:hugeicons/hugeicons.dart";
import "package:photos/ui/common/backup_flow_helper.dart";
import "package:photos/ui/settings/backup/backup_settings_screen.dart";
import "package:photos/ui/settings/backup/backup_status_screen.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
class BackupSettingsPage extends StatelessWidget {
const BackupSettingsPage({super.key});
diff --git a/mobile/apps/photos/lib/ui/settings/backup/backup_settings_screen.dart b/mobile/apps/photos/lib/ui/settings/backup/backup_settings_screen.dart
index 19d7c944d1..6377ffac11 100644
--- a/mobile/apps/photos/lib/ui/settings/backup/backup_settings_screen.dart
+++ b/mobile/apps/photos/lib/ui/settings/backup/backup_settings_screen.dart
@@ -10,7 +10,6 @@ import "package:photos/services/sync/local_sync_service.dart";
import "package:photos/services/sync/sync_service.dart";
import "package:photos/services/wake_lock_service.dart";
import "package:photos/ui/common/backup_flow_helper.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
import "package:photos/utils/dialog_util.dart";
class BackupSettingsScreen extends StatelessWidget {
diff --git a/mobile/apps/photos/lib/ui/settings/backup/free_space_options.dart b/mobile/apps/photos/lib/ui/settings/backup/free_space_options.dart
index 85ac93f406..070a191684 100644
--- a/mobile/apps/photos/lib/ui/settings/backup/free_space_options.dart
+++ b/mobile/apps/photos/lib/ui/settings/backup/free_space_options.dart
@@ -15,7 +15,6 @@ import "package:photos/services/deduplication_service.dart";
import "package:photos/services/files_service.dart";
import "package:photos/ui/components/models/button_type.dart";
import "package:photos/ui/notification/toast.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
import "package:photos/ui/tools/debug/app_storage_viewer.dart";
import "package:photos/ui/tools/deduplicate_page.dart";
import "package:photos/ui/tools/free_space_page.dart";
diff --git a/mobile/apps/photos/lib/ui/settings/cast/cast_settings_page.dart b/mobile/apps/photos/lib/ui/settings/cast/cast_settings_page.dart
index 4cb2844780..12fffd00e3 100644
--- a/mobile/apps/photos/lib/ui/settings/cast/cast_settings_page.dart
+++ b/mobile/apps/photos/lib/ui/settings/cast/cast_settings_page.dart
@@ -12,7 +12,6 @@ import "package:photos/service_locator.dart";
import "package:photos/services/collections_service.dart";
import "package:photos/theme/ente_theme.dart";
import "package:photos/ui/common/loading_widget.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
import 'package:timeago/timeago.dart' as timeago;
class CastSettingsPage extends StatelessWidget {
diff --git a/mobile/apps/photos/lib/ui/settings/components/settings_page_scaffold.dart b/mobile/apps/photos/lib/ui/settings/components/settings_page_scaffold.dart
deleted file mode 100644
index 03a11c02f3..0000000000
--- a/mobile/apps/photos/lib/ui/settings/components/settings_page_scaffold.dart
+++ /dev/null
@@ -1,57 +0,0 @@
-import "package:ente_components/ente_components.dart";
-import "package:flutter/material.dart";
-
-class SettingsPageScaffold extends StatelessWidget {
- const SettingsPageScaffold({
- super.key,
- required this.title,
- required this.children,
- this.subtitle,
- this.actions = const [],
- this.controller,
- this.onTitleTap,
- this.onTitleDoubleTap,
- this.onTitleLongPress,
- this.bottomNavigationBar,
- this.padding = const EdgeInsets.fromLTRB(16, 0, 16, 16),
- });
-
- final String title;
- final String? subtitle;
- final List<Widget> actions;
- final List<Widget> children;
- final ScrollController? controller;
- final VoidCallback? onTitleTap;
- final VoidCallback? onTitleDoubleTap;
- final VoidCallback? onTitleLongPress;
- final Widget? bottomNavigationBar;
- final EdgeInsetsGeometry padding;
-
- @override
- Widget build(BuildContext context) {
- final colors = context.componentColors;
-
- return Scaffold(
- backgroundColor: colors.backgroundBase,
- bottomNavigationBar: bottomNavigationBar,
- body: AppBarComponent(
- title: title,
- subtitle: subtitle,
- actions: actions,
- controller: controller,
- onTitleTap: onTitleTap,
- onTitleDoubleTap: onTitleDoubleTap,
- onTitleLongPress: onTitleLongPress,
- slivers: [
- SliverSafeArea(
- top: false,
- sliver: SliverPadding(
- padding: padding,
- sliver: SliverList.list(children: children),
- ),
- ),
- ],
- ),
- );
- }
-}
diff --git a/mobile/apps/photos/lib/ui/settings/gallery_settings_screen.dart b/mobile/apps/photos/lib/ui/settings/gallery_settings_screen.dart
index 05e6eef5f9..24c7c07c6f 100644
--- a/mobile/apps/photos/lib/ui/settings/gallery_settings_screen.dart
+++ b/mobile/apps/photos/lib/ui/settings/gallery_settings_screen.dart
@@ -6,7 +6,6 @@ import "package:photos/core/event_bus.dart";
import "package:photos/events/force_reload_home_gallery_event.dart";
import "package:photos/events/hide_shared_items_from_home_gallery_event.dart";
import "package:photos/service_locator.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
import "package:photos/ui/viewer/gallery/component/group/type.dart";
class GallerySettingsScreen extends StatefulWidget {
diff --git a/mobile/apps/photos/lib/ui/settings/language_picker.dart b/mobile/apps/photos/lib/ui/settings/language_picker.dart
index cd75b43439..07b1ca2c55 100644
--- a/mobile/apps/photos/lib/ui/settings/language_picker.dart
+++ b/mobile/apps/photos/lib/ui/settings/language_picker.dart
@@ -3,7 +3,6 @@ import "package:ente_pure_utils/ente_pure_utils.dart";
import "package:ente_strings/ente_strings.dart";
import "package:flutter/foundation.dart";
import "package:flutter/material.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
class LanguageSelectorPage extends StatelessWidget {
final List<Locale> supportedLocales;
diff --git a/mobile/apps/photos/lib/ui/settings/memories_settings_screen.dart b/mobile/apps/photos/lib/ui/settings/memories_settings_screen.dart
index 4bcd51b845..fb08cf3d19 100644
--- a/mobile/apps/photos/lib/ui/settings/memories_settings_screen.dart
+++ b/mobile/apps/photos/lib/ui/settings/memories_settings_screen.dart
@@ -7,7 +7,6 @@ import "package:photos/core/event_bus.dart";
import "package:photos/events/memories_changed_event.dart";
import "package:photos/service_locator.dart";
import "package:photos/services/memory_home_widget_service.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
class MemoriesSettingsScreen extends StatefulWidget {
const MemoriesSettingsScreen({super.key});
diff --git a/mobile/apps/photos/lib/ui/settings/ml/machine_learning_settings_page.dart b/mobile/apps/photos/lib/ui/settings/ml/machine_learning_settings_page.dart
index 2ae8e47b21..58a0f5c13d 100644
--- a/mobile/apps/photos/lib/ui/settings/ml/machine_learning_settings_page.dart
+++ b/mobile/apps/photos/lib/ui/settings/ml/machine_learning_settings_page.dart
@@ -16,7 +16,6 @@ import "package:photos/services/remote_assets_service.dart";
import "package:photos/services/wake_lock_service.dart";
import "package:photos/ui/common/loading_widget.dart";
import "package:photos/ui/common/web_page.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
import "package:photos/ui/settings/ml/ml_user_dev_screen.dart";
import "package:photos/utils/ml_util.dart";
import "package:photos/utils/network_util.dart";
diff --git a/mobile/apps/photos/lib/ui/settings/ml/ml_user_dev_screen.dart b/mobile/apps/photos/lib/ui/settings/ml/ml_user_dev_screen.dart
index cd6588e7aa..0010ef8ea2 100644
--- a/mobile/apps/photos/lib/ui/settings/ml/ml_user_dev_screen.dart
+++ b/mobile/apps/photos/lib/ui/settings/ml/ml_user_dev_screen.dart
@@ -17,7 +17,6 @@ import "package:photos/ui/components/models/button_type.dart";
import "package:photos/ui/components/settings/settings_grouped_card.dart";
import "package:photos/ui/components/toggle_switch_widget.dart";
import "package:photos/ui/notification/toast.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
import "package:photos/utils/dialog_util.dart";
final Logger _logger = Logger("MLUserDeveloperOptions");
diff --git a/mobile/apps/photos/lib/ui/settings/notification_settings_screen.dart b/mobile/apps/photos/lib/ui/settings/notification_settings_screen.dart
index b7ba2d612a..3af13a16e0 100644
--- a/mobile/apps/photos/lib/ui/settings/notification_settings_screen.dart
+++ b/mobile/apps/photos/lib/ui/settings/notification_settings_screen.dart
@@ -3,7 +3,6 @@ import "package:ente_strings/ente_strings.dart";
import "package:flutter/material.dart";
import "package:photos/service_locator.dart";
import "package:photos/services/notification_service.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
class NotificationSettingsScreen extends StatefulWidget {
const NotificationSettingsScreen({super.key});
diff --git a/mobile/apps/photos/lib/ui/settings/pending_sync/pending_sync_info_screen.dart b/mobile/apps/photos/lib/ui/settings/pending_sync/pending_sync_info_screen.dart
index 30531e957e..7dacee137f 100644
--- a/mobile/apps/photos/lib/ui/settings/pending_sync/pending_sync_info_screen.dart
+++ b/mobile/apps/photos/lib/ui/settings/pending_sync/pending_sync_info_screen.dart
@@ -4,7 +4,6 @@ import "package:flutter/material.dart";
import "package:photos/core/configuration.dart";
import "package:photos/service_locator.dart";
import "package:photos/ui/components/menu_section_title.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
import "package:photos/ui/settings/pending_sync/path_info_storage_viewer.dart";
// Preview Video related items -> pv
diff --git a/mobile/apps/photos/lib/ui/settings/security/security_settings_page.dart b/mobile/apps/photos/lib/ui/settings/security/security_settings_page.dart
index 58741af2c5..84740de0fd 100644
--- a/mobile/apps/photos/lib/ui/settings/security/security_settings_page.dart
+++ b/mobile/apps/photos/lib/ui/settings/security/security_settings_page.dart
@@ -23,7 +23,6 @@ import "package:photos/services/account/user_service.dart";
import "package:photos/ui/account/request_pwd_verification_page.dart";
import "package:photos/ui/account/sessions_page.dart";
import "package:photos/ui/notification/toast.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
import "package:photos/utils/dialog_util.dart";
class SecuritySettingsPage extends StatefulWidget {
diff --git a/mobile/apps/photos/lib/ui/settings/streaming/video_streaming_settings_page.dart b/mobile/apps/photos/lib/ui/settings/streaming/video_streaming_settings_page.dart
index 06d99372c6..f8e5609974 100644
--- a/mobile/apps/photos/lib/ui/settings/streaming/video_streaming_settings_page.dart
+++ b/mobile/apps/photos/lib/ui/settings/streaming/video_streaming_settings_page.dart
@@ -10,7 +10,6 @@ import "package:photos/models/preview/preview_item_status.dart";
import "package:photos/services/video_preview_service.dart";
import "package:photos/ui/common/loading_widget.dart";
import "package:photos/ui/common/web_page.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
const helpUrl =
"https://ente.com/help/photos/features/utilities/video-streaming#related-faqs";
diff --git a/mobile/apps/photos/lib/ui/settings/support/help_support_page.dart b/mobile/apps/photos/lib/ui/settings/support/help_support_page.dart
index 8326632a16..a7bb944f20 100644
--- a/mobile/apps/photos/lib/ui/settings/support/help_support_page.dart
+++ b/mobile/apps/photos/lib/ui/settings/support/help_support_page.dart
@@ -9,7 +9,6 @@ import "package:photos/core/error-reporting/super_logging.dart";
import "package:photos/service_locator.dart";
import "package:photos/ui/common/web_page.dart";
import "package:photos/ui/notification/toast.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
import "package:photos/ui/settings/support/report_issue_page.dart";
import "package:photos/ui/tools/debug/log_file_viewer.dart";
import "package:photos/utils/email_util.dart";
diff --git a/mobile/apps/photos/lib/ui/settings/support/report_issue_page.dart b/mobile/apps/photos/lib/ui/settings/support/report_issue_page.dart
index 4a9df4bd07..0eab8fb679 100644
--- a/mobile/apps/photos/lib/ui/settings/support/report_issue_page.dart
+++ b/mobile/apps/photos/lib/ui/settings/support/report_issue_page.dart
@@ -6,7 +6,6 @@ import "package:hugeicons/hugeicons.dart";
import "package:logging/logging.dart";
import "package:photos/core/constants.dart";
import "package:photos/ui/notification/toast.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
import "package:photos/ui/settings/support/no_mail_app_sheet.dart";
import "package:photos/utils/email_util.dart";
diff --git a/mobile/apps/photos/lib/ui/settings/widget_settings_screen.dart b/mobile/apps/photos/lib/ui/settings/widget_settings_screen.dart
index a02217e999..7992ce66f6 100644
--- a/mobile/apps/photos/lib/ui/settings/widget_settings_screen.dart
+++ b/mobile/apps/photos/lib/ui/settings/widget_settings_screen.dart
@@ -3,7 +3,6 @@ import "package:ente_pure_utils/ente_pure_utils.dart";
import "package:ente_strings/ente_strings.dart";
import "package:flutter/material.dart";
import "package:photos/service_locator.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
import "package:photos/ui/settings/ml/machine_learning_settings_page.dart";
import "package:photos/ui/settings/widgets/albums_widget_settings.dart";
import "package:photos/ui/settings/widgets/memories_widget_settings.dart";
diff --git a/mobile/apps/photos/lib/ui/settings_page.dart b/mobile/apps/photos/lib/ui/settings_page.dart
index 7efc942661..cc492c5c6d 100644
--- a/mobile/apps/photos/lib/ui/settings_page.dart
+++ b/mobile/apps/photos/lib/ui/settings_page.dart
@@ -24,7 +24,6 @@ import "package:photos/ui/settings/appearance/appearance_settings_page.dart";
import "package:photos/ui/settings/backup/backup_settings_page.dart";
import "package:photos/ui/settings/backup/free_space_options.dart";
import "package:photos/ui/settings/cast/cast_settings_page.dart";
-import "package:photos/ui/settings/components/settings_page_scaffold.dart";
import "package:photos/ui/settings/debug/debug_settings_page.dart";
import "package:photos/ui/settings/debug/ml_debug_settings_page.dart";
import "package:photos/ui/settings/inherited_settings_state.dart";
diff --git a/mobile/apps/photos/lib/ui/tools/debug/app_storage_viewer.dart b/mobile/apps/photos/lib/ui/tools/debug/app_storage_viewer.dart
index 2a87715953..3a870aa3aa 100644
--- a/mobile/apps/photos/lib/ui/tools/debug/app_storage_viewer.dart
+++ b/mobile/apps/photos/lib/ui/tools/debug/app_storage_viewer.dart
@@ -10,7 +10,6 @@ import 'package:path_provider/path_provider.dart';
import 'package:photos/core/cache/video_cache_manager.dart';
import 'package:photos/core/configuration.dart';
import "package:photos/service_locator.dart";
-import 'package:photos/ui/settings/components/settings_page_scaffold.dart';
import 'package:photos/ui/tools/debug/path_storage_viewer.dart';
class AppStorageViewer extends StatefulWidget {
diff --git a/mobile/apps/locker/lib/ui/settings/components/settings_page_scaffold.dart b/mobile/packages/ente_components/lib/components/settings_page_scaffold.dart
similarity index 85%
rename from mobile/apps/locker/lib/ui/settings/components/settings_page_scaffold.dart
rename to mobile/packages/ente_components/lib/components/settings_page_scaffold.dart
index 03a11c02f3..76aa7abfbe 100644
--- a/mobile/apps/locker/lib/ui/settings/components/settings_page_scaffold.dart
+++ b/mobile/packages/ente_components/lib/components/settings_page_scaffold.dart
@@ -1,5 +1,6 @@
-import "package:ente_components/ente_components.dart";
-import "package:flutter/material.dart";
+import 'package:ente_components/components/app_bar_component.dart';
+import 'package:ente_components/theme/theme.dart';
+import 'package:flutter/material.dart';
class SettingsPageScaffold extends StatelessWidget {
const SettingsPageScaffold({
@@ -8,7 +9,7 @@ class SettingsPageScaffold extends StatelessWidget {
required this.children,
this.subtitle,
this.actions = const [],
- this.controller,
+ this.backButton,
this.onTitleTap,
this.onTitleDoubleTap,
this.onTitleLongPress,
@@ -19,8 +20,8 @@ class SettingsPageScaffold extends StatelessWidget {
final String title;
final String? subtitle;
final List<Widget> actions;
+ final Widget? backButton;
final List<Widget> children;
- final ScrollController? controller;
final VoidCallback? onTitleTap;
final VoidCallback? onTitleDoubleTap;
final VoidCallback? onTitleLongPress;
@@ -38,7 +39,7 @@ class SettingsPageScaffold extends StatelessWidget {
title: title,
subtitle: subtitle,
actions: actions,
- controller: controller,
+ backButton: backButton,
onTitleTap: onTitleTap,
onTitleDoubleTap: onTitleDoubleTap,
onTitleLongPress: onTitleLongPress,
diff --git a/mobile/packages/ente_components/lib/ente_components.dart b/mobile/packages/ente_components/lib/ente_components.dart
index adcc80ec63..1ff3674486 100644
--- a/mobile/packages/ente_components/lib/ente_components.dart
+++ b/mobile/packages/ente_components/lib/ente_components.dart
@@ -19,6 +19,7 @@ export 'components/selection_controls/radio_component.dart';
export 'components/selection_controls/toggle_switch_component.dart';
export 'components/selection_summary_chip_component.dart';
export 'components/settings_item.dart';
+export 'components/settings_page_scaffold.dart';
export 'components/slider_component.dart';
export 'components/stepper_component.dart';
export 'components/tag_chip_component.dart';