Merge pull request ZapicInc#31 from dsarfati/ios-compatibility

iOS Updates

Author: dsarfati

Assets/Plugins/iOS/Zapic/Controllers/ZPCPlayerManager.h

@@ -3,6 +3,7 @@
 #import "ZPCScriptMessageHandler.h"
 
 @interface ZPCPlayerManager : NSObject
+@property (readonly) ZPCPlayer *player;
 - (instancetype)initWithHandler:(ZPCScriptMessageHandler *)handler;
 - (void)addLoginHandler:(void (^)(ZPCPlayer *))handler;
 - (void)addLogoutHandler:(void (^)(ZPCPlayer *))handler;

Assets/Plugins/iOS/Zapic/Controllers/ZPCPlayerManager.m

@@ -1,7 +1,6 @@
 #import "ZPCPlayerManager.h"
 
 @interface ZPCPlayerManager ()
-@property ZPCPlayer *player;
 @property (nonatomic, strong) NSMutableArray<void (^)(ZPCPlayer *)> *loginHandlers;
 @property (nonatomic, strong) NSMutableArray<void (^)(ZPCPlayer *)> *logoutHandlers;
 @end

Assets/Plugins/iOS/Zapic/Controllers/Zapic.h

@@ -39,6 +39,12 @@ extern NSString *const ZPCPageStats;
  */
 @property (class, nonatomic, copy, nullable) void (^logoutHandler)(ZPCPlayer *);
 
+/**
+ Gets the current player. nil if the player is not logged in.
+ Deprecated in favor of getPlayer:, this will be removed in a future version.
+ */
+@property (class, nonatomic, copy, nullable, readonly) ZPCPlayer *player DEPRECATED_MSG_ATTRIBUTE("Please use getPlayer:");
+
 #pragma mark - Zapic Methods
 
 /**

Assets/Plugins/iOS/Zapic/Controllers/Zapic.m

@@ -55,6 +55,10 @@ + (void)initialize {
     }
 }
 
++ (ZPCPlayer *)player {
+    return _core.playerManager.player;
+}
+
 #pragma mark - Zapic Methods
 
 + (void)start {

Assets/Plugins/iOS/Zapic/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.0</string>
+	<string>2.0.0</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>

Assets/Plugins/iOS/Zapic/Models/ZPCStatistic.h

@@ -11,6 +11,11 @@
  */
 @property (nullable, readonly) NSString *title;
 
+/**
+ The developer defined metadata for this statistic.
+ */
+@property (nullable, readonly) NSString *metadata;
+
 /**
  The current player's score, formatted as defined in the portal.
  */
@@ -26,12 +31,6 @@
  */
 @property (nullable, readonly) NSNumber *percentile;
 
