iOS version check

kamsteegsoftware · Jun 15, 2017 · 122be1d · 122be1d
1 parent ba45349
commit 122be1d
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 29 deletions.
diff --git a/ReactNativeAlternateIcons.m b/ReactNativeAlternateIcons.m
@@ -5,50 +5,68 @@
 
 @implementation ReactNativeAlternateIcons
 
+#define SYSTEM_VERSION_EQUAL_TO(v)                  ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedSame)
+#define SYSTEM_VERSION_GREATER_THAN(v)              ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedDescending)
+#define SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(v)  ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedAscending)
+#define SYSTEM_VERSION_LESS_THAN(v)                 ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedAscending)
+#define SYSTEM_VERSION_LESS_THAN_OR_EQUAL_TO(v)     ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedDescending)
+
 RCT_EXPORT_MODULE();
 
 RCT_EXPORT_METHOD(setIconName:(NSString *)name){
-    NSLog(@"Setting the following icon: %@", name);
-    [[UIApplication sharedApplication] setAlternateIconName:name completionHandler:^(NSError * _Nullable error) {
-        if( error != nil ){
-            NSLog(@"Error: %@", error.description );
-        }
-    }];
+    if( SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"10.3") ){
+        [[UIApplication sharedApplication] setAlternateIconName:name completionHandler:^(NSError * _Nullable error) {
+            if( error != nil ){
+                NSLog(@"Error: %@", error.description );
+            }
+        }];
+    }
 }
 
 RCT_EXPORT_METHOD(reset){
-    [[UIApplication sharedApplication] setAlternateIconName:nil completionHandler:^(NSError * _Nullable error) {
-        if( error != nil ){
-            NSLog(@"Error: %@", error.description );
-        }
-    }];
+    if( SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"10.3") ){
+        [[UIApplication sharedApplication] setAlternateIconName:nil completionHandler:^(NSError * _Nullable error) {
+            if( error != nil ){
+                NSLog(@"Error: %@", error.description );
+            }
+        }];
+    }
 }
 
 RCT_EXPORT_METHOD(getIconName:(RCTResponseSenderBlock) callback ){
-    //resolve( [[UIApplication sharedApplication] alternateIconName] );]
-    NSString *name = [[UIApplication sharedApplication] alternateIconName];
-    if( name == nil ){
-        name = @"default";
-    }
+    NSString *name = @"default";
+    NSDictionary *results;
 
-    NSDictionary *results = @{
-                              @"iconName":name
-                              };
+    if( SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"10.3") ){
+        if( [[UIApplication sharedApplication] supportsAlternateIcons ] ){
+            name = [[UIApplication sharedApplication] alternateIconName];
+            if( name == nil ){
+                name = @"default";
+            }
+        }
+    }
 
+    results = @{
+                @"iconName":name
+                };
     callback(@[results]);
 }
 
 RCT_EXPORT_METHOD(supportDevice:(RCTResponseSenderBlock) callback){
-    NSDictionary *results;
+    NSDictionary *results = @{
+                              @"supported":@NO
+                              };
 
-    if( [[UIApplication sharedApplication] supportsAlternateIcons ] ){
-        results = @{
-            @"supported":YES
-        };
-    }else{
-        results = @{
-            @"supported":NO
-        };
+    if( SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(@"10.3") ){
+        if( [[UIApplication sharedApplication] supportsAlternateIcons ] ){
+            results = @{
+                        @"supported":@YES
+                        };
+        }else{
+            results = @{
+                        @"supported":@NO
+                        };
+        }
     }
 
     callback(@[results]);

diff --git a/...oj/project.xcworkspace/xcuserdata/joeykamsteeg.xcuserdatad/UserInterfaceState.xcuserstate b/...oj/project.xcworkspace/xcuserdata/joeykamsteeg.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-alternate-icons",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "React Native Alternate Icons for iOS 10.3+",
   "main": "ReactNativeAlternateIcons.ios.js",
   "scripts": {