TF-548 Create abstract AutoCompleteDataSource common to all
This commit is contained in:
@@ -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:tmail_ui_user/features/composer/domain/model/auto_complete_pattern.dart';
|
||||
|
||||
abstract class ContactDataSource {
|
||||
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:model/model.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 {
|
||||
|
||||
@override
|
||||
Future<List<Contact>> getContactSuggestions(AutoCompletePattern autoCompletePattern) async {
|
||||
if (autoCompletePattern.isAll == true) {
|
||||
if (autoCompletePattern.word.isEmpty) {
|
||||
return <DeviceContact>[];
|
||||
} else {
|
||||
final suggestedList = await contact_service.ContactsService
|
||||
.getContactsByEmailOrName(autoCompletePattern.word ?? '');
|
||||
.getContactsByEmailOrName(autoCompletePattern.word);
|
||||
if (suggestedList.isNotEmpty) {
|
||||
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: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/domain/model/auto_complete_pattern.dart';
|
||||
|
||||
class LocalAutoCompleteDataSourceImpl extends AutoCompleteDataSource {
|
||||
|
||||
@@ -13,18 +13,16 @@ class LocalAutoCompleteDataSourceImpl extends AutoCompleteDataSource {
|
||||
@override
|
||||
Future<List<EmailAddress>> getAutoComplete(AutoCompletePattern autoCompletePattern) {
|
||||
return Future.sync(() async {
|
||||
if (autoCompletePattern.isAll == true) {
|
||||
if (autoCompletePattern.word.isEmpty) {
|
||||
return await emailAddressDatabaseManager.getListData(
|
||||
word: autoCompletePattern.word,
|
||||
limit: autoCompletePattern.limit,
|
||||
orderBy: autoCompletePattern.orderBy);
|
||||
limit: autoCompletePattern.limit);
|
||||
} else {
|
||||
final condition = '${EmailAddressTable.NAME} LIKE \'%?${autoCompletePattern.word}\' OR ${EmailAddressTable.EMAIL} LIKE \'%${autoCompletePattern.word}%\'';
|
||||
return await emailAddressDatabaseManager.getListDataWithCondition(
|
||||
condition,
|
||||
word: autoCompletePattern.word,
|
||||
limit: autoCompletePattern.limit,
|
||||
orderBy: autoCompletePattern.orderBy);
|
||||
limit: autoCompletePattern.limit);
|
||||
}
|
||||
}).catchError((error) {
|
||||
throw error;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
|
||||
import 'package:contact/data/datasource/auto_complete_datasource.dart';
|
||||
import 'package:core/core.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: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';
|
||||
|
||||
class AutoCompleteRepositoryImpl extends AutoCompleteRepository {
|
||||
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
import 'package:model/model.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';
|
||||
|
||||
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:tmail_ui_user/features/composer/domain/model/auto_complete_pattern.dart';
|
||||
import 'package:model/autocomplete/auto_complete_pattern.dart';
|
||||
|
||||
abstract class AutoCompleteRepository {
|
||||
Future<List<EmailAddress>> getAutoComplete(AutoCompletePattern autoCompletePattern);
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
|
||||
import 'package:model/model.dart';
|
||||
import 'package:tmail_ui_user/features/composer/domain/model/auto_complete_pattern.dart';
|
||||
|
||||
abstract class ContactRepository {
|
||||
Future<List<Contact>> getContactSuggestions(AutoCompletePattern autoCompletePattern);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import 'package:core/core.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/state/get_autocomplete_state.dart';
|
||||
|
||||
|
||||
-1
@@ -3,7 +3,6 @@ import 'package:core/core.dart';
|
||||
import 'package:dartz/dartz.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email_address.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_device_contact_suggestions_state.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: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/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:device_info_plus/device_info_plus.dart';
|
||||
import 'package:get/get.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/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/contact_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() {
|
||||
Get.lazyPut(() => ComposerDataSourceImpl(Get.find<ComposerAPI>()));
|
||||
Get.lazyPut(() => LocalComposerDataSourceImpl(Get.find<EmailAddressDatabaseManager>()));
|
||||
Get.lazyPut(() => AutoCompleteDataSourceImpl());
|
||||
Get.lazyPut(() => LocalAutoCompleteDataSourceImpl(Get.find<EmailAddressDatabaseManager>()));
|
||||
Get.lazyPut(() => ContactDataSourceImpl());
|
||||
Get.lazyPut(() => EmailDataSourceImpl(Get.find<EmailAPI>()));
|
||||
@@ -78,7 +76,6 @@ class ComposerBindings extends BaseBindings {
|
||||
@override
|
||||
void bindingsDataSource() {
|
||||
Get.lazyPut<ComposerDataSource>(() => Get.find<ComposerDataSourceImpl>());
|
||||
Get.lazyPut<AutoCompleteDataSource>(() => Get.find<AutoCompleteDataSourceImpl>());
|
||||
Get.lazyPut<ContactDataSource>(() => Get.find<ContactDataSourceImpl>());
|
||||
Get.lazyPut<EmailDataSource>(() => Get.find<EmailDataSourceImpl>());
|
||||
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:permission_handler/permission_handler.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/email_request.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) {
|
||||
return await _getAutoCompleteWithDeviceContactInteractor
|
||||
.execute(AutoCompletePattern(word: word, isAll: isAll))
|
||||
.execute(AutoCompletePattern(word: word))
|
||||
.then((value) => value.fold(
|
||||
(failure) => <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(
|
||||
(failure) => <EmailAddress>[],
|
||||
(success) => success is GetAutoCompleteSuccess ? success.listEmailAddress : <EmailAddress>[]));
|
||||
|
||||
@@ -295,7 +295,7 @@ class ComposerView extends GetWidget<ComposerController> {
|
||||
..addOnShowFullListEmailAddressAction((prefixEmailAddress) => controller.showFullEmailAddress(prefixEmailAddress))
|
||||
..addOnAddEmailAddressTypeAction((prefixEmailAddress) => controller.addEmailAddressType(prefixEmailAddress))
|
||||
..addOnUpdateListEmailAddressAction((prefixEmailAddress, listEmailAddress) => controller.updateListEmailAddress(prefixEmailAddress, listEmailAddress))
|
||||
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(isAll: true))
|
||||
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(word: ''))
|
||||
..addOnSuggestionEmailAddress((word) => controller.getAutoCompleteSuggestion(word: word)))
|
||||
.build()
|
||||
)),
|
||||
@@ -316,7 +316,7 @@ class ComposerView extends GetWidget<ComposerController> {
|
||||
..addOnShowFullListEmailAddressAction((prefixEmailAddress) => controller.showFullEmailAddress(prefixEmailAddress))
|
||||
..addOnDeleteEmailAddressTypeAction((prefixEmailAddress) => controller.deleteEmailAddressType(prefixEmailAddress))
|
||||
..addOnUpdateListEmailAddressAction((prefixEmailAddress, listEmailAddress) => controller.updateListEmailAddress(prefixEmailAddress, listEmailAddress))
|
||||
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(isAll: true))
|
||||
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(word: ''))
|
||||
..addOnSuggestionEmailAddress((word) => controller.getAutoCompleteSuggestion(word: word)))
|
||||
.build())
|
||||
: const SizedBox.shrink()
|
||||
@@ -338,7 +338,7 @@ class ComposerView extends GetWidget<ComposerController> {
|
||||
..addOnShowFullListEmailAddressAction((prefixEmailAddress) => controller.showFullEmailAddress(prefixEmailAddress))
|
||||
..addOnDeleteEmailAddressTypeAction((prefixEmailAddress) => controller.deleteEmailAddressType(prefixEmailAddress))
|
||||
..addOnUpdateListEmailAddressAction((prefixEmailAddress, listEmailAddress) => controller.updateListEmailAddress(prefixEmailAddress, listEmailAddress))
|
||||
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(isAll: true))
|
||||
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(word: ''))
|
||||
..addOnSuggestionEmailAddress((word) => controller.getAutoCompleteSuggestion(word: word)))
|
||||
.build())
|
||||
: const SizedBox.shrink()
|
||||
|
||||
@@ -404,7 +404,7 @@ class ComposerView extends GetWidget<ComposerController> {
|
||||
..addOnShowFullListEmailAddressAction((prefixEmailAddress) => controller.showFullEmailAddress(prefixEmailAddress))
|
||||
..addOnAddEmailAddressTypeAction((prefixEmailAddress) => controller.addEmailAddressType(prefixEmailAddress))
|
||||
..addOnUpdateListEmailAddressAction((prefixEmailAddress, listEmailAddress) => controller.updateListEmailAddress(prefixEmailAddress, listEmailAddress))
|
||||
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(isAll: true))
|
||||
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(word: ''))
|
||||
..addOnSuggestionEmailAddress((word) => controller.getAutoCompleteSuggestion(word: word)))
|
||||
.build()
|
||||
)),
|
||||
@@ -425,7 +425,7 @@ class ComposerView extends GetWidget<ComposerController> {
|
||||
..addOnShowFullListEmailAddressAction((prefixEmailAddress) => controller.showFullEmailAddress(prefixEmailAddress))
|
||||
..addOnDeleteEmailAddressTypeAction((prefixEmailAddress) => controller.deleteEmailAddressType(prefixEmailAddress))
|
||||
..addOnUpdateListEmailAddressAction((prefixEmailAddress, listEmailAddress) => controller.updateListEmailAddress(prefixEmailAddress, listEmailAddress))
|
||||
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(isAll: true))
|
||||
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(word: ''))
|
||||
..addOnSuggestionEmailAddress((word) => controller.getAutoCompleteSuggestion(word: word)))
|
||||
.build())
|
||||
: const SizedBox.shrink()
|
||||
@@ -447,7 +447,7 @@ class ComposerView extends GetWidget<ComposerController> {
|
||||
..addOnShowFullListEmailAddressAction((prefixEmailAddress) => controller.showFullEmailAddress(prefixEmailAddress))
|
||||
..addOnDeleteEmailAddressTypeAction((prefixEmailAddress) => controller.deleteEmailAddressType(prefixEmailAddress))
|
||||
..addOnUpdateListEmailAddressAction((prefixEmailAddress, listEmailAddress) => controller.updateListEmailAddress(prefixEmailAddress, listEmailAddress))
|
||||
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(isAll: true))
|
||||
..addOnOpenSuggestionBoxEmailAddress(() => controller.getAutoCompleteSuggestion(word: ''))
|
||||
..addOnSuggestionEmailAddress((word) => controller.getAutoCompleteSuggestion(word: word)))
|
||||
.build())
|
||||
: const SizedBox.shrink()
|
||||
|
||||
Reference in New Issue
Block a user