Skip to content

Remove unused dart:async import #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove unused dart:async import #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
139 changes: 81 additions & 58 deletions lib/contacts_service.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'dart:async';
import 'dart:typed_data';

import 'package:collection/collection.dart';
Expand Down Expand Up @@ -55,10 +54,11 @@ class ContactsService {
/// Works only on iOS
static Future<Iterable<Contact>> getContactsForEmail(String email,
{bool withThumbnails = true,
bool photoHighResolution = true,
bool orderByGivenName = true,
bool iOSLocalizedLabels = true}) async {
Iterable contacts = await _channel.invokeMethod('getContactsForEmail',<String,dynamic>{
bool photoHighResolution = true,
bool orderByGivenName = true,
bool iOSLocalizedLabels = true}) async {
Iterable contacts =
await _channel.invokeMethod('getContactsForEmail', <String, dynamic>{
'email': email,
'withThumbnails': withThumbnails,
'photoHighResolution': photoHighResolution,
Expand All @@ -71,8 +71,8 @@ class ContactsService {
/// Loads the avatar for the given contact and returns it. If the user does
/// not have an avatar, then `null` is returned in that slot. Only implemented
/// on Android.
static Future<Uint8List> getAvatar(
final Contact contact, {final bool photoHighRes = true}) =>
static Future<Uint8List> getAvatar(final Contact contact,
{final bool photoHighRes = true}) =>
_channel.invokeMethod('getAvatar', <String, dynamic>{
'contact': Contact._toMap(contact),
'photoHighResolution': photoHighRes,
Expand All @@ -90,24 +90,32 @@ class ContactsService {
static Future updateContact(Contact contact) =>
_channel.invokeMethod('updateContact', Contact._toMap(contact));

static Future<Contact> openContactForm({bool iOSLocalizedLabels = true}) async {
dynamic result = await _channel.invokeMethod('openContactForm',<String,dynamic>{
static Future<Contact> openContactForm(
{bool iOSLocalizedLabels = true}) async {
dynamic result =
await _channel.invokeMethod('openContactForm', <String, dynamic>{
'iOSLocalizedLabels': iOSLocalizedLabels,
});
return _handleFormOperation(result);
return _handleFormOperation(result);
}

static Future<Contact> openExistingContact(Contact contact, {bool iOSLocalizedLabels = true}) async {
dynamic result = await _channel.invokeMethod('openExistingContact',<String,dynamic>{
'contact': Contact._toMap(contact),
'iOSLocalizedLabels': iOSLocalizedLabels,
}, );
return _handleFormOperation(result);
static Future<Contact> openExistingContact(Contact contact,
{bool iOSLocalizedLabels = true}) async {
dynamic result = await _channel.invokeMethod(
'openExistingContact',
<String, dynamic>{
'contact': Contact._toMap(contact),
'iOSLocalizedLabels': iOSLocalizedLabels,
},
);
return _handleFormOperation(result);
}

// Displays the device/native contact picker dialog and returns the contact selected by the user
static Future<Contact> openDeviceContactPicker({bool iOSLocalizedLabels = true}) async {
dynamic result = await _channel.invokeMethod('openDeviceContactPicker',<String,dynamic>{
static Future<Contact> openDeviceContactPicker(
{bool iOSLocalizedLabels = true}) async {
dynamic result = await _channel
.invokeMethod('openDeviceContactPicker', <String, dynamic>{
'iOSLocalizedLabels': iOSLocalizedLabels,
});
// result contains either :
Expand All @@ -123,19 +131,23 @@ class ContactsService {
}

static Contact _handleFormOperation(dynamic result) {
if(result is int) {
if (result is int) {
switch (result) {
case 1:
throw FormOperationException(errorCode: FormOperationErrorCode.FORM_OPERATION_CANCELED);
throw FormOperationException(
errorCode: FormOperationErrorCode.FORM_OPERATION_CANCELED);
case 2:
throw FormOperationException(errorCode: FormOperationErrorCode.FORM_COULD_NOT_BE_OPEN);
throw FormOperationException(
errorCode: FormOperationErrorCode.FORM_COULD_NOT_BE_OPEN);
default:
throw FormOperationException(errorCode: FormOperationErrorCode.FORM_OPERATION_UNKNOWN_ERROR);
throw FormOperationException(
errorCode: FormOperationErrorCode.FORM_OPERATION_UNKNOWN_ERROR);
}
} else if(result is Map) {
} else if (result is Map) {
return Contact.fromMap(result);
} else {
throw FormOperationException(errorCode: FormOperationErrorCode.FORM_OPERATION_UNKNOWN_ERROR);
throw FormOperationException(
errorCode: FormOperationErrorCode.FORM_OPERATION_UNKNOWN_ERROR);
}
}
}
Expand All @@ -144,7 +156,7 @@ class FormOperationException implements Exception {
final FormOperationErrorCode errorCode;

const FormOperationException({this.errorCode});
String toString() => 'FormOperationException: $errorCode';
String toString() => 'FormOperationException: $errorCode';
}

enum FormOperationErrorCode {
Expand All @@ -153,7 +165,6 @@ enum FormOperationErrorCode {
FORM_OPERATION_UNKNOWN_ERROR
}


class Contact {
Contact({
this.displayName,
Expand All @@ -174,7 +185,15 @@ class Contact {
this.androidAccountName,
});

String identifier, displayName, givenName, middleName, prefix, suffix, familyName, company, jobTitle;
String identifier,
displayName,
givenName,
middleName,
prefix,
suffix,
familyName,
company,
jobTitle;
String androidAccountTypeRaw, androidAccountName;
AndroidAccountType androidAccountType;
Iterable<Item> emails = [];
Expand Down Expand Up @@ -258,31 +277,39 @@ class Contact {

/// The [+] operator fills in this contact's empty fields with the fields from [other]
operator +(Contact other) => Contact(
givenName: this.givenName ?? other.givenName,
middleName: this.middleName ?? other.middleName,
prefix: this.prefix ?? other.prefix,
suffix: this.suffix ?? other.suffix,
familyName: this.familyName ?? other.familyName,
company: this.company ?? other.company,
jobTitle: this.jobTitle ?? other.jobTitle,
androidAccountType: this.androidAccountType ?? other.androidAccountType,
androidAccountName: this.androidAccountName ?? other.androidAccountName,
emails: this.emails == null
? other.emails
: this.emails.toSet().union(other.emails?.toSet() ?? Set()).toList(),
phones: this.phones == null
? other.phones
: this.phones.toSet().union(other.phones?.toSet() ?? Set()).toList(),
postalAddresses: this.postalAddresses == null
? other.postalAddresses
: this
.postalAddresses
.toSet()
.union(other.postalAddresses?.toSet() ?? Set())
.toList(),
avatar: this.avatar ?? other.avatar,
birthday: this.birthday ?? other.birthday,
);
givenName: this.givenName ?? other.givenName,
middleName: this.middleName ?? other.middleName,
prefix: this.prefix ?? other.prefix,
suffix: this.suffix ?? other.suffix,
familyName: this.familyName ?? other.familyName,
company: this.company ?? other.company,
jobTitle: this.jobTitle ?? other.jobTitle,
androidAccountType: this.androidAccountType ?? other.androidAccountType,
androidAccountName: this.androidAccountName ?? other.androidAccountName,
emails: this.emails == null
? other.emails
: this
.emails
.toSet()
.union(other.emails?.toSet() ?? Set())
.toList(),
phones: this.phones == null
? other.phones
: this
.phones
.toSet()
.union(other.phones?.toSet() ?? Set())
.toList(),
postalAddresses: this.postalAddresses == null
? other.postalAddresses
: this
.postalAddresses
.toSet()
.union(other.postalAddresses?.toSet() ?? Set())
.toList(),
avatar: this.avatar ?? other.avatar,
birthday: this.birthday ?? other.birthday,
);

/// Returns true if all items in this contact are identical.
@override
Expand Down Expand Up @@ -336,6 +363,7 @@ class Contact {
} else if (androidAccountType.startsWith("com.facebook")) {
return AndroidAccountType.facebook;
}

/// Other account types are not supported on Android
/// such as Samsung, htc etc...
return AndroidAccountType.other;
Expand Down Expand Up @@ -456,9 +484,4 @@ class Item {
static Map _toMap(Item i) => {"label": i.label, "value": i.value};
}

enum AndroidAccountType {
facebook,
google,
whatsapp,
other
}
enum AndroidAccountType { facebook, google, whatsapp, other }
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ homepage: https://github.com/lukasgit/flutter_contacts
maintainer: Lukas Dickie (@lukasgit)

environment:
sdk: ">=2.0.0-dev.58.0.flutter-f981f09760 <3.0.0"
sdk: ">=2.1.0 <3.0.0"

dependencies:
flutter:
Expand Down