Rework Android patches [0.20]

Kureev Alexey · Kureev Alexey · commit 8450d972fc08 · 2016-04-11T18:04:08.000+02:00
diff --git a/src/android/patches/0.20/addPackagePatch.js b/src/android/patches/0.20/addPackagePatch.js
diff --git a/src/android/patches/0.20/makeImportPatch.js b/src/android/patches/0.20/makeImportPatch.js
@@ -0,0 +1,6 @@
+module.exports = function makeImportPatch(packageImportPath) {
+  return {
+    pattern: 'import com.facebook.react.ReactActivity;',
+    patch: '\n' + packageImportPath,
+  };
+};
diff --git a/src/android/patches/0.20/makeMainActivityPatch.js b/src/android/patches/0.20/makeMainActivityPatch.js
diff --git a/src/android/patches/0.20/makePackagePatch.js b/src/android/patches/0.20/makePackagePatch.js
@@ -0,0 +1,13 @@
+module.exports = function makePackagePatch(packageInstance, params) {
+  const processedInstance = packageInstance.replace(
+    /\$\{(\w+)\}/g,
+    (pattern, paramName) => params[paramName]
+      ? `this.getResources().getString(R.strings.${paramName})`
+      : null
+  );
+
+  return {
+    pattern: 'new MainReactPackage()',
+    patch: ',\n            ' + processedInstance,
+  };
+};
diff --git a/src/android/patches/makeStringsPatch.js b/src/android/patches/makeStringsPatch.js
@@ -0,0 +1,10 @@
+module.exports = function makeStringsPatch(params) {
+  const patch = Object.keys(params).map(key =>
+    `    <string moduleConfig="true" name="${key}">${params[key]}</string>`
+  ).join('\n') + '\n';
+
+  return {
+    pattern: '<resources>\n',
+    patch: patch,
+  };
+};
diff --git a/src/android/registerNativeModule.js b/src/android/registerNativeModule.js
@@ -4,6 +4,7 @@ const getPrefix = require('./getPrefix');
 const isInstalled = require('./isInstalled');
 
 const applyPatch = require('./patches/applyPatch');
+const makeStringsPatch = require('./patches/makeStringsPatch');
 const makeSettingsPatch = require(`./patches/makeSettingsPatch`);
 const makeBuildPatch = require(`./patches/makeBuildPatch`);
 
@@ -13,28 +14,32 @@ module.exports = function registerNativeAndroidModule(
   params,
   projectConfig
 ) {
-  const buildPatch = makeBuildPatch(name);
-  const isInstalled = fs
-    .readFileSync(projectConfig.buildGradlePath)
-    .indexOf(buildPatch.patch) > -1;
 
   if (isInstalled(projectConfig, name)) {
     return false;
   }
 
+  const buildPatch = makeBuildPatch(name);
   const prefix = getPrefix(getReactVersion(projectConfig.folder));
-  const makeMainActivityPatch = require(`./${prefix}/makeMainActivityPatch`);
+  const makeImportPatch = require(`./${prefix}/makeImportPatch`);
+  const makePackagePatch = require(`./${prefix}/makePackagePatch`);
 
   applyPatch(
     projectConfig.settingsGradlePath,
     makeSettingsPatch(name, androidConfig, projectConfig)
   );
 
   applyPatch(projectConfig.buildGradlePath, buildPatch);
+  applyPatch(projectConfig.stringsPath, makeStringsPatch(params));
+
+  applyPatch(
+    projectConfig.mainActivityPath,
+    makePackagePatch(androidConfig.packageInstance, params)
+  );
 
   applyPatch(
     projectConfig.mainActivityPath,
-    makeMainActivityPatch(androidConfig, params)
+    makeImportPatch(androidConfig.packageImportPath)
   );
 
   return true;
diff --git a/src/android/unregisterNativeModule.js b/src/android/unregisterNativeModule.js
@@ -1,59 +1,52 @@
-const readFile = require('./fs').readFile;
-const writeFile = require('./fs').writeFile;
-const compose = require('lodash').flowRight;
+const fs = require('fs');
 const getReactVersion = require('../getReactNativeVersion');
 const getPrefix = require('./getPrefix');
 const isInstalled = require('./isInstalled');
 
 const revokePatch = require('./patches/revokePatch');
 const makeSettingsPatch = require('./patches/makeSettingsPatch');
-const makeBuildPatch = require(`./patches/makeBuildPatch`);
+const makeBuildPatch = require('./patches/makeBuildPatch');
+const makeStringsPatch = require('./patches/makeStringsPatch');
 
 module.exports = function unregisterNativeAndroidModule(
   name,
   androidConfig,
   projectConfig
 ) {
-  const prefix = getPrefix(getReactVersion(projectConfig.folder));
-
-  const buildPatch = makeBuildPatch(name);
 
   if (!isInstalled(projectConfig, name)) {
     return false;
   }
 
-  const getAddPackagePatch = require(`./${prefix}/addPackagePatch`);
-
-  /**
-   * Make a MainActivity.java program patcher
-   * @param  {String}   importPath Import path, e.g. com.oblador.vectoricons.VectorIconsPackage;
-   * @param  {String}   instance   Code to instance a package, e.g. new VectorIconsPackage();
-   * @return {Function}            Patcher function
-   */
-  const makeMainActivityPatcher = (content) => {
-    const patched = cut(content, androidConfig.packageImportPath + '\n');
-    return cut(patched, getAddPackagePatch(androidConfig));
-  };
+  const buildPatch = makeBuildPatch(name);
+  const prefix = getPrefix(getReactVersion(projectConfig.folder));
+  const makeImportPatch = require(`./${prefix}/makeImportPatch`);
+  const makePackagePatch = require(`./${prefix}/makePackagePatch`);
+  const strings = fs.readFileSync(projectConfig.stringsPath, 'utf8');
+  var params = {};
+
+  strings.replace(
+    /moduleConfig="true" name="(\w+)">(\w+)</g,
+    (_, name, value) => params[name] = value
+  );
 
   revokePatch(
     projectConfig.settingsGradlePath,
     makeSettingsPatch(name, androidConfig, projectConfig)
   );
 
+  revokePatch(projectConfig.buildGradlePath, buildPatch);
+  revokePatch(projectConfig.stringsPath, makeStringsPatch(params));
+
   revokePatch(
-    projectConfig.buildGradlePath,
-    makeBuildPatch(name)
+    projectConfig.mainActivityPath,
+    makePackagePatch(androidConfig.packageInstance, params)
   );
 
-  const applyMainActivityPatch = compose(
-    writeFile(projectConfig.mainActivityPath),
-    makeMainActivityPatcher,
-    readFile(projectConfig.mainActivityPath)
+  revokePatch(
+    projectConfig.mainActivityPath,
+    makeImportPatch(androidConfig.packageImportPath)
   );
 
-  compose(
-    applyMainActivityPatch
-  )();
-
   return true;
 };
