Another big fixup, verifying compatibility between Android and iOS on function names, avoidance of conflicts with FIR* builtins.

mikelambert · mikelambert · commit f71a370c7231 · 2016-09-17T03:10:44.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,6 @@
 hs_err_pid*
 
 .DS_Store
+
+build
+*.iml
diff --git a/Analytics.js b/Analytics.js
@@ -4,13 +4,21 @@
 'use strict';
 
 var { NativeModules } = require('react-native');
-var FBAnalytics = NativeModules.FBAnalytics;
+var Analytics = NativeModules.RNFIRAnalytics;
 
 function setUserProperties(properties) {
   Object.keys(properties).forEach((key) => {
-    FBAnalytics.setUserProperty(key, properties[key]);
+    Analytics.setUserProperty(key, properties[key]);
   });
 }
 
-module.exports = {...FBAnalytics, setUserProperties};
+function logEvent(eventName, params) {
+  Analytics.logEvent(eventName, params);
+}
+
+module.exports = {
+  ...Analytics,
+  setUserProperties,
+  logEvent,
+};
 
diff --git a/RemoteConfig.js b/RemoteConfig.js
@@ -4,6 +4,6 @@
 'use strict';
 
 var { NativeModules } = require('react-native');
-var FBRemoteConfig = NativeModules.FBRemoteConfig;
+var RemoteConfig = NativeModules.RNFIRRemoteConfig;
 
