Merge pull request #116 from alexpli/master

Other dates support
Alterplay · Jan 14, 2016 · e886d57 · e886d57
2 parents ceb2f1f + 3ec9afa
commit e886d57
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 0 deletions.
diff --git a/Pod/Core/Private/Builders/APContactBuilder.m b/Pod/Core/Private/Builders/APContactBuilder.m
@@ -65,6 +65,10 @@ - (APContact *)contactWithRecordRef:(ABRecordRef)recordRef fieldMask:(APContactF
     {
         contact.birthday = [self.extractor dateProperty:kABPersonBirthdayProperty];
     }
+    if (fieldMask & APContactFieldDates)
+    {
+        contact.dates = [self.extractor dates];
+    }
     if (fieldMask & APContactFieldWebsites)
     {
         contact.websites = [self.extractor arrayProperty:kABPersonURLProperty];

diff --git a/Pod/Core/Private/Extractors/APContactDataExtractor.h b/Pod/Core/Private/Extractors/APContactDataExtractor.h
@@ -27,6 +27,7 @@
 - (NSArray *)socialProfiles;
 - (NSArray *)relatedPersons;
 - (NSArray *)linkedRecordIDs;
+- (NSArray *)dates;
 - (APSource *)source;
 - (APRecordDate *)recordDate;
 - (NSString *)stringProperty:(ABPropertyID)property;

diff --git a/Pod/Core/Private/Extractors/APContactDataExtractor.m b/Pod/Core/Private/Extractors/APContactDataExtractor.m
@@ -17,6 +17,7 @@
 #import "APSource.h"
 #import "APRelatedPerson.h"
 #import "APRecordDate.h"
+#import "APDate.h"
 
 @implementation APContactDataExtractor
 
@@ -155,6 +156,23 @@ - (NSArray *)linkedRecordIDs
     return linkedRecordIDs.array;
 }
 
+- (NSArray *) dates
+{
+    return [self mapMultiValueOfProperty:kABPersonDateProperty
+                               withBlock:^id(ABMultiValueRef multiValue, CFTypeRef value, CFIndex index)
+    {
+        APDate *date;
+        if (value)
+        {
+            date = [[APDate alloc] init];
+            date.date = (__bridge NSDate *)ABMultiValueCopyValueAtIndex(multiValue, index);
+            date.originalLabel = [self originalLabelFromMultiValue:multiValue index:index];
+            date.localizedLabel = [self localizedLabelFromMultiValue:multiValue index:index];
+        }
+        return date;
+    }];
+}
+
 - (APSource *)source
 {
     APSource *source;

diff --git a/Pod/Core/Public/Models/APContact.h b/Pod/Core/Public/Models/APContact.h
@@ -17,6 +17,7 @@
 #import "APRelatedPerson.h"
 #import "APSource.h"
 #import "APRecordDate.h"
+#import "APDate.h"
 
 @interface APContact : NSObject
 
@@ -29,6 +30,7 @@
 @property (nullable, nonatomic, strong) NSArray <APAddress *> *addresses;
 @property (nullable, nonatomic, strong) NSArray <APSocialProfile *> *socialProfiles;
 @property (nullable, nonatomic, strong) NSDate *birthday;
+@property (nullable, nonatomic, strong) NSArray <APDate *> *dates;
 @property (nullable, nonatomic, strong) NSString *note;
 @property (nullable, nonatomic, strong) NSArray <NSString *> *websites;
 @property (nullable, nonatomic, strong) NSArray <APRelatedPerson *> *relatedPersons;

diff --git a/Pod/Core/Public/Models/APDate.h b/Pod/Core/Public/Models/APDate.h
@@ -0,0 +1,17 @@
+//
+//  APDate.h
+//  Pods
+//
+//  Created by Alexandre Plisson on 14/01/2016.
+//
+//
+
+#import <Foundation/Foundation.h>
+
+@interface APDate : NSObject
+
+@property (nullable, nonatomic, strong) NSDate *date;
+@property (nullable, nonatomic, strong) NSString *originalLabel;
+@property (nullable, nonatomic, strong) NSString *localizedLabel;
+
+@end
diff --git a/Pod/Core/Public/Models/APDate.m b/Pod/Core/Public/Models/APDate.m
@@ -0,0 +1,13 @@
+//
+//  APDate.m
+//  Pods
+//
+//  Created by Alexandre Plisson on 14/01/2016.
+//
+//
+
+#import "APDate.h"
+
+@implementation APDate
+
+@end
diff --git a/Pod/Core/Public/Models/APTypes.h b/Pod/Core/Public/Models/APTypes.h
@@ -29,6 +29,7 @@ typedef NS_OPTIONS(NSUInteger, APContactField)
     APContactFieldAddresses AP_DEPRECATED('APContactFieldAddressesOnly') = APContactFieldAddressesOnly,
     APContactFieldSocialProfiles        = 1 << 9,
     APContactFieldBirthday              = 1 << 10,
+    APContactFieldDates                 = 1 << 17,
     APContactFieldWebsites              = 1 << 11,
     APContactFieldNote                  = 1 << 12,
     APContactFieldRelatedPersons        = 1 << 13,

diff --git a/Pod/Swift/APAddressBook-Bridging.h b/Pod/Swift/APAddressBook-Bridging.h
@@ -20,3 +20,4 @@
 #import "APRelatedPerson.h"
 #import "APSource.h"
 #import "APRecordDate.h"
+#import "APDate.h"