Using prefixes based on react-native module name

Kureev Alexey · Kureev Alexey · commit 6cf965813365 · 2016-04-20T18:46:23.000+02:00
diff --git a/package.json b/package.json
@@ -37,6 +37,7 @@
     "npmlog": "^2.0.0",
     "plist": "^1.2.0",
     "semver": "^5.1.0",
+    "to-camel-case": "^1.0.0",
     "xcode": "^0.8.2"
   },
   "devDependencies": {
diff --git a/src/android/patches/0.17/makePackagePatch.js b/src/android/patches/0.17/makePackagePatch.js
@@ -1,7 +1,7 @@
 const applyParams = require('../applyParams');
 
-module.exports = function makePackagePatch(packageInstance, params) {
-  const processedInstance = applyParams(packageInstance, params);
+module.exports = function makePackagePatch(packageInstance, params, prefix) {
+  const processedInstance = applyParams(packageInstance, params, prefix);
 
   return {
     pattern: '.addPackage(new MainReactPackage())',
diff --git a/src/android/patches/0.18/makePackagePatch.js b/src/android/patches/0.18/makePackagePatch.js
@@ -1,7 +1,7 @@
 const applyParams = require('../applyParams');
 
-module.exports = function makePackagePatch(packageInstance, params) {
-  const processedInstance = applyParams(packageInstance, params);
+module.exports = function makePackagePatch(packageInstance, params, prefix) {
+  const processedInstance = applyParams(packageInstance, params, prefix);
 
   return {
     pattern: 'new MainReactPackage()',
diff --git a/src/android/patches/0.20/makePackagePatch.js b/src/android/patches/0.20/makePackagePatch.js
@@ -1,7 +1,7 @@
 const applyParams = require('../applyParams');
 
-module.exports = function makePackagePatch(packageInstance, params) {
-  const processedInstance = applyParams(packageInstance, params);
+module.exports = function makePackagePatch(packageInstance, params, prefix) {
+  const processedInstance = applyParams(packageInstance, params, prefix);
 
   return {
     pattern: 'new MainReactPackage()',
diff --git a/src/android/patches/applyParams.js b/src/android/patches/applyParams.js
@@ -1,8 +1,14 @@
-module.exports = function applyParams(str, params) {
+const toCamelCase = require('to-camel-case');
+
+module.exports = function applyParams(str, params, prefix) {
   return str.replace(
     /\$\{(\w+)\}/g,
-    (pattern, paramName) => params[paramName]
-      ? `this.getResources().getString(R.strings.${paramName})`
-      : null
+    (pattern, paramName) => {
+      const formattedName = toCamelCase(`${prefix}-${paramName}`);
+
+      return params[paramName]
+      ? `this.getResources().getString(R.strings.${formattedName})`
+      : null;
+    }
   );
 };
diff --git a/src/android/registerNativeModule.js b/src/android/registerNativeModule.js
@@ -34,7 +34,7 @@ module.exports = function registerNativeAndroidModule(
 
   applyPatch(
     projectConfig.mainActivityPath,
-    makePackagePatch(androidConfig.packageInstance, params)
+    makePackagePatch(androidConfig.packageInstance, params, name)
   );
 
   applyPatch(
diff --git a/test/android/patches/applyPatch.js b/test/android/patches/applyPatch.js
@@ -5,7 +5,13 @@ const applyParams = require('../../../src/android/patches/applyParams');
 describe('applyParams', () => {
   it('apply params to the string', () => {
     expect(
-      applyParams('${foo}', {foo: 'foo'})
-    ).to.be.equal('this.getResources().getString(R.strings.foo)');
+      applyParams('${foo}', {foo: 'foo'}, 'react-native')
+    ).to.be.equal('this.getResources().getString(R.strings.reactNativeFoo)');
+  });
+
+  it('use null if no params provided', () => {
+    expect(
+      applyParams('${foo}', {}, 'react-native')
+    ).to.be.equal('null');
   });
 });
