Skip to content

armgit / ente

Public Imported from GitHub
0

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

Merge remote-tracking branch 'origin' into comments_and_reactions_on_memories

ashilknd75d642db4d2
diff --cc mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart
index 4548ddc40d,9c9cd62053..83fe9f1b06
--- a/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart
+++ b/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart
@@@ -3,13 -4,10 +3,12 @@@ import "dart:math"
import "dart:ui";
import "package:connectivity_plus/connectivity_plus.dart";
+import "package:ente_components/theme/text_styles.dart" as component;
import "package:ente_pure_utils/ente_pure_utils.dart";
-import "package:flutter/cupertino.dart";
+import "package:flutter/foundation.dart" show ValueListenable;
import "package:flutter/material.dart";
import "package:flutter/services.dart";
- import "package:flutter_svg/flutter_svg.dart";
+import "package:hugeicons/hugeicons.dart";
import "package:photos/core/configuration.dart";
import "package:photos/core/event_bus.dart";
import "package:photos/events/details_sheet_event.dart";
@@@ -28,15 -24,14 +27,14 @@@ import "package:photos/module/download/
import "package:photos/service_locator.dart";
import "package:photos/services/memory_share_service.dart";
import "package:photos/services/smart_memories_service.dart";
-import "package:photos/theme/colors.dart";
--import "package:photos/theme/ente_theme.dart";
-import "package:photos/theme/text_style.dart";
import "package:photos/ui/actions/file/file_actions.dart";
+import "package:photos/ui/collections/collection_action_sheet.dart";
- import "package:photos/ui/components/base_bottom_sheet.dart";
import "package:photos/ui/home/memories/custom_listener.dart";
import "package:photos/ui/home/memories/memory_progress_indicator.dart";
+ import "package:photos/ui/home/memories/memory_share_sheet.dart";
import "package:photos/ui/home/memories/memory_video_prefetcher.dart";
+import "package:photos/ui/home/memories/memory_viewer_constants.dart";
+import "package:photos/ui/social/widgets/file_social_overlay.dart";
import "package:photos/ui/viewer/file/file_widget.dart";
import "package:photos/ui/viewer/file/thumbnail_widget.dart";
import "package:photos/ui/viewer/file_details/favorite_widget.dart";
diff --cc mobile/apps/photos/lib/ui/viewer/file/detail_page.dart
index 7f021d0e0e,45d83e127b..e745c8736a
--- a/mobile/apps/photos/lib/ui/viewer/file/detail_page.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/detail_page.dart
@@@ -287,34 -302,6 +306,16 @@@ class _BodyState extends State<_Body>
},
valueListenable: _selectedIndexNotifier,
),
+ ValueListenableBuilder(
+ valueListenable: _selectedIndexNotifier,
+ builder: (BuildContext context, int selectedIndex, _) {
+ return _GallerySocialOverlay(
+ file: _files![selectedIndex],
+ mode: widget.config.mode,
+ isGuestView: isGuestView,
+ );
+ },
+ ),
- ValueListenableBuilder(
- valueListenable: _selectedIndexNotifier,
- builder: (BuildContext context, int selectedIndex, _) {
- if (widget.config.mode == DetailPageMode.minimalistic) {
- return const SizedBox.shrink();
- }
- if (flagService.ocrOverlayEnabled) {
- return InlineTextDetection(
- file: _files![selectedIndex],
- enableFullScreenNotifier: InheritedDetailPageState.of(
- context,
- ).enableFullScreenNotifier,
- isGuestView: isGuestView,
- );
- }
- return const SizedBox.shrink();
- },
- ),
if (_qrHelper != null)
ValueListenableBuilder(
valueListenable: _selectedIndexNotifier,