Version 2.1.2

APMServices.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'APMServices'
-  s.version          = '2.1.1'
+  s.version          = '2.1.2'
   s.summary          = 'app\'s miles® boosts your app\'s usage'
 
 # This description is used to generate tags and improve search results.

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMAd.h

@@ -7,26 +7,28 @@
 //
 
 #import "APMModel.h"
+#import "APMImagesUtils.h"
 
-@interface APMAd : APMModel<NSCopying>
+@interface APMAd : APMModel<NSCopying, APMMediaProtocol, APMLargeMediaProtocol>
+{
+    //Media
+    NSString *_media;
+    UIImage *_imageMedia;
+    NSInteger _countImageMediaLoad;
+    BOOL _isImageMediaLoading;
+    
+    //Large Media
+    NSString *_largeMedia;
+    UIImage *_imageLargeMedia;
+    NSInteger _countImageLargeMediaLoad;
+    BOOL _isImageLargeMediaLoading;
+}
 
 @property(assign, nonatomic) NSInteger adID;
 @property(strong, nonatomic)  NSString *label;
 @property(strong, nonatomic)  NSString *content;
 @property(assign, nonatomic) NSInteger type;
 
-//Media
-@property (nonatomic, strong) NSString *media;
-@property (nonatomic, strong) UIImage *imageMedia;
-@property (nonatomic, assign) BOOL isImageMediaLoading;
-@property (nonatomic, assign) NSInteger countImageMediaLoad;
-
-//Large media
-@property (nonatomic, strong) NSString *largeMedia;
-@property (nonatomic, strong) UIImage *imageLargeMedia;
-@property (nonatomic, assign) BOOL isImageLargeMediaLoading;
-@property (nonatomic, assign) NSInteger countImageLargeMediaLoad;
-
 -(id)initWithJSONObject:(NSDictionary*)jsonObject;
 
 @end

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMAnimationUtils.h

@@ -11,7 +11,11 @@
 +(void)animateScaleInAndScaleOut:(UIView*)view parentView:(UIView*)parentView duration:(NSTimeInterval)duration scaleIn:(CGFloat)scaleIn onAnimationEnd:(void (^)(void))onAnimationEnd;
 +(void)animateFade:(UIView*)view parentView:(UIView*)parentView duration:(NSTimeInterval)duration from:(CGFloat)from to:(CGFloat)to completion:(void (^)(BOOL finished))completion;
 +(void)animateScaleInfinite:(UIView*)view duration:(NSTimeInterval)duration toScale:(CGFloat)toScale;
-+(void)animationFromScaleAndFadeView:(UIView*)view withParentView:(UIView*)parentView duration:(float)duration scale:(float)scaleValue;
++(void)animationFromScaleAndFadeView:(UIView*)view
+                      withParentView:(UIView*)parentView
+                            duration:(NSTimeInterval)duration
+                           fromScale:(CGFloat)fromScale
+                           fromAlpha:(CGFloat)fromAlpha toAlpha:(CGFloat)toAlpha;
 +(void)showLoader:(UIActivityIndicatorView*)loader completion:(void (^)(void))completion;
 +(void)hideLoader:(UIActivityIndicatorView*)loader completion:(void (^)(void))completion;
 +(void)showView:(UIView*)view completion:(void (^)(void))completion;

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMBurn.h

@@ -7,8 +7,15 @@
 //
 
 #import "APMModel.h"
+#import "APMImagesUtils.h"
 
-@interface APMBurn : APMModel<NSCoding, NSCopying>
+@interface APMBurn : APMModel<NSCoding, NSCopying, APMMediaProtocol>
+{
+    NSString *_media;
+    UIImage *_imageMedia;
+    NSInteger _countImageMediaLoad;
+    BOOL _isImageMediaLoading;
+}
 
 @property (nonatomic, assign) NSInteger burnID;
 @property (nonatomic, strong) NSDate *burnDate;
@@ -26,16 +33,14 @@
 @property (nonatomic, strong) NSDate *issueDate;
 @property (nonatomic, strong) NSDate *expirationDate;
 
-@property (nonatomic, strong) NSString *media;
-@property (nonatomic, strong) UIImage *imageMedia;
-@property (nonatomic, assign) NSInteger countImageMediaLoad;
-@property (nonatomic, assign) BOOL isImageMediaLoading;
-
 @property (nonatomic, assign) NSInteger nature;
 
 -(id)initWithJSONObject:(NSDictionary*)jsonObject;
 -(void)use;
 -(void)resetImageMediaLoading;
+
+-(NSString*)issuedDateString;
+-(NSString*)expirationDateString;
 -(NSString*)burnDateString;
 -(NSString*)issuedDateString;
 -(NSString*)expirationDateString;

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMGift.h

@@ -7,8 +7,15 @@
 //
 
 #import "APMModel.h"
+#import "APMImagesUtils.h"
 
-@interface APMGift : APMModel<NSCoding, NSCopying>
+@interface APMGift : APMModel<NSCoding, NSCopying, APMMediaProtocol>
+{
+    NSString *_media;
+    UIImage *_imageMedia;
+    NSInteger _countImageMediaLoad;
+    BOOL _isImageMediaLoading;
+}
 
 @property (nonatomic, assign) NSInteger giftID;
 @property (nonatomic, strong) NSString *partnerLabel;
