feat: add iOS impl

WoLewicki · WoLewicki · commit ebcb0751fd87 · 2023-02-15T14:47:24.000+01:00
diff --git a/RNPermissions.podspec b/RNPermissions.podspec
@@ -1,9 +1,10 @@
 require 'json'
 package = JSON.parse(File.read('./package.json'))
 
+fabric_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+
 Pod::Spec.new do |s|
   s.name                      = "RNPermissions"
-  s.dependency                  "React-Core"
 
   s.version                   = package["version"]
   s.license                   = package["license"]
@@ -16,5 +17,29 @@ Pod::Spec.new do |s|
   s.requires_arc              = true
 
   s.source                    = { :git => package["repository"]["url"], :tag => s.version }
-  s.source_files              = "ios/*.{h,m}"
+  s.source_files  = "ios/*.{h,m,mm}"
+
+  if fabric_enabled
+    folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+
+    s.pod_target_xcconfig = {
+      'HEADER_SEARCH_PATHS' => '"$(PODS_ROOT)/boost" "$(PODS_ROOT)/boost-for-react-native" "$(PODS_ROOT)/RCT-Folly"',
+      'CLANG_CXX_LANGUAGE_STANDARD' => 'c++17',
+    }
+    s.platforms       = { ios: '11.0', tvos: '11.0' }
+    s.compiler_flags  = folly_compiler_flags + ' -DRCT_NEW_ARCH_ENABLED'
+
+    s.dependency "React"
+    s.dependency "React-RCTFabric" # This is for fabric component
+    s.dependency "React-Codegen"
+    s.dependency "RCT-Folly"
+    s.dependency "RCTRequired"
+    s.dependency "RCTTypeSafety"
+    s.dependency "ReactCommon/turbomodule/core"
+  else
+    s.platforms = { :ios => "9.0", :tvos => "9.0" }
+
+    s.dependency "React-Core"
+  end
+
 end
diff --git a/ios/AppTrackingTransparency/RNPermissionHandlerAppTrackingTransparency.h b/ios/AppTrackingTransparency/RNPermissionHandlerAppTrackingTransparency.h
@@ -1,4 +1,4 @@
-#import "RNPermissions.h"
+#import "RNPermissionsHelper.h"
 
 @interface RNPermissionHandlerAppTrackingTransparency : NSObject<RNPermissionHandler>
 
diff --git a/ios/BluetoothPeripheral/RNPermissionHandlerBluetoothPeripheral.h b/ios/BluetoothPeripheral/RNPermissionHandlerBluetoothPeripheral.h
@@ -1,4 +1,4 @@
-#import "RNPermissions.h"
+#import "RNPermissionsHelper.h"
 
 @interface RNPermissionHandlerBluetoothPeripheral : NSObject<RNPermissionHandler>
 
diff --git a/ios/Calendars/RNPermissionHandlerCalendars.h b/ios/Calendars/RNPermissionHandlerCalendars.h
@@ -1,4 +1,4 @@
-#import "RNPermissions.h"
+#import "RNPermissionsHelper.h"
 
 @interface RNPermissionHandlerCalendars : NSObject<RNPermissionHandler>
 
diff --git a/ios/Camera/RNPermissionHandlerCamera.h b/ios/Camera/RNPermissionHandlerCamera.h
@@ -1,4 +1,4 @@
-#import "RNPermissions.h"
+#import "RNPermissionsHelper.h"
 
 @interface RNPermissionHandlerCamera : NSObject<RNPermissionHandler>
 
diff --git a/ios/Contacts/RNPermissionHandlerContacts.h b/ios/Contacts/RNPermissionHandlerContacts.h
@@ -1,4 +1,4 @@
-#import "RNPermissions.h"
+#import "RNPermissionsHelper.h"
 
 @interface RNPermissionHandlerContacts : NSObject<RNPermissionHandler>
 
diff --git a/ios/FaceID/RNPermissionHandlerFaceID.h b/ios/FaceID/RNPermissionHandlerFaceID.h
@@ -1,4 +1,4 @@
-#import "RNPermissions.h"
+#import "RNPermissionsHelper.h"
 
 @interface RNPermissionHandlerFaceID : NSObject<RNPermissionHandler>
 
diff --git a/ios/FaceID/RNPermissionHandlerFaceID.m b/ios/FaceID/RNPermissionHandlerFaceID.m
@@ -41,7 +41,7 @@ - (void)checkWithResolver:(void (^ _Nonnull)(RNPermissionStatus))resolve
         return resolve(RNPermissionStatusNotAvailable);
     }
 
-    if (![RNPermissions isFlaggedAsRequested:[[self class] handlerUniqueId]]) {
+    if (![RNPermissionsHelper isFlaggedAsRequested:[[self class] handlerUniqueId]]) {
       return resolve(RNPermissionStatusNotDetermined);
     }
 
@@ -100,7 +100,7 @@ - (void)UIApplicationDidBecomeActiveNotification:(__unused NSNotification *)noti
                                                   name:UIApplicationDidBecomeActiveNotification
                                                 object:nil];
 