-/**
- The player's rank on the leaderboard (ex. Top 100). If the player
- is not on the leaderboard this value will be nil.
- */
-@property (nullable, readonly) NSNumber *rank;
-
 /**
  Initialize a new statistic with json data
 

Assets/Plugins/iOS/Zapic/Models/ZPCStatistic.m

@@ -6,9 +6,9 @@ - (instancetype)initWithData:(nonnull NSDictionary *)data {
     if (self = [super init]) {
         _identifier = data[@"id"];
         _title = data[@"title"];
+        _metadata = data[@"metadata"];
         _formattedScore = data[@"formattedScore"];
         _score = data[@"score"];
-        _rank = data[@"rank"];
         _percentile = data[@"percentile"];
     }
     return self;

Assets/Plugins/iOS/Zapic/Utilities/ZPCInjectedJS.m

@@ -6,15 +6,15 @@ @implementation ZPCInjectedJS
 
 + (NSString *)getInjectedScript {
     //Gets the info to be injected
-    NSString *sdkVersion = @"1.3.0";
+    NSString *sdkVersion = @"2.0.0";
     NSDictionary *appInfo = NSBundle.mainBundle.infoDictionary;
     NSString *appVersion = appInfo[@"CFBundleShortVersionString"];
     NSString *appBuild = appInfo[@"CFBundleVersion"];
     NSString *bundleId = NSBundle.mainBundle.bundleIdentifier;
     NSString *deviceId = UIDevice.currentDevice.identifierForVendor.UUIDString;
     NSString *iosVersion = UIDevice.currentDevice.systemVersion;
     NSString *installId = [self installId];
-    const int sdkApiVersion = 3;
+    const int sdkApiVersion = 4;
     const int loadTimeout = 10000;
 
     NSString *adId = @"";

Assets/Plugins/iOS/Zapic/Utilities/ZPCLog.m

@@ -2,8 +2,6 @@
 
 @implementation ZPCLog
 
-bool isEnabled = true;
-
 + (void)error:(NSString *)message, ... NS_FORMAT_FUNCTION(1, 2) {
     va_list args;
     va_start(args, message);
@@ -38,8 +36,6 @@ + (void)info:(NSString *)message, ... NS_FORMAT_FUNCTION(1, 2) {
 }
 
 + (void)writeLog:(NSString *)message withSymbol:(NSString *)symbol {
-    if (!isEnabled)
-        return;
 
     NSLog(@"[Zapic][%@]-%@", symbol, message);
 }

Assets/Plugins/iOS/Zapic/Utilities/ZPCUtils.h

@@ -8,4 +8,5 @@
 + (NSString *)toIsoDate:(NSDate *)date;
 + (NSDate *)parseDateIso:(NSString *)dateString;
 + (void)cleanDictionary:(NSDictionary *)dict;
++ (int)notchSize;
 @end

Assets/Plugins/iOS/Zapic/Utilities/ZPCUtils.m

@@ -69,4 +69,13 @@ + (void)cleanArray:(NSMutableArray *)array {
     }
 }
 
++ (int)notchSize {
+    if (@available(iOS 11.0, *)) {
+        UIWindow *window = UIApplication.sharedApplication.keyWindow;
+        return window.safeAreaInsets.top;
+    } else {
+        return 0;
+    }
+}
+
 @end

Assets/Plugins/iOS/Zapic/Views/ZPCBanner.m

@@ -16,15 +16,9 @@ @implementation ZPCBanner
 
 - (instancetype)initWithTitle:(NSString *)title subtitle:(NSString *)subtitle image:(UIImage *)image {
     if (self = [super initWithFrame:CGRectZero]) {
-        int screenHeight = (int)[UIScreen mainScreen].nativeBounds.size.height;
+        _topPadding = [ZPCUtils notchSize];
 
-        //Check if iPhone X
-        if (screenHeight == 2436) {
-            if (@available(iOS 11.0, *)) {
-                UIWindow *window = UIApplication.sharedApplication.keyWindow;
-                _topPadding = window.safeAreaInsets.top;
-            }
-        } else if (![UIApplication sharedApplication].isStatusBarHidden) {
+        if (![UIApplication sharedApplication].isStatusBarHidden) {
             _topPadding = [UIApplication sharedApplication].statusBarFrame.size.height;
         }
 

Assets/Zapic/Plugins/iOS/ZapicInterface.mm

@@ -21,7 +21,6 @@
   BOOL active;
   char* start;
   char* end;
-  BOOL hasTotalUsers;
   int totalUsers;
   int status;
   char* formattedScore;
@@ -42,7 +41,6 @@
   char* metadata;
   char* start;
   char* end;
-  BOOL hasTotalUsers;
   int totalUsers;
   int status;
   char* formattedScore;
@@ -56,13 +54,12 @@
 {
   char* identifier;
   char* title;
+  char* metadata;
   char* formattedScore;
   BOOL hasScore;
   double score;
-  BOOL hasRank;
-  int rank;
   BOOL hasPercentile;
-  float percentile;
+  int percentile;
 } ZPCUStatistic;
 
 typedef struct
@@ -136,7 +133,6 @@ ZPCUCompetition toUnityCompetition(ZPCCompetition *c){
   competition.active = c.active;
   competition.start = toCString([ZPCUtils toIsoDate:c.start]);
   competition.end = toCString([ZPCUtils toIsoDate:c.end]);
-  competition.hasTotalUsers = hasValue(c.totalUsers);
   competition.totalUsers = [c.totalUsers intValue];
   competition.status = (int)c.status;
   competition.formattedScore = toCString(c.formattedScore);
@@ -158,7 +154,6 @@ ZPCUChallenge toUnityChallenge(ZPCChallenge *c){
   challenge.active = c.active;
   challenge.start = toCString([ZPCUtils toIsoDate:c.start]);
   challenge.end =toCString([ZPCUtils toIsoDate:c.end]);
-  challenge.hasTotalUsers = hasValue(c.totalUsers);
   challenge.totalUsers = [c.totalUsers intValue];
   challenge.status = (int)c.status;
   challenge.formattedScore = toCString(c.formattedScore);
@@ -173,11 +168,10 @@ ZPCUStatistic toUnityStatistic(ZPCStatistic *c){
   ZPCUStatistic statistic;
   statistic.identifier = toCString(c.identifier);
   statistic.title=toCString(c.title);
+  statistic.metadata = toCString(c.metadata);
   statistic.formattedScore=toCString(c.formattedScore);
   statistic.hasScore = hasValue(c.score);
   statistic.score = [c.score doubleValue];
-  statistic.hasRank = hasValue(c.rank);
-  statistic.rank = [c.rank intValue];
   statistic.hasPercentile = hasValue(c.percentile);
   statistic.percentile = [c.percentile floatValue];
   return statistic;