@@ -23,11 +30,6 @@
 @property (nonatomic, assign) NSInteger total;
 @property (nonatomic, strong) NSString *confirmMessage;
 
-@property (nonatomic, strong) NSString *media;
-@property (nonatomic, strong) UIImage *imageMedia;
-@property (nonatomic, assign) BOOL isImageMediaLoading;
-@property (nonatomic, assign) NSInteger countImageMediaLoad;
-
 @property (nonatomic, assign) NSInteger nature;
 @property (nonatomic, assign) NSInteger accessibility;
 

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMImagesUtils.h

@@ -11,37 +11,76 @@
 @class APMBurn;
 @class APMPartner;
 
+@protocol APMMediaProtocol
+
+-(NSString*)media;
+-(void)setMedia:(NSString*)media;
+
+-(UIImage*)imageMedia;
+-(void)setImageMedia:(UIImage*)imageMedia;
+
+-(NSInteger)countImageMediaLoad;
+-(void)setCountImageMediaLoad:(NSInteger)countImageMediaLoad;
+
+-(BOOL)isImageMediaLoading;
+-(void)setIsImageMediaLoading:(BOOL)isImageMediaLoading;
+
+@end
+
+@protocol APMLargeMediaProtocol
+
+-(NSString*)largeMedia;
+-(void)setLargeMedia:(NSString*)largeMedia;
+
+-(UIImage*)imageLargeMedia;
+-(void)setImageLargeMedia:(UIImage*)imageLargeMedia;
+
+-(NSInteger)countImageLargeMediaLoad;
+-(void)setCountImageLargeMediaLoad:(NSInteger)countImageLargeMediaLoad;
+
+-(BOOL)isImageLargeMediaLoading;
+-(void)setIsImageLargeMediaLoading:(BOOL)isImageLargeMediaLoading;
+
+@end
+
+typedef enum APMImagesUtilsOptions : NSUInteger {
+    APMImagesUtilsOptionsNone = 0,
+    APMImagesUtilsOptionsFilterGrayscale = 1 <<  0
+} APMImagesUtilsOptions;
+
 @interface APMImagesUtils : NSObject
 
-+(void)buildMediaGift:(APMGift*)gift
-            imageView:(UIImageView*)imageView tagImageView:(NSInteger)tagImageView
-               loader:(UIActivityIndicatorView*)loader tagLoader:(NSInteger)tagLoader
-             logoEmpty:(UIView*)logoEmpty tagLogoEmpty:(NSInteger)tagLogoEmpty
-            tableView:(id)tableView indexPath:(NSIndexPath*)indexPath;
++(void)buildMedia:(id<APMMediaProtocol>)mediaProtocol
+        imageView:(UIImageView*)imageView tagImageView:(NSInteger)tagImageView
+           loader:(UIActivityIndicatorView*)loader tagLoader:(NSInteger)tagLoader
+        logoEmpty:(UIView*)logoEmpty tagLogoEmpty:(NSInteger)tagLogoEmpty
+        tableView:(id)tableView indexPath:(NSIndexPath*)indexPath;
 
-+(void)buildMediaBurn:(APMBurn*)burn
-            imageView:(UIImageView*)imageView tagImageView:(NSInteger)tagImageView
-               loader:(UIActivityIndicatorView*)loader tagLoader:(NSInteger)tagLoader
++(void)buildMedia:(id<APMMediaProtocol>)mediaProtocol
+        imageView:(UIImageView*)imageView tagImageView:(NSInteger)tagImageView
+           loader:(UIActivityIndicatorView*)loader tagLoader:(NSInteger)tagLoader
+        logoEmpty:(UIView*)logoEmpty tagLogoEmpty:(NSInteger)tagLogoEmpty
+        tableView:(id)tableView indexPath:(NSIndexPath*)indexPath
+        fromScale:(CGFloat)fromScale
+        fromAlpha:(CGFloat)fromAlpha toAlpha:(CGFloat)toAlpha
+         duration:(NSTimeInterval)duration
+          options:(APMImagesUtilsOptions)options;
+
++(void)buildLargeMedia:(id<APMLargeMediaProtocol>)largeMediaProtocol
+             imageView:(UIImageView*)imageView tagImageView:(NSInteger)tagImageView
+                loader:(UIActivityIndicatorView*)loader tagLoader:(NSInteger)tagLoader
              logoEmpty:(UIView*)logoEmpty tagLogoEmpty:(NSInteger)tagLogoEmpty