-  [RNPermissions flagAsRequested:[[self class] handlerUniqueId]];
+  [RNPermissionsHelper flagAsRequested:[[self class] handlerUniqueId]];
   [self checkWithResolver:_resolve rejecter:_reject];
 }
 
diff --git a/ios/LocationAccuracy/RNPermissionHandlerLocationAccuracy.h b/ios/LocationAccuracy/RNPermissionHandlerLocationAccuracy.h
@@ -1,4 +1,4 @@
-#import "RNPermissions.h"
+#import "RNPermissionsHelper.h"
 
 @interface RNPermissionHandlerLocationAccuracy : NSObject
 
diff --git a/ios/LocationAlways/RNPermissionHandlerLocationAlways.h b/ios/LocationAlways/RNPermissionHandlerLocationAlways.h
@@ -1,4 +1,4 @@
-#import "RNPermissions.h"
+#import "RNPermissionsHelper.h"
 
 @interface RNPermissionHandlerLocationAlways : NSObject<RNPermissionHandler>
 
diff --git a/ios/LocationWhenInUse/RNPermissionHandlerLocationWhenInUse.h b/ios/LocationWhenInUse/RNPermissionHandlerLocationWhenInUse.h
@@ -1,4 +1,4 @@
-#import "RNPermissions.h"
+#import "RNPermissionsHelper.h"
 
 @interface RNPermissionHandlerLocationWhenInUse : NSObject<RNPermissionHandler>
 
diff --git a/ios/MediaLibrary/RNPermissionHandlerMediaLibrary.h b/ios/MediaLibrary/RNPermissionHandlerMediaLibrary.h
@@ -1,4 +1,4 @@
-#import "RNPermissions.h"
+#import "RNPermissionsHelper.h"
 
 @interface RNPermissionHandlerMediaLibrary : NSObject<RNPermissionHandler>
 
diff --git a/ios/Microphone/RNPermissionHandlerMicrophone.h b/ios/Microphone/RNPermissionHandlerMicrophone.h
@@ -1,4 +1,4 @@
-#import "RNPermissions.h"
+#import "RNPermissionsHelper.h"
 
 @interface RNPermissionHandlerMicrophone : NSObject<RNPermissionHandler>
 
diff --git a/ios/Motion/RNPermissionHandlerMotion.h b/ios/Motion/RNPermissionHandlerMotion.h
@@ -1,4 +1,4 @@
-#import "RNPermissions.h"
+#import "RNPermissionsHelper.h"
 
 @interface RNPermissionHandlerMotion : NSObject<RNPermissionHandler>
 
diff --git a/ios/Motion/RNPermissionHandlerMotion.m b/ios/Motion/RNPermissionHandlerMotion.m
@@ -38,7 +38,7 @@ - (void)checkWithResolver:(void (^ _Nonnull)(RNPermissionStatus))resolve
     }
   }
 
-  if (![RNPermissions isFlaggedAsRequested:[[self class] handlerUniqueId]]) {
+  if (![RNPermissionsHelper isFlaggedAsRequested:[[self class] handlerUniqueId]]) {
     return resolve(RNPermissionStatusNotDetermined);
   }
 
@@ -65,7 +65,7 @@ - (void)requestWithResolver:(void (^ _Nonnull)(RNPermissionStatus))resolve
       return reject(error);
     }
 
