From 699fdd0d1be17ef2c15fd056628fd8ff3837c664 Mon Sep 17 00:00:00 2001 From: Matthew Momjian <50788000+mmomjian@users.noreply.github.com> Date: Wed, 23 Apr 2025 07:38:25 -0400 Subject: [PATCH] fix(mobile): recently added -> taken (#17780) --- i18n/en.json | 2 ++ mobile/lib/interfaces/asset.interface.dart | 2 +- ...ntly_added.page.dart => recently_taken.page.dart} | 10 +++++----- mobile/lib/pages/search/search.page.dart | 4 ++-- ...vider.dart => recently_taken_asset.provider.dart} | 4 ++-- mobile/lib/repositories/asset.repository.dart | 2 +- mobile/lib/routing/router.dart | 4 ++-- mobile/lib/routing/router.gr.dart | 12 ++++++------ mobile/lib/services/asset.service.dart | 4 ++-- 9 files changed, 23 insertions(+), 21 deletions(-) rename mobile/lib/pages/search/{recently_added.page.dart => recently_taken.page.dart} (74%) rename mobile/lib/providers/search/{recently_added_asset.provider.dart => recently_taken_asset.provider.dart} (68%) diff --git a/i18n/en.json b/i18n/en.json index 883b69dff51..eafb3415d58 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1432,6 +1432,8 @@ "recent_searches": "Recent searches", "recently_added": "Recently added", "recently_added_page_title": "Recently Added", + "recently_taken": "Recently taken", + "recently_taken_page_title": "Recently Taken", "refresh": "Refresh", "refresh_encoded_videos": "Refresh encoded videos", "refresh_faces": "Refresh faces", diff --git a/mobile/lib/interfaces/asset.interface.dart b/mobile/lib/interfaces/asset.interface.dart index 76744c91726..ca9e9d64fb7 100644 --- a/mobile/lib/interfaces/asset.interface.dart +++ b/mobile/lib/interfaces/asset.interface.dart @@ -61,7 +61,7 @@ abstract interface class IAssetRepository implements IDatabaseRepository { Future> getTrashAssets(String userId); - Future> getRecentlyAddedAssets(String userId); + Future> getRecentlyTakenAssets(String userId); Future> getMotionAssets(String userId); } diff --git a/mobile/lib/pages/search/recently_added.page.dart b/mobile/lib/pages/search/recently_taken.page.dart similarity index 74% rename from mobile/lib/pages/search/recently_added.page.dart rename to mobile/lib/pages/search/recently_taken.page.dart index b79527e222d..cc1eb7086e7 100644 --- a/mobile/lib/pages/search/recently_added.page.dart +++ b/mobile/lib/pages/search/recently_taken.page.dart @@ -4,19 +4,19 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/extensions/asyncvalue_extensions.dart'; import 'package:immich_mobile/widgets/asset_grid/immich_asset_grid.dart'; -import 'package:immich_mobile/providers/search/recently_added_asset.provider.dart'; +import 'package:immich_mobile/providers/search/recently_taken_asset.provider.dart'; @RoutePage() -class RecentlyAddedPage extends HookConsumerWidget { - const RecentlyAddedPage({super.key}); +class RecentlyTakenPage extends HookConsumerWidget { + const RecentlyTakenPage({super.key}); @override Widget build(BuildContext context, WidgetRef ref) { - final recents = ref.watch(recentlyAddedAssetProvider); + final recents = ref.watch(recentlyTakenAssetProvider); return Scaffold( appBar: AppBar( - title: const Text('recently_added_page_title').tr(), + title: const Text('recently_taken_page_title').tr(), leading: IconButton( onPressed: () => context.maybePop(), icon: const Icon(Icons.arrow_back_ios_rounded), diff --git a/mobile/lib/pages/search/search.page.dart b/mobile/lib/pages/search/search.page.dart index 62a62d6c988..f7a87803de2 100644 --- a/mobile/lib/pages/search/search.page.dart +++ b/mobile/lib/pages/search/search.page.dart @@ -843,10 +843,10 @@ class QuickLinkList extends StatelessWidget { physics: const NeverScrollableScrollPhysics(), children: [ QuickLink( - title: 'recently_added'.tr(), + title: 'recently_taken'.tr(), icon: Icons.schedule_outlined, isTop: true, - onTap: () => context.pushRoute(const RecentlyAddedRoute()), + onTap: () => context.pushRoute(const RecentlyTakenRoute()), ), QuickLink( title: 'videos'.tr(), diff --git a/mobile/lib/providers/search/recently_added_asset.provider.dart b/mobile/lib/providers/search/recently_taken_asset.provider.dart similarity index 68% rename from mobile/lib/providers/search/recently_added_asset.provider.dart rename to mobile/lib/providers/search/recently_taken_asset.provider.dart index c4819d9d447..157e7c2a745 100644 --- a/mobile/lib/providers/search/recently_added_asset.provider.dart +++ b/mobile/lib/providers/search/recently_taken_asset.provider.dart @@ -2,8 +2,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/services/asset.service.dart'; -final recentlyAddedAssetProvider = FutureProvider>((ref) async { +final recentlyTakenAssetProvider = FutureProvider>((ref) async { final assetService = ref.read(assetServiceProvider); - return assetService.getRecentlyAddedAssets(); + return assetService.getRecentlyTakenAssets(); }); diff --git a/mobile/lib/repositories/asset.repository.dart b/mobile/lib/repositories/asset.repository.dart index cda2b25e4d1..60e5d09bcdd 100644 --- a/mobile/lib/repositories/asset.repository.dart +++ b/mobile/lib/repositories/asset.repository.dart @@ -225,7 +225,7 @@ class AssetRepository extends DatabaseRepository implements IAssetRepository { } @override - Future> getRecentlyAddedAssets(String userId) { + Future> getRecentlyTakenAssets(String userId) { return db.assets .where() .ownerIdEqualToAnyChecksum(fastHash(userId)) diff --git a/mobile/lib/routing/router.dart b/mobile/lib/routing/router.dart index d7edc6fd28c..fcfe7e59bd4 100644 --- a/mobile/lib/routing/router.dart +++ b/mobile/lib/routing/router.dart @@ -58,7 +58,7 @@ import 'package:immich_mobile/pages/search/all_videos.page.dart'; import 'package:immich_mobile/pages/search/map/map.page.dart'; import 'package:immich_mobile/pages/search/map/map_location_picker.page.dart'; import 'package:immich_mobile/pages/search/person_result.page.dart'; -import 'package:immich_mobile/pages/search/recently_added.page.dart'; +import 'package:immich_mobile/pages/search/recently_taken.page.dart'; import 'package:immich_mobile/pages/search/search.page.dart'; import 'package:immich_mobile/pages/share_intent/share_intent.page.dart'; import 'package:immich_mobile/providers/api.provider.dart'; @@ -160,7 +160,7 @@ class AppRouter extends RootStackRouter { guards: [_authGuard, _duplicateGuard], ), AutoRoute( - page: RecentlyAddedRoute.page, + page: RecentlyTakenRoute.page, guards: [_authGuard, _duplicateGuard], ), CustomRoute( diff --git a/mobile/lib/routing/router.gr.dart b/mobile/lib/routing/router.gr.dart index 89e83e8159b..01ab3fa13c0 100644 --- a/mobile/lib/routing/router.gr.dart +++ b/mobile/lib/routing/router.gr.dart @@ -1407,20 +1407,20 @@ class PlacesCollectionRouteArgs { } /// generated route for -/// [RecentlyAddedPage] -class RecentlyAddedRoute extends PageRouteInfo { - const RecentlyAddedRoute({List? children}) +/// [RecentlyTakenPage] +class RecentlyTakenRoute extends PageRouteInfo { + const RecentlyTakenRoute({List? children}) : super( - RecentlyAddedRoute.name, + RecentlyTakenRoute.name, initialChildren: children, ); - static const String name = 'RecentlyAddedRoute'; + static const String name = 'RecentlyTakenRoute'; static PageInfo page = PageInfo( name, builder: (data) { - return const RecentlyAddedPage(); + return const RecentlyTakenPage(); }, ); } diff --git a/mobile/lib/services/asset.service.dart b/mobile/lib/services/asset.service.dart index d187284d07f..4bf62eca310 100644 --- a/mobile/lib/services/asset.service.dart +++ b/mobile/lib/services/asset.service.dart @@ -514,9 +514,9 @@ class AssetService { return _assetRepository.watchAsset(id, fireImmediately: fireImmediately); } - Future> getRecentlyAddedAssets() { + Future> getRecentlyTakenAssets() { final me = _userService.getMyUser(); - return _assetRepository.getRecentlyAddedAssets(me.id); + return _assetRepository.getRecentlyTakenAssets(me.id); } Future> getMotionAssets() {