From 83f9b78c2db55dbf94c76cf0cbe6926b48473c07 Mon Sep 17 00:00:00 2001
From: Trevor Cook <trevor@trevorcook.dev>
Date: Sat, 28 Mar 2020 19:33:30 -0700
Subject: [PATCH 1/2] docs: update Android config typedef

---
 docs/platforms.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/platforms.md b/docs/platforms.md
index 8f85fbbd9..8156e3680 100644
--- a/docs/platforms.md
+++ b/docs/platforms.md
@@ -102,6 +102,8 @@ type ProjectConfigAndroidT = {
   assetsPath: string;
   mainFilePath: string;
   packageName: string;
+  packageFolder: string;
+  appName: string;
 };
 ```
 
@@ -133,6 +135,8 @@ type DependencyConfigAndroidT = {
   folder: string;
   packageImportPath: string;
   packageInstance: string;
+  manifestPath: string;
+  packageName: string;
 };
 ```
 

From c06e495669fc8fe0c088be9f4b6b78a29572f582 Mon Sep 17 00:00:00 2001
From: Trevor Cook <trevor@trevorcook.dev>
Date: Sat, 28 Mar 2020 19:34:43 -0700
Subject: [PATCH 2/2] fix: android config returning incorrect paths

---
 .../src/config/__tests__/getProjectConfig.test.ts    | 10 ++++++++++
 packages/platform-android/src/config/index.ts        | 12 ++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/packages/platform-android/src/config/__tests__/getProjectConfig.test.ts b/packages/platform-android/src/config/__tests__/getProjectConfig.test.ts
index d515da617..ab74d77f1 100644
--- a/packages/platform-android/src/config/__tests__/getProjectConfig.test.ts
+++ b/packages/platform-android/src/config/__tests__/getProjectConfig.test.ts
@@ -99,4 +99,14 @@ describe('android::getProjectConfig', () => {
 
     expect(getProjectConfig(folder, userConfig)).toBeNull();
   });
+
+  it('should correctly resolve mainFilePath', () => {
+    const userConfig = {};
+    const folder = '/nested';
+
+    const config = getProjectConfig(folder, userConfig);
+    expect(config.mainFilePath).toEqual(
+      '/nested/android/app/src/main/java/com/some/example/MainApplication.java',
+    );
+  });
 });
diff --git a/packages/platform-android/src/config/index.ts b/packages/platform-android/src/config/index.ts
index d0a9bfd42..55946fb2a 100644
--- a/packages/platform-android/src/config/index.ts
+++ b/packages/platform-android/src/config/index.ts
@@ -60,23 +60,23 @@ export function projectConfig(
   const mainFilePath = path.join(
     sourceDir,
     userConfig.mainFilePath ||
-      `src/main/java/${packageFolder}/MainApplication.java`,
+      path.join(appName, `src/main/java/${packageFolder}/MainApplication.java`),
   );
 
   const stringsPath = path.join(
     sourceDir,
-    userConfig.stringsPath || 'src/main/res/values/strings.xml',
+    userConfig.stringsPath ||
+      path.join(appName, '/src/main/res/values/strings.xml'),
   );
 
   const settingsGradlePath = path.join(
-    root,
-    'android',
+    sourceDir,
     userConfig.settingsGradlePath || 'settings.gradle',
   );
 
   const assetsPath = path.join(
     sourceDir,
-    userConfig.assetsPath || 'src/main/assets',
+    userConfig.assetsPath || path.join(appName, '/src/main/assets'),
   );
 
   const buildGradlePath = path.join(
@@ -95,7 +95,7 @@ export function projectConfig(
     assetsPath,
     mainFilePath,
     packageName,
-    packageFolder: '',
+    packageFolder,
     appName,
   };
 }