-    [RNPermissions flagAsRequested:[[self class] handlerUniqueId]];
+    [RNPermissionsHelper flagAsRequested:[[self class] handlerUniqueId]];
 
     if (error != nil) {
       return resolve(RNPermissionStatusDenied);
diff --git a/ios/Notifications/RNPermissionHandlerNotifications.h b/ios/Notifications/RNPermissionHandlerNotifications.h
@@ -1,4 +1,4 @@
-#import "RNPermissions.h"
+#import "RNPermissionsHelper.h"
 
 @interface RNPermissionHandlerNotifications : NSObject
 
diff --git a/ios/PhotoLibrary/RNPermissionHandlerPhotoLibrary.h b/ios/PhotoLibrary/RNPermissionHandlerPhotoLibrary.h
@@ -1,4 +1,4 @@
-#import "RNPermissions.h"
+#import "RNPermissionsHelper.h"
 
 @interface RNPermissionHandlerPhotoLibrary : NSObject<RNPermissionHandler>
 
diff --git a/ios/PhotoLibraryAddOnly/RNPermissionHandlerPhotoLibraryAddOnly.h b/ios/PhotoLibraryAddOnly/RNPermissionHandlerPhotoLibraryAddOnly.h
@@ -1,4 +1,4 @@
-#import "RNPermissions.h"
+#import "RNPermissionsHelper.h"
 
 @interface RNPermissionHandlerPhotoLibraryAddOnly : NSObject<RNPermissionHandler>
 
diff --git a/ios/RNPermissionsHelper.h b/ios/RNPermissionsHelper.h
@@ -1,5 +1,4 @@
-#import <React/RCTBridgeModule.h>
-#import <React/RCTConvert.h>
+#import <React/RCTBridge.h>
 
 typedef NS_ENUM(NSInteger, RNPermission) {
   RNPermissionUnknown = 0,
@@ -56,9 +55,6 @@ typedef NS_ENUM(NSInteger, RNPermission) {
 #endif
 };
 
-@interface RCTConvert (RNPermission)
-@end
-
 typedef enum {
   RNPermissionStatusNotAvailable = 0,
   RNPermissionStatusNotDetermined = 1,
@@ -84,7 +80,8 @@ typedef enum {
 
 @end
 
-@interface RNPermissions : NSObject <RCTBridgeModule>
+
+@interface RNPermissionsHelper : NSObject
 
 + (bool)isFlaggedAsRequested:(NSString * _Nonnull)handlerId;
 
diff --git a/ios/RNPermissionsHelper.m b/ios/RNPermissionsHelper.m
@@ -0,0 +1,29 @@
+#import "RNPermissionsHelper.h"
+
+@implementation RNPermissionsHelper
+
+static NSString* SETTING_KEY = @"@RNPermissions:Requested";
+
+
+
++ (bool)isFlaggedAsRequested:(NSString * _Nonnull)handlerId {
+  NSArray<NSString *> *requested = [[NSUserDefaults standardUserDefaults] arrayForKey:SETTING_KEY];
+  return requested == nil ? false : [requested containsObject:handlerId];
+}
+
++ (void)flagAsRequested:(NSString * _Nonnull)handlerId {
+  NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
+  NSMutableArray *requested = [[userDefaults arrayForKey:SETTING_KEY] mutableCopy];
+
+  if (requested == nil) {
+    requested = [NSMutableArray new];
+  }
+
+  if (![requested containsObject:handlerId]) {
+    [requested addObject:handlerId];
+    [userDefaults setObject:requested forKey:SETTING_KEY];
+    [userDefaults synchronize];
+  }
+}
+
+@end
diff --git a/ios/RNPermissionsModule.h b/ios/RNPermissionsModule.h
@@ -0,0 +1,19 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <rnpermissions/rnpermissions.h>
+#else
+#import <React/RCTBridge.h>
+#endif
+#import <React/RCTConvert.h>
+#import "RNPermissionsHelper.h"
+
+@interface RCTConvert (RNPermission)
+@end
+
+@interface RNPermissionsModule : NSObject
+#ifdef RCT_NEW_ARCH_ENABLED
+                                   <NativePermissionsModuleSpec>
+#else
+                                   <RCTBridgeModule>
+#endif
+
+@end
diff --git a/ios/RNPermissionsModule.mm b/ios/RNPermissionsModule.mm
diff --git a/ios/Reminders/RNPermissionHandlerReminders.h b/ios/Reminders/RNPermissionHandlerReminders.h
diff --git a/ios/Siri/RNPermissionHandlerSiri.h b/ios/Siri/RNPermissionHandlerSiri.h
diff --git a/ios/Siri/RNPermissionHandlerSiri.mm b/ios/Siri/RNPermissionHandlerSiri.mm
diff --git a/ios/SpeechRecognition/RNPermissionHandlerSpeechRecognition.h b/ios/SpeechRecognition/RNPermissionHandlerSpeechRecognition.h
diff --git a/ios/StoreKit/RNPermissionHandlerStoreKit.h b/ios/StoreKit/RNPermissionHandlerStoreKit.h

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#import "RNPermissions.h"`
	`1`	`+#import "RNPermissionsHelper.h"`
`2`	`2`
`3`	`3`	`@interface RNPermissionHandlerAppTrackingTransparency : NSObject<RNPermissionHandler>`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ - (void)checkWithResolver:(void (^ _Nonnull)(RNPermissionStatus))resolve`
`41`	`41`	`return resolve(RNPermissionStatusNotAvailable);`
`42`	`42`	`}`
`43`	`43`
`44`		`- if (![RNPermissions isFlaggedAsRequested:[[self class] handlerUniqueId]]) {`
	`44`	`+ if (![RNPermissionsHelper isFlaggedAsRequested:[[self class] handlerUniqueId]]) {`
`45`	`45`	`return resolve(RNPermissionStatusNotDetermined);`
`46`	`46`	`}`
`47`	`47`
`@@ -100,7 +100,7 @@ - (void)UIApplicationDidBecomeActiveNotification:(__unused NSNotification *)noti`
`100`	`100`	`name:UIApplicationDidBecomeActiveNotification`
`101`	`101`	`object:nil];`
`102`	`102`
`103`		`- [RNPermissions flagAsRequested:[[self class] handlerUniqueId]];`
	`103`	`+ [RNPermissionsHelper flagAsRequested:[[self class] handlerUniqueId]];`
`104`	`104`	`[self checkWithResolver:_resolve rejecter:_reject];`
`105`	`105`	`}`
`106`	`106`