π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[mobile][photos] Keep album route observation in navigation service
r4khul044e1b18a3c5
diff --git a/mobile/apps/photos/lib/app.dart b/mobile/apps/photos/lib/app.dartindex f189a2ac35..7b66162052 100644--- a/mobile/apps/photos/lib/app.dart+++ b/mobile/apps/photos/lib/app.dart@@ -11,7 +11,6 @@ import 'package:logging/logging.dart';import "package:media_extension/media_extension.dart";import 'package:media_extension/media_extension_action_types.dart';import "package:photos/core/event_bus.dart";-import "package:photos/core/page_route_observer.dart";import 'package:photos/ente_theme_data.dart';import "package:photos/events/memories_changed_event.dart";import "package:photos/events/people_changed_event.dart";@@ -223,7 +222,7 @@ class _EnteAppState extends State<EnteApp> with WidgetsBindingObserver {initial: widget.savedThemeMode ?? AdaptiveThemeMode.system,builder: (lightTheme, dartTheme) => MaterialApp(navigatorKey: AppNavigationService.instance.navigatorKey,- navigatorObservers: [pageRouteObserver],+ navigatorObservers: [AppNavigationService.instance.routeObserver],title: "ente",themeMode: ThemeMode.system,theme: lightTheme,diff --git a/mobile/apps/photos/lib/core/page_route_observer.dart b/mobile/apps/photos/lib/core/page_route_observer.dartdeleted file mode 100644index 5098c70177..0000000000--- a/mobile/apps/photos/lib/core/page_route_observer.dart+++ /dev/null@@ -1,3 +0,0 @@-import "package:flutter/widgets.dart";--final pageRouteObserver = RouteObserver<PageRoute<dynamic>>();diff --git a/mobile/apps/photos/lib/services/app_navigation_service.dart b/mobile/apps/photos/lib/services/app_navigation_service.dartindex 2e9c9ce2d7..5f346c661b 100644--- a/mobile/apps/photos/lib/services/app_navigation_service.dart+++ b/mobile/apps/photos/lib/services/app_navigation_service.dart@@ -15,6 +15,7 @@ class AppNavigationService {AppNavigationService._privateConstructor();final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();+ final routeObserver = RouteObserver<PageRoute<dynamic>>();final Logger _logger = Logger("AppNavigationService");// Serialize push initiation so multi-step external launches keep their// intended stack order even when navigator attachment is delayed by unlock.diff --git a/mobile/apps/photos/lib/ui/viewer/gallery/component/album_cover_app_bar.dart b/mobile/apps/photos/lib/ui/viewer/gallery/component/album_cover_app_bar.dartindex dce7382380..e189fb4191 100644--- a/mobile/apps/photos/lib/ui/viewer/gallery/component/album_cover_app_bar.dart+++ b/mobile/apps/photos/lib/ui/viewer/gallery/component/album_cover_app_bar.dart@@ -9,10 +9,10 @@ import "package:flutter/services.dart";import "package:hugeicons/hugeicons.dart";import "package:intl/intl.dart";import "package:photos/core/constants.dart";-import "package:photos/core/page_route_observer.dart";import "package:photos/models/collection/collection.dart";import "package:photos/models/file/file.dart";import "package:photos/models/file/file_type.dart";+import "package:photos/services/app_navigation_service.dart";import "package:photos/ui/viewer/file/file_icons_widget.dart";import "package:photos/ui/viewer/file/thumbnail_widget.dart";import "package:photos/ui/viewer/gallery/state/gallery_files_inherited_widget.dart";@@ -71,7 +71,7 @@ class _AlbumCoverAppBarState extends State<AlbumCoverAppBar> with RouteAware {);final route = ModalRoute.of(context);if (route is PageRoute) {- pageRouteObserver.subscribe(this, route);+ AppNavigationService.instance.routeObserver.subscribe(this, route);}}@@ -87,7 +87,7 @@ class _AlbumCoverAppBarState extends State<AlbumCoverAppBar> with RouteAware {@overridevoid dispose() {- pageRouteObserver.unsubscribe(this);+ AppNavigationService.instance.routeObserver.unsubscribe(this);SystemChrome.setSystemUIOverlayStyle(_pinnedOverlayStyle);WidgetsBinding.instance.scheduleFrame();super.dispose();diff --git a/mobile/apps/photos/test/ui/viewer/gallery/album_cover_app_bar_test.dart b/mobile/apps/photos/test/ui/viewer/gallery/album_cover_app_bar_test.dartindex fa045fac02..a9d8c319f6 100644--- a/mobile/apps/photos/test/ui/viewer/gallery/album_cover_app_bar_test.dart+++ b/mobile/apps/photos/test/ui/viewer/gallery/album_cover_app_bar_test.dart@@ -8,11 +8,11 @@ import "package:flutter_localizations/flutter_localizations.dart";import "package:flutter_test/flutter_test.dart";import "package:intl/date_symbol_data_local.dart";import "package:photos/core/cache/thumbnail_in_memory_cache.dart";-import "package:photos/core/page_route_observer.dart";import "package:photos/ente_theme_data.dart";import "package:photos/models/api/collection/user.dart";import "package:photos/models/collection/collection.dart";import "package:photos/models/file/file.dart";+import "package:photos/services/app_navigation_service.dart";import "package:photos/ui/viewer/gallery/component/album_cover_app_bar.dart";import "package:photos/ui/viewer/gallery/state/gallery_files_inherited_widget.dart";@@ -47,7 +47,7 @@ void main() {await tester.pumpWidget(MaterialApp(theme: lightThemeData,- navigatorObservers: [pageRouteObserver],+ navigatorObservers: [AppNavigationService.instance.routeObserver],home: Scaffold(body: CustomScrollView(slivers: [