fix: show in timeline from search page (#23440)

Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
This commit is contained in:
shenlong 2025-11-01 01:25:28 +05:30 committed by GitHub
parent b35f00f768
commit 2b33a58448
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 10 additions and 27 deletions

View File

@ -14,7 +14,6 @@ import 'package:immich_mobile/providers/infrastructure/album.provider.dart';
import 'package:immich_mobile/providers/infrastructure/memory.provider.dart'; import 'package:immich_mobile/providers/infrastructure/memory.provider.dart';
import 'package:immich_mobile/providers/infrastructure/people.provider.dart'; import 'package:immich_mobile/providers/infrastructure/people.provider.dart';
import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart'; import 'package:immich_mobile/providers/infrastructure/readonly_mode.provider.dart';
import 'package:immich_mobile/providers/routes.provider.dart';
import 'package:immich_mobile/providers/search/search_input_focus.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/tab.provider.dart';
import 'package:immich_mobile/providers/timeline/multiselect.provider.dart'; import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
@ -108,8 +107,6 @@ class _TabShellPageState extends ConsumerState<TabShellPage> {
} }
void _onNavigationSelected(TabsRouter router, int index, WidgetRef ref) { void _onNavigationSelected(TabsRouter router, int index, WidgetRef ref) {
ref.read(currentTabIndexProvider.notifier).state = index;
// On Photos page menu tapped // On Photos page menu tapped
if (router.activeIndex == kPhotoTabIndex && index == kPhotoTabIndex) { if (router.activeIndex == kPhotoTabIndex && index == kPhotoTabIndex) {
EventStream.shared.emit(const ScrollToTopEvent()); EventStream.shared.emit(const ScrollToTopEvent());

View File

@ -73,27 +73,29 @@ class DriftSearchPage extends HookConsumerWidget {
); );
} }
search() async { searchFilter(SearchFilter filter) async {
if (filter.value.isEmpty) { if (filter.isEmpty) {
return; return;
} }
if (preFilter == null && filter.value == previousFilter.value) { if (preFilter == null && filter == previousFilter.value) {
return; return;
} }
isSearching.value = true; isSearching.value = true;
ref.watch(paginatedSearchProvider.notifier).clear(); ref.watch(paginatedSearchProvider.notifier).clear();
final hasResult = await ref.watch(paginatedSearchProvider.notifier).search(filter.value); final hasResult = await ref.watch(paginatedSearchProvider.notifier).search(filter);
if (!hasResult) { if (!hasResult) {
context.showSnackBar(searchInfoSnackBar('search_no_result'.t(context: context))); context.showSnackBar(searchInfoSnackBar('search_no_result'.t(context: context)));
} }
previousFilter.value = filter.value; previousFilter.value = filter;
isSearching.value = false; isSearching.value = false;
} }
search() => searchFilter(filter.value);
loadMoreSearchResult() async { loadMoreSearchResult() async {
isSearching.value = true; isSearching.value = true;
final hasResult = await ref.watch(paginatedSearchProvider.notifier).search(filter.value); final hasResult = await ref.watch(paginatedSearchProvider.notifier).search(filter.value);
@ -108,7 +110,7 @@ class DriftSearchPage extends HookConsumerWidget {
searchPreFilter() { searchPreFilter() {
if (preFilter != null) { if (preFilter != null) {
Future.delayed(Duration.zero, () { Future.delayed(Duration.zero, () {
search(); searchFilter(preFilter);
if (preFilter.location.city != null) { if (preFilter.location.city != null) {
locationCurrentFilterWidget.value = Text(preFilter.location.city!, style: context.textTheme.labelLarge); locationCurrentFilterWidget.value = Text(preFilter.location.city!, style: context.textTheme.labelLarge);
@ -122,7 +124,7 @@ class DriftSearchPage extends HookConsumerWidget {
searchPreFilter(); searchPreFilter();
return null; return null;
}, []); }, [preFilter]);
showPeoplePicker() { showPeoplePicker() {
handleOnSelect(Set<PersonDto> value) { handleOnSelect(Set<PersonDto> value) {

View File

@ -3,14 +3,12 @@ import 'dart:async';
import 'package:auto_route/auto_route.dart'; import 'package:auto_route/auto_route.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/constants/constants.dart';
import 'package:immich_mobile/entities/asset.entity.dart'; import 'package:immich_mobile/entities/asset.entity.dart';
import 'package:immich_mobile/extensions/translate_extensions.dart'; import 'package:immich_mobile/extensions/translate_extensions.dart';
import 'package:immich_mobile/models/search/search_filter.model.dart'; import 'package:immich_mobile/models/search/search_filter.model.dart';
import 'package:immich_mobile/presentation/pages/search/paginated_search.provider.dart'; import 'package:immich_mobile/presentation/pages/search/paginated_search.provider.dart';
import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_button.widget.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/presentation/widgets/asset_viewer/asset_viewer.state.dart';
import 'package:immich_mobile/providers/routes.provider.dart';
import 'package:immich_mobile/routing/router.dart'; import 'package:immich_mobile/routing/router.dart';
class SimilarPhotosActionButton extends ConsumerWidget { class SimilarPhotosActionButton extends ConsumerWidget {
@ -38,20 +36,7 @@ class SimilarPhotosActionButton extends ConsumerWidget {
), ),
); );
/// Using and currentTabIndex to make sure we are using the correct unawaited(context.navigateTo(const DriftSearchRoute()));
/// navigation behavior. We want to be able to navigate back to the
/// main timline using View In Timeline button without the need of
/// waiting for the timeline to be rebuild. At the same time, we want
/// to refresh the search page when tapping the Similar Photos button
/// while already in the Search tab.
final currentTabIndex = (ref.read(currentTabIndexProvider.notifier).state);
if (currentTabIndex != kSearchTabIndex) {
unawaited(context.router.navigate(const DriftSearchRoute()));
ref.read(currentTabIndexProvider.notifier).state = kSearchTabIndex;
} else {
unawaited(context.router.popAndPush(const DriftSearchRoute()));
}
} }
@override @override

View File

@ -5,4 +5,3 @@ final inLockedViewProvider = StateProvider<bool>((ref) => false);
final currentRouteNameProvider = StateProvider<String?>((ref) => null); final currentRouteNameProvider = StateProvider<String?>((ref) => null);
final previousRouteNameProvider = StateProvider<String?>((ref) => null); final previousRouteNameProvider = StateProvider<String?>((ref) => null);
final previousRouteDataProvider = StateProvider<RouteSettings?>((ref) => null); final previousRouteDataProvider = StateProvider<RouteSettings?>((ref) => null);
final currentTabIndexProvider = StateProvider<int>((ref) => 0);