refactor(cli): expose srcDir and srcMainDir (#3828)

ionic-team · Nov 19, 2020 · b1c2718 · b1c2718
1 parent a37e188
commit b1c2718
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 18 deletions.
diff --git a/cli/src/android/common.ts b/cli/src/android/common.ts
@@ -73,7 +73,10 @@ export async function editProjectSettingsAndroid(
   const appId = config.app.appId;
   const appName = config.app.appName;
 
-  const manifestPath = resolve(config.android.srcDirAbs, 'AndroidManifest.xml');
+  const manifestPath = resolve(
+    config.android.srcMainDirAbs,
+    'AndroidManifest.xml',
+  );
   const buildGradlePath = resolve(config.android.appDirAbs, 'build.gradle');
 
   let manifestContent = await readFile(manifestPath, { encoding: 'utf-8' });
@@ -86,27 +89,32 @@ export async function editProjectSettingsAndroid(
 
   const domainPath = appId.split('.').join('/');
   // Make the package source path to the new plugin Java file
-  const newJavaPath = resolve(config.android.srcDirAbs, `java/${domainPath}`);
+  const newJavaPath = resolve(
+    config.android.srcMainDirAbs,
+    `java/${domainPath}`,
+  );
 
   if (!(await pathExists(newJavaPath))) {
     await mkdirp(newJavaPath);
   }
 
   await copy(
     resolve(
-      config.android.srcDirAbs,
+      config.android.srcMainDirAbs,
       'java/com/getcapacitor/myapp/MainActivity.java',
     ),
     resolve(newJavaPath, 'MainActivity.java'),
   );
 
   if (appId.split('.')[1] !== 'getcapacitor') {
-    await remove(resolve(config.android.srcDirAbs, 'java/com/getcapacitor'));
+    await remove(
+      resolve(config.android.srcMainDirAbs, 'java/com/getcapacitor'),
+    );
   }
 
   // Remove our template 'com' folder if their ID doesn't have it
   if (appId.split('.')[0] !== 'com') {
-    await remove(resolve(config.android.srcDirAbs, 'java/com/'));
+    await remove(resolve(config.android.srcMainDirAbs, 'java/com/'));
   }
 
   // Update the package in the MainActivity java file

diff --git a/cli/src/android/doctor.ts b/cli/src/android/doctor.ts
@@ -28,9 +28,9 @@ async function checkAppSrcDirs(config: Config) {
     )} directory is missing in ${c.strong(config.android.platformDir)}`;
   }
 
-  if (!(await pathExists(config.android.srcDirAbs))) {
+  if (!(await pathExists(config.android.srcMainDirAbs))) {
     return `${c.strong(
-      config.android.srcDir,
+      config.android.srcMainDir,
     )} directory is missing in ${c.strong(config.android.platformDir)}`;
   }
 
@@ -61,11 +61,11 @@ async function checkAppSrcDirs(config: Config) {
 
 async function checkAndroidManifestFile(config: Config) {
   const manifestFileName = 'AndroidManifest.xml';
-  const manifestFilePath = join(config.android.srcDirAbs, manifestFileName);
+  const manifestFilePath = join(config.android.srcMainDirAbs, manifestFileName);
 
   if (!(await pathExists(manifestFilePath))) {
     return `${c.strong(manifestFileName)} is missing in ${c.strong(
-      config.android.srcDir,
+      config.android.srcMainDir,
     )}`;
   }
 
@@ -81,14 +81,14 @@ async function checkAndroidManifestData(config: Config, xmlData: any) {
   const manifestNode: any = xmlData.manifest;
   if (!manifestNode) {
     return `Missing ${c.input('<manifest>')} XML node in ${c.strong(
-      config.android.srcDir,
+      config.android.srcMainDir,
     )}`;
   }
 
   const packageId = manifestNode.$['package'];
   if (!packageId) {
     return `Missing ${c.input('<manifest package="">')} attribute in ${c.strong(
-      config.android.srcDir,
+      config.android.srcMainDir,
     )}`;
   }
 
@@ -97,7 +97,7 @@ async function checkAndroidManifestData(config: Config, xmlData: any) {
     return `Missing ${c.input(
       '<application>',
     )} XML node as a child node of ${c.input('<manifest>')} in ${c.strong(
-      config.android.srcDir,
+      config.android.srcMainDir,
     )}`;
   }
 
@@ -154,14 +154,16 @@ async function checkAndroidManifestData(config: Config, xmlData: any) {
 
   if (!mainApplicationNode) {
     return `Missing main ${c.input('<activity>')} XML node in ${c.strong(
-      config.android.srcDir,
+      config.android.srcMainDir,
     )}`;
   }
 
   if (!mainActivityClassPath) {
     return `Missing ${c.input(
       '<activity android:name="">',
-    )} attribute for MainActivity class in ${c.strong(config.android.srcDir)}`;
+    )} attribute for MainActivity class in ${c.strong(
+      config.android.srcMainDir,
+    )}`;
   }
 
   return checkPackage(config, packageId, mainActivityClassPath);
@@ -180,7 +182,7 @@ async function checkPackage(
     );
   }
 
-  const appSrcMainJavaDir = join(config.android.srcDirAbs, 'java');
+  const appSrcMainJavaDir = join(config.android.srcMainDirAbs, 'java');
   if (!(await pathExists(appSrcMainJavaDir))) {
     return `${c.strong('java')} directory is missing in ${c.strong(
       appSrcMainJavaDir,

diff --git a/cli/src/config.ts b/cli/src/config.ts
@@ -155,10 +155,11 @@ async function loadAndroidConfig(
   const platformDir = extConfig.android?.path ?? 'android';
   const platformDirAbs = resolve(rootDir, platformDir);
   const appDir = 'app';
-  const srcDir = `${appDir}/src/main`;
-  const assetsDir = `${srcDir}/assets`;
+  const srcDir = `${appDir}/src`;
+  const srcMainDir = `${srcDir}/main`;
+  const assetsDir = `${srcMainDir}/assets`;
   const webDir = `${assetsDir}/public`;
-  const resDir = `${srcDir}/res`;
+  const resDir = `${srcMainDir}/res`;
   const buildOutputDir = `${appDir}/build/outputs/apk/debug`;
 
   const templateName = 'android-template';
@@ -175,6 +176,8 @@ async function loadAndroidConfig(
     appDirAbs: resolve(platformDir, appDir),
     srcDir,
     srcDirAbs: resolve(platformDir, srcDir),
+    srcMainDir,
+    srcMainDirAbs: resolve(platformDir, srcMainDir),
     assetsDir,
     assetsDirAbs: resolve(platformDir, assetsDir),
     webDir,

diff --git a/cli/src/definitions.ts b/cli/src/definitions.ts
@@ -73,6 +73,8 @@ export interface AndroidConfig extends PlatformConfig {
   readonly appDirAbs: string;
   readonly srcDir: string;
   readonly srcDirAbs: string;
+  readonly srcMainDir: string;
+  readonly srcMainDirAbs: string;
   readonly webDir: string;
   readonly webDirAbs: string;
   readonly assetsDir: string;