TF-548 Create abstract AutoCompleteDataSource common to all
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
|
|
||||||
import 'package:contact/contact/model/contact.dart';
|
import 'package:contact/contact/model/contact.dart';
|
||||||
|
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
||||||
import 'package:json_annotation/json_annotation.dart';
|
import 'package:json_annotation/json_annotation.dart';
|
||||||
|
|
||||||
part 'tmail_contact.g.dart';
|
part 'tmail_contact.g.dart';
|
||||||
@@ -33,4 +34,15 @@ class TMailContact extends Contact {
|
|||||||
firstname,
|
firstname,
|
||||||
surname,
|
surname,
|
||||||
emailAddress];
|
emailAddress];
|
||||||
|
}
|
||||||
|
|
||||||
|
extension TMailContactExtension on TMailContact {
|
||||||
|
|
||||||
|
String get fullName {
|
||||||
|
return '${firstname ?? ''} ${surname ?? ''}'.trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
EmailAddress toEmailAddress() {
|
||||||
|
return EmailAddress(fullName, emailAddress);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,8 +1,12 @@
|
|||||||
library contact_module;
|
library contact_module;
|
||||||
|
|
||||||
export 'package:contact/contact/model/contact.dart';
|
export 'contact/model/contact.dart';
|
||||||
export 'package:contact/contact/model/contact_filter.dart';
|
export 'contact/model/contact_filter.dart';
|
||||||
export 'package:contact/contact/model/tmail_contact.dart';
|
export 'contact/model/tmail_contact.dart';
|
||||||
|
|
||||||
export 'package:contact/contact/autocomplete/autocomplete_tmail_contact_method.dart';
|
export 'data/network/contact_api.dart';
|
||||||
export 'package:contact/contact/autocomplete/autocomplete_tmail_contact_response.dart';
|
export 'data/datasource/auto_complete_datasource.dart';
|
||||||
|
export 'data/datasource_impl/tmail_contact_datasource_impl.dart';
|
||||||
|
|
||||||
|
export 'contact/autocomplete/autocomplete_tmail_contact_method.dart';
|
||||||
|
export 'contact/autocomplete/autocomplete_tmail_contact_response.dart';
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
import 'package:contact/contact/model/tmail_contact.dart';
|
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
||||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
import 'package:model/model.dart';
|
||||||
|
|
||||||
abstract class AutoCompleteDataSource {
|
abstract class AutoCompleteDataSource {
|
||||||
Future<List<TMailContact>> getAutoComplete(AccountId accountId, String word, {int? limit});
|
Future<List<EmailAddress>> getAutoComplete(AutoCompletePattern autoCompletePattern);
|
||||||
}
|
}
|
||||||
@@ -2,7 +2,8 @@
|
|||||||
import 'package:contact/contact/model/tmail_contact.dart';
|
import 'package:contact/contact/model/tmail_contact.dart';
|
||||||
import 'package:contact/data/datasource/auto_complete_datasource.dart';
|
import 'package:contact/data/datasource/auto_complete_datasource.dart';
|
||||||
import 'package:contact/data/network/contact_api.dart';
|
import 'package:contact/data/network/contact_api.dart';
|
||||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
||||||
|
import 'package:model/autocomplete/auto_complete_pattern.dart';
|
||||||
|
|
||||||
class TMailContactDataSourceImpl extends AutoCompleteDataSource {
|
class TMailContactDataSourceImpl extends AutoCompleteDataSource {
|
||||||
|
|
||||||
@@ -11,9 +12,10 @@ class TMailContactDataSourceImpl extends AutoCompleteDataSource {
|
|||||||
TMailContactDataSourceImpl(this._contactAPI);
|
TMailContactDataSourceImpl(this._contactAPI);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<List<TMailContact>> getAutoComplete(AccountId accountId, String word, {int? limit}) {
|
Future<List<EmailAddress>> getAutoComplete(AutoCompletePattern autoCompletePattern) {
|
||||||
return Future.sync(() async {
|
return Future.sync(() async {
|
||||||
return _contactAPI.getAutoComplete(accountId, word, limit: limit);
|
final listContacts = await _contactAPI.getAutoComplete(autoCompletePattern);
|
||||||
|
return listContacts.map((contact) => contact.toEmailAddress()).toList();
|
||||||
}).catchError((error) {
|
}).catchError((error) {
|
||||||
throw error;
|
throw error;
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -4,8 +4,8 @@ import 'package:contact/contact/autocomplete/autocomplete_tmail_contact_response
|
|||||||
import 'package:contact/contact/model/contact_filter.dart';
|
import 'package:contact/contact/model/contact_filter.dart';
|
||||||
import 'package:contact/contact/model/tmail_contact.dart';
|
import 'package:contact/contact/model/tmail_contact.dart';
|
||||||
import 'package:jmap_dart_client/http/http_client.dart';
|
import 'package:jmap_dart_client/http/http_client.dart';
|
||||||
import 'package:jmap_dart_client/jmap/account_id.dart';
|
|
||||||
import 'package:jmap_dart_client/jmap/jmap_request.dart';
|
import 'package:jmap_dart_client/jmap/jmap_request.dart';
|
||||||
|
import 'package:model/autocomplete/auto_complete_pattern.dart';
|
||||||
|
|
||||||
class ContactAPI {
|
class ContactAPI {
|
||||||
|
|
||||||
@@ -13,11 +13,13 @@ class ContactAPI {
|
|||||||
|
|
||||||
ContactAPI(this._httpClient);
|
ContactAPI(this._httpClient);
|
||||||
|
|
||||||
Future<List<TMailContact>> getAutoComplete(AccountId accountId, String word, {int? limit}) async {
|
Future<List<TMailContact>> getAutoComplete(AutoCompletePattern autoCompletePattern) async {
|
||||||
final processingInvocation = ProcessingInvocation();
|
final processingInvocation = ProcessingInvocation();
|
||||||
final requestBuilder = JmapRequestBuilder(_httpClient, processingInvocation);
|
final requestBuilder = JmapRequestBuilder(_httpClient, processingInvocation);
|
||||||
|
|
||||||
final autoCompleteMethod = AutoCompleteTMailContactMethod(accountId, ContactFilter(word));
|
final autoCompleteMethod = AutoCompleteTMailContactMethod(
|
||||||
|
autoCompletePattern.accountId!,
|
||||||
|
ContactFilter(autoCompletePattern.word));
|
||||||
|
|
||||||
final autoCompleteInvocation = requestBuilder.invocation(autoCompleteMethod);
|
final autoCompleteInvocation = requestBuilder.invocation(autoCompleteMethod);
|
||||||
final response = await (requestBuilder
|
final response = await (requestBuilder
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
name: contact
|
name: contact
|
||||||
description: A module implement request
|
description: Contact Module
|
||||||
publish_to: 'none'
|
publish_to: 'none'
|
||||||
version: 0.0.1
|
version: 0.0.1
|
||||||
|
|
||||||
@@ -11,6 +11,9 @@ dependencies:
|
|||||||
flutter:
|
flutter:
|
||||||
sdk: flutter
|
sdk: flutter
|
||||||
|
|
||||||
|
model:
|
||||||
|
path: ../model
|
||||||
|
|
||||||
equatable: 2.0.3
|
equatable: 2.0.3
|
||||||
|
|
||||||
json_annotation: 4.4.0
|
json_annotation: 4.4.0
|
||||||
@@ -38,6 +41,7 @@ dev_dependencies:
|
|||||||
# The following section is specific to Flutter.
|
# The following section is specific to Flutter.
|
||||||
flutter:
|
flutter:
|
||||||
|
|
||||||
|
uses-material-design: true
|
||||||
# To add assets to your package, add an assets section, like this:
|
# To add assets to your package, add an assets section, like this:
|
||||||
# assets:
|
# assets:
|
||||||
# - images/a_dot_burr.jpeg
|
# - images/a_dot_burr.jpeg
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import 'package:jmap_dart_client/jmap/account_id.dart';
|
|||||||
import 'package:jmap_dart_client/jmap/core/id.dart';
|
import 'package:jmap_dart_client/jmap/core/id.dart';
|
||||||
import 'package:mockito/mockito.dart';
|
import 'package:mockito/mockito.dart';
|
||||||
import 'package:mockito/annotations.dart';
|
import 'package:mockito/annotations.dart';
|
||||||
|
import 'package:model/autocomplete/auto_complete_pattern.dart';
|
||||||
|
|
||||||
import 'tmail_contact_datasource_impl_test.mocks.dart';
|
import 'tmail_contact_datasource_impl_test.mocks.dart';
|
||||||
|
|
||||||
@@ -37,15 +38,17 @@ void main() {
|
|||||||
|
|
||||||
test('getAutoComplete should return success with valid data', () async {
|
test('getAutoComplete should return success with valid data', () async {
|
||||||
when(_contactAPI.getAutoComplete(
|
when(_contactAPI.getAutoComplete(
|
||||||
AccountId(Id('29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6')),
|
AutoCompletePattern(
|
||||||
'marie'
|
word: 'marie',
|
||||||
|
accountId: AccountId(Id('29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6')))
|
||||||
)).thenAnswer((_) async => [contact1, contact2]);
|
)).thenAnswer((_) async => [contact1, contact2]);
|
||||||
|
|
||||||
final result = await _tmailContactDataSourceImpl.getAutoComplete(
|
final result = await _tmailContactDataSourceImpl.getAutoComplete(
|
||||||
AccountId(Id('29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6')),
|
AutoCompletePattern(
|
||||||
'marie'
|
word: 'marie',
|
||||||
|
accountId: AccountId(Id('29883977c13473ae7cb7678ef767cbfbaffc8a44a6e463d971d23a65c1dc4af6')))
|
||||||
);
|
);
|
||||||
expect(result, [contact1, contact2]);
|
expect(result, [contact1.toEmailAddress(), contact2.toEmailAddress()]);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -6,8 +6,8 @@ import 'dart:async' as _i3;
|
|||||||
|
|
||||||
import 'package:contact/contact/model/tmail_contact.dart' as _i4;
|
import 'package:contact/contact/model/tmail_contact.dart' as _i4;
|
||||||
import 'package:contact/data/network/contact_api.dart' as _i2;
|
import 'package:contact/data/network/contact_api.dart' as _i2;
|
||||||
import 'package:jmap_dart_client/jmap/account_id.dart' as _i5;
|
|
||||||
import 'package:mockito/mockito.dart' as _i1;
|
import 'package:mockito/mockito.dart' as _i1;
|
||||||
|
import 'package:model/autocomplete/auto_complete_pattern.dart' as _i5;
|
||||||
|
|
||||||
// ignore_for_file: avoid_redundant_argument_values
|
// ignore_for_file: avoid_redundant_argument_values
|
||||||
// ignore_for_file: avoid_setters_without_getters
|
// ignore_for_file: avoid_setters_without_getters
|
||||||
@@ -28,10 +28,9 @@ class MockContactAPI extends _i1.Mock implements _i2.ContactAPI {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
_i3.Future<List<_i4.TMailContact>> getAutoComplete(
|
_i3.Future<List<_i4.TMailContact>> getAutoComplete(
|
||||||
_i5.AccountId? accountId, String? word, {int? limit}) =>
|
_i5.AutoCompletePattern? autoCompletePattern) =>
|
||||||
(super.noSuchMethod(
|
(super.noSuchMethod(
|
||||||
Invocation.method(
|
Invocation.method(#getAutoComplete, [autoCompletePattern]),
|
||||||
#getAutoComplete, [accountId, word], {#limit: limit}),
|
|
||||||
returnValue:
|
returnValue:
|
||||||
Future<List<_i4.TMailContact>>.value(<_i4.TMailContact>[]))
|
Future<List<_i4.TMailContact>>.value(<_i4.TMailContact>[]))
|
||||||
as _i3.Future<List<_i4.TMailContact>>);
|
as _i3.Future<List<_i4.TMailContact>>);
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
|
||||||
import 'package:tmail_ui_user/features/composer/domain/model/auto_complete_pattern.dart';
|
|
||||||
|
|
||||||
abstract class AutoCompleteDataSource {
|
|
||||||
Future<List<EmailAddress>> getAutoComplete(AutoCompletePattern autoCompletePattern);
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
|
|
||||||
import 'package:model/model.dart';
|
import 'package:model/model.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/model/auto_complete_pattern.dart';
|
|
||||||
|
|
||||||
abstract class ContactDataSource {
|
abstract class ContactDataSource {
|
||||||
Future<List<Contact>> getContactSuggestions(AutoCompletePattern autoCompletePattern);
|
Future<List<Contact>> getContactSuggestions(AutoCompletePattern autoCompletePattern);
|
||||||
|
|||||||
@@ -1,13 +0,0 @@
|
|||||||
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
|
||||||
import 'package:tmail_ui_user/features/composer/data/datasource/autocomplete_datasource.dart';
|
|
||||||
import 'package:tmail_ui_user/features/composer/domain/model/auto_complete_pattern.dart';
|
|
||||||
|
|
||||||
class AutoCompleteDataSourceImpl extends AutoCompleteDataSource {
|
|
||||||
|
|
||||||
AutoCompleteDataSourceImpl();
|
|
||||||
|
|
||||||
@override
|
|
||||||
Future<List<EmailAddress>> getAutoComplete(AutoCompletePattern autoCompletePattern) {
|
|
||||||
throw UnimplementedError();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -3,17 +3,16 @@ import 'package:contacts_service/contacts_service.dart' as contact_service;
|
|||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:model/model.dart';
|
import 'package:model/model.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/data/datasource/contact_datasource.dart';
|
import 'package:tmail_ui_user/features/composer/data/datasource/contact_datasource.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/model/auto_complete_pattern.dart';
|
|
||||||
|
|
||||||
class ContactDataSourceImpl extends ContactDataSource {
|
class ContactDataSourceImpl extends ContactDataSource {
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<List<Contact>> getContactSuggestions(AutoCompletePattern autoCompletePattern) async {
|
Future<List<Contact>> getContactSuggestions(AutoCompletePattern autoCompletePattern) async {
|
||||||
if (autoCompletePattern.isAll == true) {
|
if (autoCompletePattern.word.isEmpty) {
|
||||||
return <DeviceContact>[];
|
return <DeviceContact>[];
|
||||||
} else {
|
} else {
|
||||||
final suggestedList = await contact_service.ContactsService
|
final suggestedList = await contact_service.ContactsService
|
||||||
.getContactsByEmailOrName(autoCompletePattern.word ?? '');
|
.getContactsByEmailOrName(autoCompletePattern.word);
|
||||||
if (suggestedList.isNotEmpty) {
|
if (suggestedList.isNotEmpty) {
|
||||||
return suggestedList.expand((contact) => _toDeviceContact(contact)).toList();
|
return suggestedList.expand((contact) => _toDeviceContact(contact)).toList();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
|
import 'package:contact/data/datasource/auto_complete_datasource.dart';
|
||||||
import 'package:core/core.dart';
|
import 'package:core/core.dart';
|
||||||
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/data/datasource/autocomplete_datasource.dart';
|
import 'package:model/autocomplete/auto_complete_pattern.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/data/local/email_address_database_manager.dart';
|
import 'package:tmail_ui_user/features/composer/data/local/email_address_database_manager.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/model/auto_complete_pattern.dart';
|
|
||||||
|
|
||||||
class LocalAutoCompleteDataSourceImpl extends AutoCompleteDataSource {
|
class LocalAutoCompleteDataSourceImpl extends AutoCompleteDataSource {
|
||||||
|
|
||||||
@@ -13,18 +13,16 @@ class LocalAutoCompleteDataSourceImpl extends AutoCompleteDataSource {
|
|||||||
@override
|
@override
|
||||||
Future<List<EmailAddress>> getAutoComplete(AutoCompletePattern autoCompletePattern) {
|
Future<List<EmailAddress>> getAutoComplete(AutoCompletePattern autoCompletePattern) {
|
||||||
return Future.sync(() async {
|
return Future.sync(() async {
|
||||||
if (autoCompletePattern.isAll == true) {
|
if (autoCompletePattern.word.isEmpty) {
|
||||||
return await emailAddressDatabaseManager.getListData(
|
return await emailAddressDatabaseManager.getListData(
|
||||||
word: autoCompletePattern.word,
|
word: autoCompletePattern.word,
|
||||||
limit: autoCompletePattern.limit,
|
limit: autoCompletePattern.limit);
|
||||||
orderBy: autoCompletePattern.orderBy);
|
|
||||||
} else {
|
} else {
|
||||||
final condition = '${EmailAddressTable.NAME} LIKE \'%?${autoCompletePattern.word}\' OR ${EmailAddressTable.EMAIL} LIKE \'%${autoCompletePattern.word}%\'';
|
final condition = '${EmailAddressTable.NAME} LIKE \'%?${autoCompletePattern.word}\' OR ${EmailAddressTable.EMAIL} LIKE \'%${autoCompletePattern.word}%\'';
|
||||||
return await emailAddressDatabaseManager.getListDataWithCondition(
|
return await emailAddressDatabaseManager.getListDataWithCondition(
|
||||||
condition,
|
condition,
|
||||||
word: autoCompletePattern.word,
|
word: autoCompletePattern.word,
|
||||||
limit: autoCompletePattern.limit,
|
limit: autoCompletePattern.limit);
|
||||||
orderBy: autoCompletePattern.orderBy);
|
|
||||||
}
|
}
|
||||||
}).catchError((error) {
|
}).catchError((error) {
|
||||||
throw error;
|
throw error;
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
|
|
||||||
|
import 'package:contact/data/datasource/auto_complete_datasource.dart';
|
||||||
import 'package:core/core.dart';
|
import 'package:core/core.dart';
|
||||||
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/data/datasource/autocomplete_datasource.dart';
|
import 'package:model/autocomplete/auto_complete_pattern.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/model/auto_complete_pattern.dart';
|
|
||||||
import 'package:tmail_ui_user/features/composer/domain/repository/auto_complete_repository.dart';
|
import 'package:tmail_ui_user/features/composer/domain/repository/auto_complete_repository.dart';
|
||||||
|
|
||||||
class AutoCompleteRepositoryImpl extends AutoCompleteRepository {
|
class AutoCompleteRepositoryImpl extends AutoCompleteRepository {
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
|
|
||||||
import 'package:model/model.dart';
|
import 'package:model/model.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/data/datasource/contact_datasource.dart';
|
import 'package:tmail_ui_user/features/composer/data/datasource/contact_datasource.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/model/auto_complete_pattern.dart';
|
|
||||||
import 'package:tmail_ui_user/features/composer/domain/repository/contact_repository.dart';
|
import 'package:tmail_ui_user/features/composer/domain/repository/contact_repository.dart';
|
||||||
|
|
||||||
class ContactRepositoryImpl implements ContactRepository {
|
class ContactRepositoryImpl implements ContactRepository {
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
|
|
||||||
import 'package:equatable/equatable.dart';
|
|
||||||
|
|
||||||
class AutoCompletePattern with EquatableMixin {
|
|
||||||
|
|
||||||
final String? word;
|
|
||||||
final int? limit;
|
|
||||||
final String? orderBy;
|
|
||||||
final bool? isAll;
|
|
||||||
|
|
||||||
AutoCompletePattern({
|
|
||||||
this.word,
|
|
||||||
this.limit,
|
|
||||||
this.orderBy,
|
|
||||||
this.isAll,
|
|
||||||
});
|
|
||||||
|
|
||||||
@override
|
|
||||||
List<Object?> get props => [word, limit, orderBy, isAll];
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
|
|
||||||
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/model/auto_complete_pattern.dart';
|
import 'package:model/autocomplete/auto_complete_pattern.dart';
|
||||||
|
|
||||||
abstract class AutoCompleteRepository {
|
abstract class AutoCompleteRepository {
|
||||||
Future<List<EmailAddress>> getAutoComplete(AutoCompletePattern autoCompletePattern);
|
Future<List<EmailAddress>> getAutoComplete(AutoCompletePattern autoCompletePattern);
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
|
|
||||||
import 'package:model/model.dart';
|
import 'package:model/model.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/model/auto_complete_pattern.dart';
|
|
||||||
|
|
||||||
abstract class ContactRepository {
|
abstract class ContactRepository {
|
||||||
Future<List<Contact>> getContactSuggestions(AutoCompletePattern autoCompletePattern);
|
Future<List<Contact>> getContactSuggestions(AutoCompletePattern autoCompletePattern);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import 'package:core/core.dart';
|
import 'package:core/core.dart';
|
||||||
import 'package:dartz/dartz.dart';
|
import 'package:dartz/dartz.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/model/auto_complete_pattern.dart';
|
import 'package:model/autocomplete/auto_complete_pattern.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/repository/auto_complete_repository.dart';
|
import 'package:tmail_ui_user/features/composer/domain/repository/auto_complete_repository.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/state/get_autocomplete_state.dart';
|
import 'package:tmail_ui_user/features/composer/domain/state/get_autocomplete_state.dart';
|
||||||
|
|
||||||
|
|||||||
-1
@@ -3,7 +3,6 @@ import 'package:core/core.dart';
|
|||||||
import 'package:dartz/dartz.dart';
|
import 'package:dartz/dartz.dart';
|
||||||
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
||||||
import 'package:model/model.dart';
|
import 'package:model/model.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/model/auto_complete_pattern.dart';
|
|
||||||
import 'package:tmail_ui_user/features/composer/domain/state/get_autocomplete_state.dart';
|
import 'package:tmail_ui_user/features/composer/domain/state/get_autocomplete_state.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/state/get_device_contact_suggestions_state.dart';
|
import 'package:tmail_ui_user/features/composer/domain/state/get_device_contact_suggestions_state.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/usecases/get_autocomplete_interactor.dart';
|
import 'package:tmail_ui_user/features/composer/domain/usecases/get_autocomplete_interactor.dart';
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
|
|
||||||
import 'package:core/core.dart';
|
import 'package:core/core.dart';
|
||||||
import 'package:dartz/dartz.dart';
|
import 'package:dartz/dartz.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/model/auto_complete_pattern.dart';
|
import 'package:model/autocomplete/auto_complete_pattern.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/repository/contact_repository.dart';
|
import 'package:tmail_ui_user/features/composer/domain/repository/contact_repository.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/state/get_device_contact_suggestions_state.dart';
|
import 'package:tmail_ui_user/features/composer/domain/state/get_device_contact_suggestions_state.dart';
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,10 @@
|
|||||||
|
import 'package:contact/data/datasource/auto_complete_datasource.dart';
|
||||||
import 'package:core/core.dart';
|
import 'package:core/core.dart';
|
||||||
import 'package:device_info_plus/device_info_plus.dart';
|
import 'package:device_info_plus/device_info_plus.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:tmail_ui_user/features/base/base_bindings.dart';
|
import 'package:tmail_ui_user/features/base/base_bindings.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/data/datasource/autocomplete_datasource.dart';
|
|
||||||
import 'package:tmail_ui_user/features/composer/data/datasource/composer_datasource.dart';
|
import 'package:tmail_ui_user/features/composer/data/datasource/composer_datasource.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/data/datasource/contact_datasource.dart';
|
import 'package:tmail_ui_user/features/composer/data/datasource/contact_datasource.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/data/datasource_impl/autocomplete_datasource_impl.dart';
|
|
||||||
import 'package:tmail_ui_user/features/composer/data/datasource_impl/composer_datasource_impl.dart';
|
import 'package:tmail_ui_user/features/composer/data/datasource_impl/composer_datasource_impl.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/data/datasource_impl/contact_datasource_impl.dart';
|
import 'package:tmail_ui_user/features/composer/data/datasource_impl/contact_datasource_impl.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/data/datasource_impl/local_autocomplete_datasource_impl.dart';
|
import 'package:tmail_ui_user/features/composer/data/datasource_impl/local_autocomplete_datasource_impl.dart';
|
||||||
@@ -64,7 +63,6 @@ class ComposerBindings extends BaseBindings {
|
|||||||
void bindingsDataSourceImpl() {
|
void bindingsDataSourceImpl() {
|
||||||
Get.lazyPut(() => ComposerDataSourceImpl(Get.find<ComposerAPI>()));
|
Get.lazyPut(() => ComposerDataSourceImpl(Get.find<ComposerAPI>()));
|
||||||
Get.lazyPut(() => LocalComposerDataSourceImpl(Get.find<EmailAddressDatabaseManager>()));
|
Get.lazyPut(() => LocalComposerDataSourceImpl(Get.find<EmailAddressDatabaseManager>()));
|
||||||
Get.lazyPut(() => AutoCompleteDataSourceImpl());
|
|
||||||
Get.lazyPut(() => LocalAutoCompleteDataSourceImpl(Get.find<EmailAddressDatabaseManager>()));
|
Get.lazyPut(() => LocalAutoCompleteDataSourceImpl(Get.find<EmailAddressDatabaseManager>()));
|
||||||
Get.lazyPut(() => ContactDataSourceImpl());
|
Get.lazyPut(() => ContactDataSourceImpl());
|
||||||
Get.lazyPut(() => EmailDataSourceImpl(Get.find<EmailAPI>()));
|
Get.lazyPut(() => EmailDataSourceImpl(Get.find<EmailAPI>()));
|
||||||
@@ -78,7 +76,6 @@ class ComposerBindings extends BaseBindings {
|
|||||||
@override
|
@override
|
||||||
void bindingsDataSource() {
|
void bindingsDataSource() {
|
||||||
Get.lazyPut<ComposerDataSource>(() => Get.find<ComposerDataSourceImpl>());
|
Get.lazyPut<ComposerDataSource>(() => Get.find<ComposerDataSourceImpl>());
|
||||||
Get.lazyPut<AutoCompleteDataSource>(() => Get.find<AutoCompleteDataSourceImpl>());
|
|
||||||
Get.lazyPut<ContactDataSource>(() => Get.find<ContactDataSourceImpl>());
|
Get.lazyPut<ContactDataSource>(() => Get.find<ContactDataSourceImpl>());
|
||||||
Get.lazyPut<EmailDataSource>(() => Get.find<EmailDataSourceImpl>());
|
Get.lazyPut<EmailDataSource>(() => Get.find<EmailDataSourceImpl>());
|
||||||
Get.lazyPut<HtmlDataSource>(() => Get.find<HtmlDataSourceImpl>());
|
Get.lazyPut<HtmlDataSource>(() => Get.find<HtmlDataSourceImpl>());
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
|||||||
import 'package:model/model.dart';
|
import 'package:model/model.dart';
|
||||||
import 'package:permission_handler/permission_handler.dart';
|
import 'package:permission_handler/permission_handler.dart';
|
||||||
import 'package:tmail_ui_user/features/base/base_controller.dart';
|
import 'package:tmail_ui_user/features/base/base_controller.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/model/auto_complete_pattern.dart';
|
|
||||||
import 'package:tmail_ui_user/features/composer/domain/model/contact_suggestion_source.dart';
|
import 'package:tmail_ui_user/features/composer/domain/model/contact_suggestion_source.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/model/email_request.dart';
|
import 'package:tmail_ui_user/features/composer/domain/model/email_request.dart';
|
||||||
import 'package:tmail_ui_user/features/composer/domain/state/get_autocomplete_state.dart';
|
import 'package:tmail_ui_user/features/composer/domain/state/get_autocomplete_state.dart';
|
||||||
@@ -586,15 +585,16 @@ class ComposerController extends BaseController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<List<EmailAddress>> getAutoCompleteSuggestion({String? word, bool? isAll}) async {
|
Future<List<EmailAddress>> getAutoCompleteSuggestion(
|
||||||
|
{required String word}) async {
|
||||||
if (_contactSuggestionSource == ContactSuggestionSource.all) {
|
if (_contactSuggestionSource == ContactSuggestionSource.all) {
|
||||||
return await _getAutoCompleteWithDeviceContactInteractor
|
return await _getAutoCompleteWithDeviceContactInteractor
|
||||||
.execute(AutoCompletePattern(word: word, isAll: isAll))
|
.execute(AutoCompletePattern(word: word))
|
||||||
.then((value) => value.fold(
|
.then((value) => value.fold(
|
||||||
(failure) => <EmailAddress>[],
|
(failure) => <EmailAddress>[],
|
||||||
(success) => success is GetAutoCompleteSuccess ? success.listEmailAddress : <EmailAddress>[]));
|
(success) => success is GetAutoCompleteSuccess ? success.listEmailAddress : <EmailAddress>[]));
|
||||||
}
|
}
|
||||||
return await _getAutoCompleteInteractor.execute(AutoCompletePattern(word: word, isAll: isAll))
|
return await _getAutoCompleteInteractor.execute(AutoCompletePattern(word: word))
|
||||||
.then((value) => value.fold(
|
.then((value) => value.fold(
|
||||||
(failure) => <EmailAddress>[],
|
(failure) => <EmailAddress>[],
|
||||||
(success) => success is GetAutoCompleteSuccess ? success.listEmailAddress : <EmailAddress>[]));
|
(success) => success is GetAutoCompleteSuccess ? success.listEmailAddress : <EmailAddress>[]));
|
||||||
|
|||||||
@@ -295,7 +295,7 @@ class ComposerView extends GetWidget<ComposerController> {
|
|||||||
..addOnShowFullListEmailAddressAction((prefixEmailAddress) => controller.showFullEmailAddress(prefixEmailAddress))
|
..addOnShowFullListEmailAddressAction((prefixEmailAddress) => controller.showFullEmailAddress(prefixEmailAddress))
|
||||||
..addOnAddEmailAddressTypeAction((prefixEmailAddress) => controller.addEmailAddressType(prefixEmailAddress))
|
..addOnAddEmailAddressTypeAction((prefixEmailAddress) => controller.addEmailAddressType(prefixEmailAddress))
|
||||||
..addOnUpdateListEmailAddressAction((prefixEmailAddress, listEmailAddress) => controller.updateListEmailAddress(prefixEmailAddress, listEmailAddress))
|
..addOnUpdateListEmailAddressAction((prefixEmailAddress, listEmailAddress) => controller.updateListEmailAddress(prefixEmailAddress, listEmailAddress))
|
||||||
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(isAll: true))
|
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(word: ''))
|
||||||
..addOnSuggestionEmailAddress((word) => controller.getAutoCompleteSuggestion(word: word)))
|
..addOnSuggestionEmailAddress((word) => controller.getAutoCompleteSuggestion(word: word)))
|
||||||
.build()
|
.build()
|
||||||
)),
|
)),
|
||||||
@@ -316,7 +316,7 @@ class ComposerView extends GetWidget<ComposerController> {
|
|||||||
..addOnShowFullListEmailAddressAction((prefixEmailAddress) => controller.showFullEmailAddress(prefixEmailAddress))
|
..addOnShowFullListEmailAddressAction((prefixEmailAddress) => controller.showFullEmailAddress(prefixEmailAddress))
|
||||||
..addOnDeleteEmailAddressTypeAction((prefixEmailAddress) => controller.deleteEmailAddressType(prefixEmailAddress))
|
..addOnDeleteEmailAddressTypeAction((prefixEmailAddress) => controller.deleteEmailAddressType(prefixEmailAddress))
|
||||||
..addOnUpdateListEmailAddressAction((prefixEmailAddress, listEmailAddress) => controller.updateListEmailAddress(prefixEmailAddress, listEmailAddress))
|
..addOnUpdateListEmailAddressAction((prefixEmailAddress, listEmailAddress) => controller.updateListEmailAddress(prefixEmailAddress, listEmailAddress))
|
||||||
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(isAll: true))
|
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(word: ''))
|
||||||
..addOnSuggestionEmailAddress((word) => controller.getAutoCompleteSuggestion(word: word)))
|
..addOnSuggestionEmailAddress((word) => controller.getAutoCompleteSuggestion(word: word)))
|
||||||
.build())
|
.build())
|
||||||
: const SizedBox.shrink()
|
: const SizedBox.shrink()
|
||||||
@@ -338,7 +338,7 @@ class ComposerView extends GetWidget<ComposerController> {
|
|||||||
..addOnShowFullListEmailAddressAction((prefixEmailAddress) => controller.showFullEmailAddress(prefixEmailAddress))
|
..addOnShowFullListEmailAddressAction((prefixEmailAddress) => controller.showFullEmailAddress(prefixEmailAddress))
|
||||||
..addOnDeleteEmailAddressTypeAction((prefixEmailAddress) => controller.deleteEmailAddressType(prefixEmailAddress))
|
..addOnDeleteEmailAddressTypeAction((prefixEmailAddress) => controller.deleteEmailAddressType(prefixEmailAddress))
|
||||||
..addOnUpdateListEmailAddressAction((prefixEmailAddress, listEmailAddress) => controller.updateListEmailAddress(prefixEmailAddress, listEmailAddress))
|
..addOnUpdateListEmailAddressAction((prefixEmailAddress, listEmailAddress) => controller.updateListEmailAddress(prefixEmailAddress, listEmailAddress))
|
||||||
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(isAll: true))
|
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(word: ''))
|
||||||
..addOnSuggestionEmailAddress((word) => controller.getAutoCompleteSuggestion(word: word)))
|
..addOnSuggestionEmailAddress((word) => controller.getAutoCompleteSuggestion(word: word)))
|
||||||
.build())
|
.build())
|
||||||
: const SizedBox.shrink()
|
: const SizedBox.shrink()
|
||||||
|
|||||||
@@ -404,7 +404,7 @@ class ComposerView extends GetWidget<ComposerController> {
|
|||||||
..addOnShowFullListEmailAddressAction((prefixEmailAddress) => controller.showFullEmailAddress(prefixEmailAddress))
|
..addOnShowFullListEmailAddressAction((prefixEmailAddress) => controller.showFullEmailAddress(prefixEmailAddress))
|
||||||
..addOnAddEmailAddressTypeAction((prefixEmailAddress) => controller.addEmailAddressType(prefixEmailAddress))
|
..addOnAddEmailAddressTypeAction((prefixEmailAddress) => controller.addEmailAddressType(prefixEmailAddress))
|
||||||
..addOnUpdateListEmailAddressAction((prefixEmailAddress, listEmailAddress) => controller.updateListEmailAddress(prefixEmailAddress, listEmailAddress))
|
..addOnUpdateListEmailAddressAction((prefixEmailAddress, listEmailAddress) => controller.updateListEmailAddress(prefixEmailAddress, listEmailAddress))
|
||||||
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(isAll: true))
|
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(word: ''))
|
||||||
..addOnSuggestionEmailAddress((word) => controller.getAutoCompleteSuggestion(word: word)))
|
..addOnSuggestionEmailAddress((word) => controller.getAutoCompleteSuggestion(word: word)))
|
||||||
.build()
|
.build()
|
||||||
)),
|
)),
|
||||||
@@ -425,7 +425,7 @@ class ComposerView extends GetWidget<ComposerController> {
|
|||||||
..addOnShowFullListEmailAddressAction((prefixEmailAddress) => controller.showFullEmailAddress(prefixEmailAddress))
|
..addOnShowFullListEmailAddressAction((prefixEmailAddress) => controller.showFullEmailAddress(prefixEmailAddress))
|
||||||
..addOnDeleteEmailAddressTypeAction((prefixEmailAddress) => controller.deleteEmailAddressType(prefixEmailAddress))
|
..addOnDeleteEmailAddressTypeAction((prefixEmailAddress) => controller.deleteEmailAddressType(prefixEmailAddress))
|
||||||
..addOnUpdateListEmailAddressAction((prefixEmailAddress, listEmailAddress) => controller.updateListEmailAddress(prefixEmailAddress, listEmailAddress))
|
..addOnUpdateListEmailAddressAction((prefixEmailAddress, listEmailAddress) => controller.updateListEmailAddress(prefixEmailAddress, listEmailAddress))
|
||||||
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(isAll: true))
|
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(word: ''))
|
||||||
..addOnSuggestionEmailAddress((word) => controller.getAutoCompleteSuggestion(word: word)))
|
..addOnSuggestionEmailAddress((word) => controller.getAutoCompleteSuggestion(word: word)))
|
||||||
.build())
|
.build())
|
||||||
: const SizedBox.shrink()
|
: const SizedBox.shrink()
|
||||||
@@ -447,7 +447,7 @@ class ComposerView extends GetWidget<ComposerController> {
|
|||||||
..addOnShowFullListEmailAddressAction((prefixEmailAddress) => controller.showFullEmailAddress(prefixEmailAddress))
|
..addOnShowFullListEmailAddressAction((prefixEmailAddress) => controller.showFullEmailAddress(prefixEmailAddress))
|
||||||
..addOnDeleteEmailAddressTypeAction((prefixEmailAddress) => controller.deleteEmailAddressType(prefixEmailAddress))
|
..addOnDeleteEmailAddressTypeAction((prefixEmailAddress) => controller.deleteEmailAddressType(prefixEmailAddress))
|
||||||
..addOnUpdateListEmailAddressAction((prefixEmailAddress, listEmailAddress) => controller.updateListEmailAddress(prefixEmailAddress, listEmailAddress))
|
..addOnUpdateListEmailAddressAction((prefixEmailAddress, listEmailAddress) => controller.updateListEmailAddress(prefixEmailAddress, listEmailAddress))
|
||||||
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(isAll: true))
|
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(word: ''))
|
||||||
..addOnSuggestionEmailAddress((word) => controller.getAutoCompleteSuggestion(word: word)))
|
..addOnSuggestionEmailAddress((word) => controller.getAutoCompleteSuggestion(word: word)))
|
||||||
.build())
|
.build())
|
||||||
: const SizedBox.shrink()
|
: const SizedBox.shrink()
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
|
||||||
|
import 'package:equatable/equatable.dart';
|
||||||
|
import 'package:jmap_dart_client/jmap/account_id.dart';
|
||||||
|
|
||||||
|
class AutoCompletePattern with EquatableMixin {
|
||||||
|
|
||||||
|
final String word;
|
||||||
|
final int? limit;
|
||||||
|
final AccountId? accountId;
|
||||||
|
|
||||||
|
AutoCompletePattern({
|
||||||
|
required this.word,
|
||||||
|
this.limit,
|
||||||
|
this.accountId,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
List<Object?> get props => [word, limit, accountId];
|
||||||
|
|
||||||
|
}
|
||||||
@@ -67,4 +67,7 @@ export 'contact/device_contact.dart';
|
|||||||
// Upload
|
// Upload
|
||||||
export 'upload/file_info.dart';
|
export 'upload/file_info.dart';
|
||||||
export 'upload/upload_request.dart';
|
export 'upload/upload_request.dart';
|
||||||
export 'upload/upload_response.dart';
|
export 'upload/upload_response.dart';
|
||||||
|
|
||||||
|
// AutoComplete
|
||||||
|
export 'autocomplete/auto_complete_pattern.dart';
|
||||||
@@ -33,6 +33,9 @@ dependencies:
|
|||||||
model:
|
model:
|
||||||
path: model
|
path: model
|
||||||
|
|
||||||
|
contact:
|
||||||
|
path: contact
|
||||||
|
|
||||||
# The following adds the Cupertino Icons font to your application.
|
# The following adds the Cupertino Icons font to your application.
|
||||||
# Use with the CupertinoIcons class for iOS style icons.
|
# Use with the CupertinoIcons class for iOS style icons.
|
||||||
cupertino_icons: ^1.0.2
|
cupertino_icons: ^1.0.2
|
||||||
|
|||||||
Reference in New Issue
Block a user