Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-05-31 12:15:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflict

Browse Source
This commit is contained in:
Alex Tran 2022-02-27 12:49:18 -06:00
parent e608c61ba5
commit bd34be92e6
3 changed files with 0 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
mobile/lib/modules/search/providers/search_page_state.provider.dart
View File

@ -3,47 +3,32 @@ import 'dart:convert';
import 'package:collection/collection.dart'; import 'package:collection/collection.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
<<<<<<< HEAD
=======
import 'package:immich_mobile/modules/search/services/search.service.dart'; import 'package:immich_mobile/modules/search/services/search.service.dart';
>>>>>>> bfde3084924e247bc8f7004babf38605fe341a18
class SearchPageState { class SearchPageState {
final String searchTerm; final String searchTerm;
final bool isSearchEnabled; final bool isSearchEnabled;
final List<String> searchSuggestion; final List<String> searchSuggestion;
<<<<<<< HEAD
=======
final List<String> userSuggestedSearchTerms; final List<String> userSuggestedSearchTerms;
>>>>>>> bfde3084924e247bc8f7004babf38605fe341a18
SearchPageState({ SearchPageState({
required this.searchTerm, required this.searchTerm,
required this.isSearchEnabled, required this.isSearchEnabled,
required this.searchSuggestion, required this.searchSuggestion,
<<<<<<< HEAD
=======
required this.userSuggestedSearchTerms, required this.userSuggestedSearchTerms,
>>>>>>> bfde3084924e247bc8f7004babf38605fe341a18
}); });
SearchPageState copyWith({ SearchPageState copyWith({
String? searchTerm, String? searchTerm,
bool? isSearchEnabled, bool? isSearchEnabled,
List<String>? searchSuggestion, List<String>? searchSuggestion,
<<<<<<< HEAD
=======
List<String>? userSuggestedSearchTerms, List<String>? userSuggestedSearchTerms,
>>>>>>> bfde3084924e247bc8f7004babf38605fe341a18
}) { }) {
return SearchPageState( return SearchPageState(
searchTerm: searchTerm ?? this.searchTerm, searchTerm: searchTerm ?? this.searchTerm,
isSearchEnabled: isSearchEnabled ?? this.isSearchEnabled, isSearchEnabled: isSearchEnabled ?? this.isSearchEnabled,
searchSuggestion: searchSuggestion ?? this.searchSuggestion, searchSuggestion: searchSuggestion ?? this.searchSuggestion,
<<<<<<< HEAD
=======
userSuggestedSearchTerms: userSuggestedSearchTerms ?? this.userSuggestedSearchTerms, userSuggestedSearchTerms: userSuggestedSearchTerms ?? this.userSuggestedSearchTerms,
>>>>>>> bfde3084924e247bc8f7004babf38605fe341a18
); );
} }
@ -52,10 +37,7 @@ class SearchPageState {
'searchTerm': searchTerm, 'searchTerm': searchTerm,
'isSearchEnabled': isSearchEnabled, 'isSearchEnabled': isSearchEnabled,
'searchSuggestion': searchSuggestion, 'searchSuggestion': searchSuggestion,
<<<<<<< HEAD
=======
'userSuggestedSearchTerms': userSuggestedSearchTerms, 'userSuggestedSearchTerms': userSuggestedSearchTerms,
>>>>>>> bfde3084924e247bc8f7004babf38605fe341a18
}; };
} }
@ -64,10 +46,7 @@ class SearchPageState {
searchTerm: map['searchTerm'] ?? '', searchTerm: map['searchTerm'] ?? '',
isSearchEnabled: map['isSearchEnabled'] ?? false, isSearchEnabled: map['isSearchEnabled'] ?? false,
searchSuggestion: List<String>.from(map['searchSuggestion']), searchSuggestion: List<String>.from(map['searchSuggestion']),
<<<<<<< HEAD
=======
userSuggestedSearchTerms: List<String>.from(map['userSuggestedSearchTerms']), userSuggestedSearchTerms: List<String>.from(map['userSuggestedSearchTerms']),
>>>>>>> bfde3084924e247bc8f7004babf38605fe341a18
); );
} }
@ -76,14 +55,9 @@ class SearchPageState {
factory SearchPageState.fromJson(String source) => SearchPageState.fromMap(json.decode(source)); factory SearchPageState.fromJson(String source) => SearchPageState.fromMap(json.decode(source));
@override @override
<<<<<<< HEAD
String toString() =>
'SearchPageState(searchTerm: $searchTerm, isSearchEnabled: $isSearchEnabled, searchSuggestion: $searchSuggestion)';
=======
String toString() { String toString() {
return 'SearchPageState(searchTerm: $searchTerm, isSearchEnabled: $isSearchEnabled, searchSuggestion: $searchSuggestion, userSuggestedSearchTerms: $userSuggestedSearchTerms)'; return 'SearchPageState(searchTerm: $searchTerm, isSearchEnabled: $isSearchEnabled, searchSuggestion: $searchSuggestion, userSuggestedSearchTerms: $userSuggestedSearchTerms)';
} }
>>>>>>> bfde3084924e247bc8f7004babf38605fe341a18
@override @override
bool operator ==(Object other) { bool operator ==(Object other) {
@ -93,13 +67,6 @@ class SearchPageState {
return other is SearchPageState && return other is SearchPageState &&
other.searchTerm == searchTerm && other.searchTerm == searchTerm &&
other.isSearchEnabled == isSearchEnabled && other.isSearchEnabled == isSearchEnabled &&
<<<<<<< HEAD
listEquals(other.searchSuggestion, searchSuggestion);
}
@override
int get hashCode => searchTerm.hashCode ^ isSearchEnabled.hashCode ^ searchSuggestion.hashCode;
=======
listEquals(other.searchSuggestion, searchSuggestion) && listEquals(other.searchSuggestion, searchSuggestion) &&
listEquals(other.userSuggestedSearchTerms, userSuggestedSearchTerms); listEquals(other.userSuggestedSearchTerms, userSuggestedSearchTerms);
} }
@ -111,7 +78,6 @@ class SearchPageState {
searchSuggestion.hashCode ^ searchSuggestion.hashCode ^
userSuggestedSearchTerms.hashCode; userSuggestedSearchTerms.hashCode;
} }
>>>>>>> bfde3084924e247bc8f7004babf38605fe341a18
} }
class SearchPageStateNotifier extends StateNotifier<SearchPageState> { class SearchPageStateNotifier extends StateNotifier<SearchPageState> {
@ -121,18 +87,12 @@ class SearchPageStateNotifier extends StateNotifier<SearchPageState> {
searchTerm: "", searchTerm: "",
isSearchEnabled: false, isSearchEnabled: false,
searchSuggestion: [], searchSuggestion: [],
<<<<<<< HEAD
),
);
=======
userSuggestedSearchTerms: [], userSuggestedSearchTerms: [],
), ),
); );
final SearchService _searchService = SearchService(); final SearchService _searchService = SearchService();
>>>>>>> bfde3084924e247bc8f7004babf38605fe341a18
void enableSearch() { void enableSearch() {
state = state.copyWith(isSearchEnabled: true); state = state.copyWith(isSearchEnabled: true);
} }
@ -148,11 +108,7 @@ class SearchPageStateNotifier extends StateNotifier<SearchPageState> {
} }
void _getSearchSuggestion(String searchTerm) { void _getSearchSuggestion(String searchTerm) {
<<<<<<< HEAD
var searchList = ['January', '01 2022', 'feburary', "February", 'home', '3413'];
=======
var searchList = state.userSuggestedSearchTerms; var searchList = state.userSuggestedSearchTerms;
>>>>>>> bfde3084924e247bc8f7004babf38605fe341a18
var newList = searchList.where((e) => e.toLowerCase().contains(searchTerm)); var newList = searchList.where((e) => e.toLowerCase().contains(searchTerm));
@ -162,15 +118,12 @@ class SearchPageStateNotifier extends StateNotifier<SearchPageState> {
state = state.copyWith(searchSuggestion: []); state = state.copyWith(searchSuggestion: []);
} }
} }
<<<<<<< HEAD
=======
void getSuggestedSearchTerms() async { void getSuggestedSearchTerms() async {
var userSuggestedSearchTerms = await _searchService.getUserSuggestedSearchTerms(); var userSuggestedSearchTerms = await _searchService.getUserSuggestedSearchTerms();
state = state.copyWith(userSuggestedSearchTerms: userSuggestedSearchTerms); state = state.copyWith(userSuggestedSearchTerms: userSuggestedSearchTerms);
} }
>>>>>>> bfde3084924e247bc8f7004babf38605fe341a18
} }
final searchPageStateProvider = StateNotifierProvider<SearchPageStateNotifier, SearchPageState>((ref) { final searchPageStateProvider = StateNotifierProvider<SearchPageStateNotifier, SearchPageState>((ref) {

3
mobile/lib/modules/search/ui/search_bar.dart
View File

@ -27,10 +27,7 @@ class SearchBar extends HookConsumerWidget with PreferredSizeWidget {
focusNode: searchFocusNode, focusNode: searchFocusNode,
autofocus: false, autofocus: false,
onTap: () { onTap: () {
<<<<<<< HEAD
=======
ref.watch(searchPageStateProvider.notifier).getSuggestedSearchTerms(); ref.watch(searchPageStateProvider.notifier).getSuggestedSearchTerms();
>>>>>>> bfde3084924e247bc8f7004babf38605fe341a18
ref.watch(searchPageStateProvider.notifier).enableSearch(); ref.watch(searchPageStateProvider.notifier).enableSearch();
searchFocusNode.requestFocus(); searchFocusNode.requestFocus();
}, },

7
mobile/lib/modules/search/views/search_page.dart
View File

@ -16,16 +16,9 @@ class SearchPage extends HookConsumerWidget {
final isSearchEnabled = ref.watch(searchPageStateProvider).isSearchEnabled; final isSearchEnabled = ref.watch(searchPageStateProvider).isSearchEnabled;
useEffect(() { useEffect(() {
<<<<<<< HEAD
searchFocusNode = FocusNode();
return () {
searchFocusNode.dispose();
};
=======
print("search"); print("search");
searchFocusNode = FocusNode(); searchFocusNode = FocusNode();
return () => searchFocusNode.dispose(); return () => searchFocusNode.dispose();
>>>>>>> bfde3084924e247bc8f7004babf38605fe341a18
}, []); }, []);
return Scaffold( return Scaffold(