High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
chore: refactor mobile events (#24263)
Alexe3ab16a5bd78
diff --git a/mobile/lib/domain/models/events.model.dart b/mobile/lib/domain/models/events.model.dartnew file mode 100644index 0000000000..b3ab756414--- /dev/null+++ b/mobile/lib/domain/models/events.model.dart@@ -0,0 +1,32 @@+import 'package:immich_mobile/domain/utils/event_stream.dart';++// Timeline Events+class TimelineReloadEvent extends Event {+ const TimelineReloadEvent();+}++class ScrollToTopEvent extends Event {+ const ScrollToTopEvent();+}++class ScrollToDateEvent extends Event {+ final DateTime date;++ const ScrollToDateEvent(this.date);+}++// Asset Viewer Events+class ViewerOpenBottomSheetEvent extends Event {+ final bool activitiesMode;+ const ViewerOpenBottomSheetEvent({this.activitiesMode = false});+}++class ViewerReloadAssetEvent extends Event {+ const ViewerReloadAssetEvent();+}++// Multi-Select Events+class MultiSelectToggleEvent extends Event {+ final bool isEnabled;+ const MultiSelectToggleEvent(this.isEnabled);+}diff --git a/mobile/lib/domain/models/timeline.model.dart b/mobile/lib/domain/models/timeline.model.dartindex d4cc5ab5c6..c531fa4a94 100644--- a/mobile/lib/domain/models/timeline.model.dart+++ b/mobile/lib/domain/models/timeline.model.dart@@ -1,5 +1,3 @@-import 'package:immich_mobile/domain/utils/event_stream.dart';-enum GroupAssetsBy { day, month, auto, none }enum HeaderType { none, month, day, monthAndDay }@@ -31,17 +29,3 @@ class TimeBucket extends Bucket {@overrideint get hashCode => super.hashCode ^ date.hashCode;}--class TimelineReloadEvent extends Event {- const TimelineReloadEvent();-}--class ScrollToTopEvent extends Event {- const ScrollToTopEvent();-}--class ScrollToDateEvent extends Event {- final DateTime date;-- const ScrollToDateEvent(this.date);-}diff --git a/mobile/lib/domain/services/timeline.service.dart b/mobile/lib/domain/services/timeline.service.dartindex 9537fe667a..96630f1eba 100644--- a/mobile/lib/domain/services/timeline.service.dart+++ b/mobile/lib/domain/services/timeline.service.dart@@ -4,6 +4,7 @@ import 'dart:math' as math;import 'package:collection/collection.dart';import 'package:immich_mobile/constants/constants.dart';import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';+import 'package:immich_mobile/domain/models/events.model.dart';import 'package:immich_mobile/domain/models/setting.model.dart';import 'package:immich_mobile/domain/models/timeline.model.dart';import 'package:immich_mobile/domain/services/setting.service.dart';diff --git a/mobile/lib/pages/backup/drift_backup_asset_detail.page.dart b/mobile/lib/pages/backup/drift_backup_asset_detail.page.dartindex f3fdccc329..36d51c5624 100644--- a/mobile/lib/pages/backup/drift_backup_asset_detail.page.dart+++ b/mobile/lib/pages/backup/drift_backup_asset_detail.page.dart@@ -3,7 +3,7 @@ import 'package:easy_localization/easy_localization.dart';import 'package:flutter/material.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';-import 'package:immich_mobile/domain/models/timeline.model.dart';+import 'package:immich_mobile/domain/models/events.model.dart';import 'package:immich_mobile/domain/utils/event_stream.dart';import 'package:immich_mobile/extensions/build_context_extensions.dart';import 'package:immich_mobile/extensions/theme_extensions.dart';diff --git a/mobile/lib/pages/common/tab_shell.page.dart b/mobile/lib/pages/common/tab_shell.page.dartindex bbb567bd3b..2fdcec4054 100644--- a/mobile/lib/pages/common/tab_shell.page.dart+++ b/mobile/lib/pages/common/tab_shell.page.dart@@ -5,7 +5,7 @@ import 'package:easy_localization/easy_localization.dart';import 'package:flutter/material.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/constants/constants.dart';-import 'package:immich_mobile/domain/models/timeline.model.dart';+import 'package:immich_mobile/domain/models/events.model.dart';import 'package:immich_mobile/domain/utils/event_stream.dart';import 'package:immich_mobile/extensions/build_context_extensions.dart';import 'package:immich_mobile/presentation/pages/search/paginated_search.provider.dart';@@ -16,7 +16,6 @@ import 'package:immich_mobile/providers/infrastructure/people.provider.dart';import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';import 'package:immich_mobile/providers/search/search_input_focus.provider.dart';import 'package:immich_mobile/providers/tab.provider.dart';-import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';import 'package:immich_mobile/routing/router.dart';@RoutePage()diff --git a/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dartindex 290a19f584..4ba877bcba 100644--- a/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart+++ b/mobile/lib/presentation/widgets/action_buttons/archive_action_button.widget.dart@@ -2,10 +2,10 @@ import 'package:flutter/material.dart';import 'package:fluttertoast/fluttertoast.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/constants/enums.dart';+import 'package:immich_mobile/domain/models/events.model.dart';import 'package:immich_mobile/domain/utils/event_stream.dart';import 'package:immich_mobile/extensions/translate_extensions.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';-import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';import 'package:immich_mobile/providers/infrastructure/action.provider.dart';import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';import 'package:immich_mobile/widgets/common/immich_toast.dart';diff --git a/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dartindex 723700af55..8b82e5c839 100644--- a/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart+++ b/mobile/lib/presentation/widgets/action_buttons/delete_action_button.widget.dart@@ -2,11 +2,11 @@ import 'package:flutter/material.dart';import 'package:fluttertoast/fluttertoast.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/constants/enums.dart';+import 'package:immich_mobile/domain/models/events.model.dart';import 'package:immich_mobile/domain/utils/event_stream.dart';import 'package:immich_mobile/extensions/build_context_extensions.dart';import 'package:immich_mobile/extensions/translate_extensions.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';-import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';import 'package:immich_mobile/providers/infrastructure/action.provider.dart';import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';import 'package:immich_mobile/widgets/common/immich_toast.dart';diff --git a/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dartindex 3cd939aeb6..5d8ea8671c 100644--- a/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart+++ b/mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart@@ -2,10 +2,10 @@ import 'package:flutter/material.dart';import 'package:fluttertoast/fluttertoast.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/constants/enums.dart';+import 'package:immich_mobile/domain/models/events.model.dart';import 'package:immich_mobile/domain/utils/event_stream.dart';import 'package:immich_mobile/extensions/translate_extensions.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';-import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';import 'package:immich_mobile/providers/infrastructure/action.provider.dart';import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';import 'package:immich_mobile/widgets/common/immich_toast.dart';diff --git a/mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dartindex 4979df904c..a0191e2407 100644--- a/mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart+++ b/mobile/lib/presentation/widgets/action_buttons/delete_permanent_action_button.widget.dart@@ -2,10 +2,10 @@ import 'package:flutter/material.dart';import 'package:fluttertoast/fluttertoast.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/constants/enums.dart';+import 'package:immich_mobile/domain/models/events.model.dart';import 'package:immich_mobile/domain/utils/event_stream.dart';import 'package:immich_mobile/extensions/translate_extensions.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';-import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';import 'package:immich_mobile/providers/infrastructure/action.provider.dart';import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';import 'package:immich_mobile/widgets/common/immich_toast.dart';diff --git a/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dartindex ddc83cb383..20d391c4a6 100644--- a/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart+++ b/mobile/lib/presentation/widgets/action_buttons/move_to_lock_folder_action_button.widget.dart@@ -2,10 +2,10 @@ import 'package:flutter/material.dart';import 'package:fluttertoast/fluttertoast.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/constants/enums.dart';+import 'package:immich_mobile/domain/models/events.model.dart';import 'package:immich_mobile/domain/utils/event_stream.dart';import 'package:immich_mobile/extensions/translate_extensions.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';-import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';import 'package:immich_mobile/providers/infrastructure/action.provider.dart';import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';import 'package:immich_mobile/widgets/common/immich_toast.dart';diff --git a/mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dartindex df8f544601..a78ff2ccd8 100644--- a/mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dart+++ b/mobile/lib/presentation/widgets/action_buttons/trash_action_button.widget.dart@@ -2,10 +2,10 @@ import 'package:flutter/material.dart';import 'package:fluttertoast/fluttertoast.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/constants/enums.dart';+import 'package:immich_mobile/domain/models/events.model.dart';import 'package:immich_mobile/domain/utils/event_stream.dart';import 'package:immich_mobile/extensions/translate_extensions.dart';import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.dart';-import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';import 'package:immich_mobile/providers/infrastructure/action.provider.dart';import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';import 'package:immich_mobile/widgets/common/immich_toast.dart';diff --git a/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dartindex 8b04a1b05d..32147a194f 100644--- a/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart+++ b/mobile/lib/presentation/widgets/action_buttons/unarchive_action_button.widget.dart@@ -9,8 +9,8 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_buimport 'package:immich_mobile/providers/infrastructure/action.provider.dart';import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';import 'package:immich_mobile/widgets/common/immich_toast.dart';+import 'package:immich_mobile/domain/models/events.model.dart';import 'package:immich_mobile/domain/utils/event_stream.dart';-import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';// used to allow performing unarchive action from different sources (without duplicating code)Future<void> performUnArchiveAction(BuildContext context, WidgetRef ref, {required ActionSource source}) async {diff --git a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dartindex 50c4347301..70eb6699aa 100644--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart@@ -7,7 +7,7 @@ import 'package:flutter/services.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/domain/models/album/album.model.dart';import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';-import 'package:immich_mobile/domain/models/timeline.model.dart';+import 'package:immich_mobile/domain/models/events.model.dart';import 'package:immich_mobile/domain/services/timeline.service.dart';import 'package:immich_mobile/domain/utils/event_stream.dart';import 'package:immich_mobile/extensions/build_context_extensions.dart';diff --git a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dartindex d0fb1f8ba0..36e5bf67d9 100644--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.state.dart@@ -1,17 +1,7 @@import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';-import 'package:immich_mobile/domain/utils/event_stream.dart';import 'package:immich_mobile/providers/asset_viewer/video_player_controls_provider.dart';import 'package:riverpod_annotation/riverpod_annotation.dart';-class ViewerOpenBottomSheetEvent extends Event {- final bool activitiesMode;- const ViewerOpenBottomSheetEvent({this.activitiesMode = false});-}--class ViewerReloadAssetEvent extends Event {- const ViewerReloadAssetEvent();-}-class AssetViewerState {final int backgroundOpacity;final bool showingBottomSheet;diff --git a/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dartindex ab88dffab4..5114ef6fd2 100644--- a/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart+++ b/mobile/lib/presentation/widgets/asset_viewer/top_app_bar.widget.dart@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/constants/enums.dart';import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';-import 'package:immich_mobile/domain/models/timeline.model.dart';+import 'package:immich_mobile/domain/models/events.model.dart';import 'package:immich_mobile/domain/services/timeline.service.dart';import 'package:immich_mobile/domain/utils/event_stream.dart';import 'package:immich_mobile/extensions/build_context_extensions.dart';diff --git a/mobile/lib/presentation/widgets/memory/memory_bottom_info.widget.dart b/mobile/lib/presentation/widgets/memory/memory_bottom_info.widget.dartindex f067bc6bf3..b514f9f0a5 100644--- a/mobile/lib/presentation/widgets/memory/memory_bottom_info.widget.dart+++ b/mobile/lib/presentation/widgets/memory/memory_bottom_info.widget.dart@@ -3,8 +3,8 @@import 'package:auto_route/auto_route.dart';import 'package:easy_localization/easy_localization.dart';import 'package:flutter/material.dart';+import 'package:immich_mobile/domain/models/events.model.dart';import 'package:immich_mobile/domain/models/memory.model.dart';-import 'package:immich_mobile/domain/models/timeline.model.dart';import 'package:immich_mobile/domain/utils/event_stream.dart';import 'package:immich_mobile/routing/router.dart';diff --git a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart b/mobile/lib/presentation/widgets/timeline/timeline.widget.dartindex 70dd15bf7f..5868de92aa 100644--- a/mobile/lib/presentation/widgets/timeline/timeline.widget.dart+++ b/mobile/lib/presentation/widgets/timeline/timeline.widget.dart@@ -9,6 +9,7 @@ import 'package:flutter/material.dart';import 'package:flutter/rendering.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';+import 'package:immich_mobile/domain/models/events.model.dart';import 'package:immich_mobile/domain/models/setting.model.dart';import 'package:immich_mobile/domain/models/timeline.model.dart';import 'package:immich_mobile/domain/utils/event_stream.dart';diff --git a/mobile/lib/providers/timeline/multiselect.provider.dart b/mobile/lib/providers/timeline/multiselect.provider.dartindex 6949413cd9..0b3f7e610b 100644--- a/mobile/lib/providers/timeline/multiselect.provider.dart+++ b/mobile/lib/providers/timeline/multiselect.provider.dart@@ -2,7 +2,6 @@ import 'package:collection/collection.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';import 'package:immich_mobile/domain/services/timeline.service.dart';-import 'package:immich_mobile/domain/utils/event_stream.dart';import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';final multiSelectProvider = NotifierProvider<MultiSelectNotifier, MultiSelectState>(@@ -10,11 +9,6 @@ final multiSelectProvider = NotifierProvider<MultiSelectNotifier, MultiSelectStadependencies: [timelineServiceProvider],);-class MultiSelectToggleEvent extends Event {- final bool isEnabled;- const MultiSelectToggleEvent(this.isEnabled);-}-class MultiSelectState {final Set<BaseAsset> selectedAssets;final Set<BaseAsset> lockedSelectionAssets;diff --git a/mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dart b/mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dartindex 73dbbfc85b..44b547a5f1 100644--- a/mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dart+++ b/mobile/lib/widgets/common/mesmerizing_sliver_app_bar.dart@@ -4,7 +4,7 @@ import 'dart:io';import 'package:flutter/material.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';-import 'package:immich_mobile/domain/models/timeline.model.dart';+import 'package:immich_mobile/domain/models/events.model.dart';import 'package:immich_mobile/domain/services/timeline.service.dart';import 'package:immich_mobile/domain/utils/event_stream.dart';import 'package:immich_mobile/extensions/build_context_extensions.dart';diff --git a/mobile/lib/widgets/common/person_sliver_app_bar.dart b/mobile/lib/widgets/common/person_sliver_app_bar.dartindex 0f9555a101..d5a7ea7cd9 100644--- a/mobile/lib/widgets/common/person_sliver_app_bar.dart+++ b/mobile/lib/widgets/common/person_sliver_app_bar.dart@@ -6,8 +6,8 @@ import 'package:easy_localization/easy_localization.dart';import 'package:flutter/material.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';+import 'package:immich_mobile/domain/models/events.model.dart';import 'package:immich_mobile/domain/models/person.model.dart';-import 'package:immich_mobile/domain/models/timeline.model.dart';import 'package:immich_mobile/domain/services/timeline.service.dart';import 'package:immich_mobile/domain/utils/event_stream.dart';import 'package:immich_mobile/extensions/build_context_extensions.dart';diff --git a/mobile/lib/widgets/common/remote_album_sliver_app_bar.dart b/mobile/lib/widgets/common/remote_album_sliver_app_bar.dartindex c0661bad48..c486d473b0 100644--- a/mobile/lib/widgets/common/remote_album_sliver_app_bar.dart+++ b/mobile/lib/widgets/common/remote_album_sliver_app_bar.dart@@ -7,7 +7,7 @@ import 'package:easy_localization/easy_localization.dart';import 'package:flutter/material.dart';import 'package:hooks_riverpod/hooks_riverpod.dart';import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';-import 'package:immich_mobile/domain/models/timeline.model.dart';+import 'package:immich_mobile/domain/models/events.model.dart';import 'package:immich_mobile/domain/services/timeline.service.dart';import 'package:immich_mobile/domain/utils/event_stream.dart';import 'package:immich_mobile/extensions/build_context_extensions.dart';