From f08f72c46abae06eaab0a57edf0829eca6bca10e Mon Sep 17 00:00:00 2001 From: ashilkn Date: Tue, 1 Jul 2025 16:15:30 +0530 Subject: [PATCH] Use better naming convetion --- ...ation_event.dart => details_sheet_event.dart} | 10 +++++----- mobile/lib/ui/actions/file/file_actions.dart | 10 +++++----- .../lib/ui/home/memories/full_screen_memory.dart | 16 ++++++++-------- 3 files changed, 18 insertions(+), 18 deletions(-) rename mobile/lib/events/{toggle_memory_animation_event.dart => details_sheet_event.dart} (58%) diff --git a/mobile/lib/events/toggle_memory_animation_event.dart b/mobile/lib/events/details_sheet_event.dart similarity index 58% rename from mobile/lib/events/toggle_memory_animation_event.dart rename to mobile/lib/events/details_sheet_event.dart index 72a7486bb3..a3fa6fbcb3 100644 --- a/mobile/lib/events/toggle_memory_animation_event.dart +++ b/mobile/lib/events/details_sheet_event.dart @@ -1,17 +1,17 @@ import "package:photos/events/event.dart"; -class ToggleMemoryAnimationEvent extends Event { +class DetailsSheetEvent extends Event { final int? uploadedFileID; final String? localID; - final bool pause; + final bool opened; - ToggleMemoryAnimationEvent({ + DetailsSheetEvent({ required this.localID, required this.uploadedFileID, - required this.pause, + required this.opened, }); - bool isSamePhoto({required int? uploadedFileID, required String? localID}) { + bool isSameFile({required int? uploadedFileID, required String? localID}) { if (this.uploadedFileID == uploadedFileID && this.localID == localID) { return true; } diff --git a/mobile/lib/ui/actions/file/file_actions.dart b/mobile/lib/ui/actions/file/file_actions.dart index 107b12547f..8a85125c70 100644 --- a/mobile/lib/ui/actions/file/file_actions.dart +++ b/mobile/lib/ui/actions/file/file_actions.dart @@ -3,7 +3,7 @@ import "dart:async"; import "package:flutter/cupertino.dart"; import "package:modal_bottom_sheet/modal_bottom_sheet.dart"; import "package:photos/core/event_bus.dart"; -import "package:photos/events/toggle_memory_animation_event.dart"; +import "package:photos/events/details_sheet_event.dart"; import "package:photos/generated/l10n.dart"; import 'package:photos/models/file/file.dart'; import 'package:photos/models/file/file_type.dart'; @@ -141,10 +141,10 @@ Future showDetailsSheet(BuildContext context, EnteFile file) async { guardedCheckPanorama(file).ignore(); final colorScheme = getEnteColorScheme(context); Bus.instance.fire( - ToggleMemoryAnimationEvent( + DetailsSheetEvent( localID: file.localID, uploadedFileID: file.uploadedFileID, - pause: true, + opened: true, ), ); await showBarModalBottomSheet( @@ -166,10 +166,10 @@ Future showDetailsSheet(BuildContext context, EnteFile file) async { }, ); Bus.instance.fire( - ToggleMemoryAnimationEvent( + DetailsSheetEvent( localID: file.localID, uploadedFileID: file.uploadedFileID, - pause: false, + opened: false, ), ); } diff --git a/mobile/lib/ui/home/memories/full_screen_memory.dart b/mobile/lib/ui/home/memories/full_screen_memory.dart index 58cf249ec6..0fa74931a8 100644 --- a/mobile/lib/ui/home/memories/full_screen_memory.dart +++ b/mobile/lib/ui/home/memories/full_screen_memory.dart @@ -7,8 +7,8 @@ import "package:flutter/cupertino.dart"; import "package:flutter/material.dart"; import "package:photos/core/configuration.dart"; import "package:photos/core/event_bus.dart"; +import "package:photos/events/details_sheet_event.dart"; import "package:photos/events/reset_zoom_of_photo_view_event.dart"; -import "package:photos/events/toggle_memory_animation_event.dart"; import "package:photos/models/file/file_type.dart"; import "package:photos/models/memories/memory.dart"; import "package:photos/service_locator.dart"; @@ -154,8 +154,8 @@ class _FullScreenMemoryState extends State { final hasPointerOnScreenNotifier = ValueNotifier(false); bool hasFinalFileLoaded = false; - late final StreamSubscription - _toggleAnimationSubscription; + late final StreamSubscription + _detailSheetEventSubscription; @override void initState() { @@ -167,18 +167,18 @@ class _FullScreenMemoryState extends State { _hasPointerListener, ); - _toggleAnimationSubscription = - Bus.instance.on().listen((event) { + _detailSheetEventSubscription = + Bus.instance.on().listen((event) { final inheritedData = FullScreenMemoryData.of(context); if (inheritedData == null) return; final index = inheritedData.indexNotifier.value; final currentFile = inheritedData.memories[index].file; - if (event.isSamePhoto( + if (event.isSameFile( uploadedFileID: currentFile.uploadedFileID, localID: currentFile.localID, )) { - _toggleAnimation(pause: event.pause); + _toggleAnimation(pause: event.opened); } }); } @@ -188,7 +188,7 @@ class _FullScreenMemoryState extends State { _showTitle.dispose(); durationNotifier.dispose(); hasPointerOnScreenNotifier.removeListener(_hasPointerListener); - _toggleAnimationSubscription.cancel(); + _detailSheetEventSubscription.cancel(); super.dispose(); }