Use better naming convetion
This commit is contained in:
@@ -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;
|
||||
}
|
||||
@@ -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<void> 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<void> showDetailsSheet(BuildContext context, EnteFile file) async {
|
||||
},
|
||||
);
|
||||
Bus.instance.fire(
|
||||
ToggleMemoryAnimationEvent(
|
||||
DetailsSheetEvent(
|
||||
localID: file.localID,
|
||||
uploadedFileID: file.uploadedFileID,
|
||||
pause: false,
|
||||
opened: false,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -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<FullScreenMemory> {
|
||||
final hasPointerOnScreenNotifier = ValueNotifier<bool>(false);
|
||||
bool hasFinalFileLoaded = false;
|
||||
|
||||
late final StreamSubscription<ToggleMemoryAnimationEvent>
|
||||
_toggleAnimationSubscription;
|
||||
late final StreamSubscription<DetailsSheetEvent>
|
||||
_detailSheetEventSubscription;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
@@ -167,18 +167,18 @@ class _FullScreenMemoryState extends State<FullScreenMemory> {
|
||||
_hasPointerListener,
|
||||
);
|
||||
|
||||
_toggleAnimationSubscription =
|
||||
Bus.instance.on<ToggleMemoryAnimationEvent>().listen((event) {
|
||||
_detailSheetEventSubscription =
|
||||
Bus.instance.on<DetailsSheetEvent>().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<FullScreenMemory> {
|
||||
_showTitle.dispose();
|
||||
durationNotifier.dispose();
|
||||
hasPointerOnScreenNotifier.removeListener(_hasPointerListener);
|
||||
_toggleAnimationSubscription.cancel();
|
||||
_detailSheetEventSubscription.cancel();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user