-module.exports = FBRemoteConfig;
+module.exports = RemoteConfig;
diff --git a/android/src/main/java/org/jall/reactnative/firebase/FirebasePackage.java b/android/src/main/java/org/jall/reactnative/firebase/FirebasePackage.java
@@ -17,8 +17,8 @@ public class FirebasePackage implements ReactPackage {
     public List<NativeModule> createNativeModules(
             ReactApplicationContext reactContext) {
         List<NativeModule> modules = new ArrayList<>();
-        modules.add(new FIRRemoteConfig(reactContext));
-        modules.add(new FIRAnalytics(reactContext));
+        modules.add(new RNFIRRemoteConfig(reactContext));
+        modules.add(new RNFIRAnalytics(reactContext));
         return modules;
     }
 
diff --git a/android/src/main/java/org/jall/reactnative/firebase/RNFIRAnalytics.java b/android/src/main/java/org/jall/reactnative/firebase/RNFIRAnalytics.java
@@ -11,14 +11,14 @@
 
 import javax.annotation.Nullable;
 
-public class FIRAnalytics extends ReactContextBaseJavaModule {
-    public FIRAnalytics(ReactApplicationContext reactContext) {
+public class RNFIRAnalytics extends ReactContextBaseJavaModule {
+    public RNFIRAnalytics(ReactApplicationContext reactContext) {
         super(reactContext);
     }
 
     @Override
     public String getName() {
-        return "FIRAnalytics";
+        return "RNFIRAnalytics";
     }
 
     @ReactMethod
diff --git a/android/src/main/java/org/jall/reactnative/firebase/RNFIRRemoteConfig.java b/android/src/main/java/org/jall/reactnative/firebase/RNFIRRemoteConfig.java
@@ -16,14 +16,14 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 
-public class FIRRemoteConfig extends ReactContextBaseJavaModule {
-    public FIRRemoteConfig(ReactApplicationContext reactContext) {
+public class RNFIRRemoteConfig extends ReactContextBaseJavaModule {
+    public RNFIRRemoteConfig(ReactApplicationContext reactContext) {
         super(reactContext);
     }
 
     @Override
     public String getName() {
-        return "FIRRemoteConfig";
+        return "RNFIRRemoteConfig";
     }
 
     @ReactMethod
diff --git a/ios/Firebase.xcodeproj/project.pbxproj b/ios/Firebase.xcodeproj/project.pbxproj
@@ -7,8 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		D87A76C31C86A251004ABB23 /* FIRAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = D87A76C01C86A251004ABB23 /* FIRAnalytics.m */; };
-		D87A76C41C86A251004ABB23 /* FIRRemoteConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = D87A76C21C86A251004ABB23 /* FIRRemoteConfig.m */; };
+		D87A76C31C86A251004ABB23 /* RNFIRAnalytics.m in Sources */ = {isa = PBXBuildFile; fileRef = D87A76C01C86A251004ABB23 /* RNFIRAnalytics.m */; };
+		D87A76C41C86A251004ABB23 /* RNFIRRemoteConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = D87A76C21C86A251004ABB23 /* RNFIRRemoteConfig.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -24,10 +24,10 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		D87A76BF1C86A251004ABB23 /* FIRAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FIRAnalytics.h; path = Firebase/FIRAnalytics.h; sourceTree = "<group>"; };
-		D87A76C01C86A251004ABB23 /* FIRAnalytics.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FIRAnalytics.m; path = Firebase/FIRAnalytics.m; sourceTree = "<group>"; };
-		D87A76C11C86A251004ABB23 /* FIRRemoteConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FIRRemoteConfig.h; path = Firebase/FIRRemoteConfig.h; sourceTree = "<group>"; };
-		D87A76C21C86A251004ABB23 /* FIRRemoteConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FIRRemoteConfig.m; path = Firebase/FIRRemoteConfig.m; sourceTree = "<group>"; };
+		D87A76BF1C86A251004ABB23 /* RNFIRAnalytics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RNFIRAnalytics.h; path = Firebase/RNFIRAnalytics.h; sourceTree = "<group>"; };
+		D87A76C01C86A251004ABB23 /* RNFIRAnalytics.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RNFIRAnalytics.m; path = Firebase/RNFIRAnalytics.m; sourceTree = "<group>"; };
+		D87A76C11C86A251004ABB23 /* RNFIRRemoteConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RNFIRRemoteConfig.h; path = Firebase/RNFIRRemoteConfig.h; sourceTree = "<group>"; };
+		D87A76C21C86A251004ABB23 /* RNFIRRemoteConfig.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RNFIRRemoteConfig.m; path = Firebase/RNFIRRemoteConfig.m; sourceTree = "<group>"; };
 		D8D9DB831C6D03DB009FBC0E /* libFirebase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libFirebase.a; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
 
@@ -45,10 +45,10 @@
 		D8D9DB5B1C6D01F4009FBC0E = {
 			isa = PBXGroup;
 			children = (
-				D87A76BF1C86A251004ABB23 /* FIRAnalytics.h */,
-				D87A76C01C86A251004ABB23 /* FIRAnalytics.m */,
-				D87A76C11C86A251004ABB23 /* FIRRemoteConfig.h */,
-				D87A76C21C86A251004ABB23 /* FIRRemoteConfig.m */,
+				D87A76BF1C86A251004ABB23 /* RNFIRAnalytics.h */,
+				D87A76C01C86A251004ABB23 /* RNFIRAnalytics.m */,
+				D87A76C11C86A251004ABB23 /* RNFIRRemoteConfig.h */,
+				D87A76C21C86A251004ABB23 /* RNFIRRemoteConfig.m */,
 				D8D9DB661C6D01F4009FBC0E /* Products */,
 			);
 			sourceTree = "<group>";
@@ -117,8 +117,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D87A76C41C86A251004ABB23 /* FIRRemoteConfig.m in Sources */,
-				D87A76C31C86A251004ABB23 /* FIRAnalytics.m in Sources */,
+				D87A76C41C86A251004ABB23 /* RNFIRRemoteConfig.m in Sources */,
+				D87A76C31C86A251004ABB23 /* RNFIRAnalytics.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/ios/Firebase/RNFIRAnalytics.h b/ios/Firebase/RNFIRAnalytics.h
@@ -1,7 +1,7 @@
 #import <Foundation/Foundation.h>
 #import "RCTBridgeModule.h"
 
-@interface FIRAnalytics : NSObject <RCTBridgeModule>
+@interface RNFIRAnalytics : NSObject <RCTBridgeModule>
 
 @end
 
diff --git a/ios/Firebase/RNFIRAnalytics.m b/ios/Firebase/RNFIRAnalytics.m
@@ -1,8 +1,7 @@
-#import "FIRAnalytics.h"
+#import "RNFIRAnalytics.h"
 @import Firebase;
 
-@implementation FIRAnalytics
-@synthesize bridge = _bridge;
+@implementation RNFIRAnalytics
 
 RCT_EXPORT_MODULE();
 
@@ -23,7 +22,7 @@ - (dispatch_queue_t)methodQueue
     [FIRAnalytics setUserPropertyString:value forName:name];
 }
 
-RCT_EXPORT_METHOD(setUserID: (NSString *)userID)
+RCT_EXPORT_METHOD(setUserId: (NSString *)userID)
 {
     [FIRAnalytics setUserID:userID];
 }
diff --git a/ios/Firebase/RNFIRRemoteConfig.h b/ios/Firebase/RNFIRRemoteConfig.h
@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
 #import "RCTBridgeModule.h"
 
-@interface FIRRemoteConfig : NSObject <RCTBridgeModule>
+@interface RNFIRRemoteConfig : NSObject <RCTBridgeModule>
 
 @end
diff --git a/ios/Firebase/RNFIRRemoteConfig.m b/ios/Firebase/RNFIRRemoteConfig.m
@@ -1,8 +1,7 @@
-#import "FIRRemoteConfig.h"
+#import "RNFIRRemoteConfig.h"
 @import Firebase;
 
-@implementation FIRRemoteConfig
-@synthesize bridge = _bridge;
+@implementation RNFIRRemoteConfig
 
 RCT_EXPORT_MODULE();
 
@@ -110,7 +109,7 @@ - (dispatch_queue_t)methodQueue
 }
 
 
-RCT_EXPORT_METHOD(getNamedspacedString: (NSString *)key
+RCT_EXPORT_METHOD(getNamespacedString: (NSString *)key
                   withNamespace:(NSString *)namespace
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)

Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,14 @@`
`11`	`11`
`12`	`12`	`import javax.annotation.Nullable;`
`13`	`13`
`14`		`-public class FIRAnalytics extends ReactContextBaseJavaModule {`
`15`		`- public FIRAnalytics(ReactApplicationContext reactContext) {`
	`14`	`+public class RNFIRAnalytics extends ReactContextBaseJavaModule {`
	`15`	`+ public RNFIRAnalytics(ReactApplicationContext reactContext) {`
`16`	`16`	`super(reactContext);`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`@Override`
`20`	`20`	`public String getName() {`
`21`		`- return "FIRAnalytics";`
	`21`	`+ return "RNFIRAnalytics";`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`@ReactMethod`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`		`-#import "FIRAnalytics.h"`
	`1`	`+#import "RNFIRAnalytics.h"`
`2`	`2`	`@import Firebase;`
`3`	`3`
`4`		`-@implementation FIRAnalytics`
`5`		`-@synthesize bridge = _bridge;`
	`4`	`+@implementation RNFIRAnalytics`
`6`	`5`
`7`	`6`	`RCT_EXPORT_MODULE();`
`8`	`7`
`@@ -23,7 +22,7 @@ - (dispatch_queue_t)methodQueue`
`23`	`22`	`[FIRAnalytics setUserPropertyString:value forName:name];`
`24`	`23`	`}`
`25`	`24`
`26`		`-RCT_EXPORT_METHOD(setUserID: (NSString *)userID)`
	`25`	`+RCT_EXPORT_METHOD(setUserId: (NSString *)userID)`
`27`	`26`	`{`
`28`	`27`	`[FIRAnalytics setUserID:userID];`
`29`	`28`	`}`