-            tableView:(id)tableView indexPath:(NSIndexPath*)indexPath;
-
-+(void)buildMediaAd:(APMAd*)ad
-               imageView:(UIImageView*)imageView tagImageView:(NSInteger)tagImageView
-                  loader:(UIActivityIndicatorView*)loader tagLoader:(NSInteger)tagLoader
-                logoEmpty:(UIView*)logoEmpty tagLogoEmpty:(NSInteger)tagLogoEmpty
-               tableView:(id)tableView indexPath:(NSIndexPath*)indexPath;
-
-+(void)buildLargeMediaAd:(APMAd*)ad
-               imageView:(UIImageView*)imageView tagImageView:(NSInteger)tagImageView
-                  loader:(UIActivityIndicatorView*)loader tagLoader:(NSInteger)tagLoader
-                logoEmpty:(UIView*)logoEmpty tagLogoEmpty:(NSInteger)tagLogoEmpty
-               tableView:(id)tableView indexPath:(NSIndexPath*)indexPath;
-
-+(void)buildMediaPartner:(APMPartner*)partner
-            imageView:(UIImageView*)imageView tagImageView:(NSInteger)tagImageView
-               loader:(UIActivityIndicatorView*)loader tagLoader:(NSInteger)tagLoader
+             tableView:(id)tableView indexPath:(NSIndexPath*)indexPath;
+
++(void)buildLargeMedia:(id<APMLargeMediaProtocol>)largeMediaProtocol
+             imageView:(UIImageView*)imageView tagImageView:(NSInteger)tagImageView
+                loader:(UIActivityIndicatorView*)loader tagLoader:(NSInteger)tagLoader
              logoEmpty:(UIView*)logoEmpty tagLogoEmpty:(NSInteger)tagLogoEmpty
-            tableView:(id)tableView indexPath:(NSIndexPath*)indexPath;
+             tableView:(id)tableView indexPath:(NSIndexPath*)indexPath
+             fromScale:(CGFloat)fromScale
+             fromAlpha:(CGFloat)fromAlpha toAlpha:(CGFloat)toAlpha
+              duration:(NSTimeInterval)duration
+               options:(APMImagesUtilsOptions)options;
 
 +(UIImage*)generateBarcodeImageWithValue:(NSString*)value;
 +(UIImage*)generateQRCodeImageWithValue:(NSString*)value;

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMPartner.h

@@ -7,8 +7,15 @@
 //
 
 #import "APMModel.h"
+#import "APMImagesUtils.h"
 
-@interface APMPartner : APMModel<NSCopying>
+@interface APMPartner : APMModel<NSCopying, APMMediaProtocol>
+{
+    NSString *_media;
+    UIImage *_imageMedia;
+    NSInteger _countImageMediaLoad;
+    BOOL _isImageMediaLoading;
+}
 
 @property(strong, nonatomic) NSString *apmScheme;
 @property(strong, nonatomic) NSString *partnerUrl;
@@ -18,11 +25,6 @@
 @property(strong, nonatomic) NSString *partnerLabel;
 @property(strong, nonatomic) NSString *storeID;
 
-@property (nonatomic, strong) NSString *media;
-@property (nonatomic, strong) UIImage *imageMedia;
-@property (nonatomic, assign) BOOL isImageMediaLoading;
-@property (nonatomic, assign) NSInteger countImageMediaLoad;
-
 -(id)initWithJSONObject:(NSDictionary*)jsonObject;
 
 @end

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMServicesConfig.h

@@ -8,8 +8,8 @@
 
 // Version of API
 #define APM_API_VERSION @"3.0"
-#define APM_SERVICES_VERSION_NAME @"2.1.1"
-#define APM_SERVICES_VERSION_CODE @"2110"
+#define APM_SERVICES_VERSION_NAME @"2.1.2"
+#define APM_SERVICES_VERSION_CODE @"2120"
 
 //URL
 #define APM_URL_API_PROD @"https://api.appsmiles.eu/" //Url API prod

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMServicesDataUtils.h

@@ -17,6 +17,7 @@
 +(id)jsonObject:(NSDictionary*)jsonObject numberForKey:(NSString*)key defaultValue:(NSNumber*)defaultValue;
 +(id)jsonObject:(NSDictionary*)jsonObject arrayForKey:(NSString*)key defaultValue:(id)defaultValue class:(Class)class;
 +(NSDate*)jsonObject:(NSDictionary*)jsonObject dateForKey:(NSString*)key defaultValue:(id)defaultValue dateFormat:(NSString*)dateFormat;
++(NSDate*)jsonObject:(NSDictionary*)jsonObject dateTimestampForKey:(NSString*)key defaultValue:(id)defaultValue;
 
 #pragma mark - NSUserDefaults
 

APMServices/Frameworks/APMServices.framework/Versions/A/Headers/APMUserStatusUtils.h

@@ -9,6 +9,7 @@
 #import <Foundation/Foundation.h>
 
 @class APMUserStatus;
+@class APMUser;
 
 @interface APMUserStatusUtils : NSObject
 
@@ -16,5 +17,6 @@
 +(APMUserStatus*)statusFromId:(NSInteger)identifiant withStatus:(NSMutableArray*)array;
 +(APMUserStatus*)nextStatusFromCurrentStatus:(APMUserStatus*)currentStatus withStatus:(NSMutableArray*)array;
 +(APMUserStatus*)nextStatusForUser:(NSInteger)statusId withStatus:(NSMutableArray*)array;
++(NSInteger)currentStatusIndex:(APMUser*)user;
 
 @end