refactor: use dynamic app name

Author: hurali97

packages/react-native-brownfield/src/expo-config-plugin/android/utils/__tests__/androidManifest.test.ts

@@ -26,7 +26,7 @@ describe('android manifest helpers', () => {
   it('returns an empty array when the generated app manifest does not exist', () => {
     const androidDir = createAndroidDir();
 
-    expect(readExpoUpdatesApplicationMetaData(androidDir)).toEqual([]);
+    expect(readExpoUpdatesApplicationMetaData(androidDir, 'app')).toEqual([]);
   });
 
   it('returns an empty array when the application node has no Expo Updates metadata', () => {
@@ -42,7 +42,7 @@ describe('android manifest helpers', () => {
 </manifest>`
     );
 
-    expect(readExpoUpdatesApplicationMetaData(androidDir)).toEqual([]);
+    expect(readExpoUpdatesApplicationMetaData(androidDir, 'app')).toEqual([]);
   });
 
   it('preserves Expo Updates metadata values exactly as they appear in the app manifest', () => {
@@ -105,7 +105,7 @@ describe('android manifest helpers', () => {
 </resources>`
     );
 
-    const stringResources = readExpoUpdatesStringResources(androidDir, [
+    const stringResources = readExpoUpdatesStringResources(androidDir, 'app', [
       {
         name: 'expo.modules.updates.EXPO_RUNTIME_VERSION',
         value: '@string/expo_runtime_version',
@@ -202,7 +202,7 @@ describe('android manifest helpers', () => {
         },
         ['expo_runtime_version']
       )
-    ).toEqual(readExpoUpdatesStringResources(androidDir, fileMetaData));
+    ).toEqual(readExpoUpdatesStringResources(androidDir, 'app', fileMetaData));
   });
 
   it('supports android:resource entries in the typed manifest adapter', () => {

packages/react-native-brownfield/src/expo-config-plugin/android/utils/expo-updates.ts

@@ -9,14 +9,8 @@ import {
   extractStringResourcesFromXml,
 } from './androidManifest';
 
-const APP_MANIFEST_PATH_SEGMENTS = [
-  'app',
-  'src',
-  'main',
-  'AndroidManifest.xml',
-];
+const APP_MANIFEST_PATH_SEGMENTS = ['src', 'main', 'AndroidManifest.xml'];
 const APP_STRINGS_PATH_SEGMENTS = [
-  'app',
   'src',
   'main',
   'res',
@@ -39,9 +33,14 @@ const EXPO_UPDATES_META_DATA_PREFIX = 'expo.modules.updates.';
 
 /** Classification: Expo Updates-specific logic used by production code. */
 export function readExpoUpdatesApplicationMetaData(
-  androidDir: string
+  androidDir: string,
+  appModuleName: string
 ): AndroidManifestMetaDataEntry[] {
-  const manifestPath = path.join(androidDir, ...APP_MANIFEST_PATH_SEGMENTS);
+  const manifestPath = path.join(
+    androidDir,
+    appModuleName,
+    ...APP_MANIFEST_PATH_SEGMENTS
+  );
 
   if (!fs.existsSync(manifestPath)) {
     Logger.logDebug(
@@ -67,6 +66,7 @@ export function extractExpoUpdatesApplicationMetaData(
 /** Classification: Expo Updates-specific logic used by production code. */
 export function readExpoUpdatesStringResources(
   androidDir: string,
+  appModuleName: string,
   metaDataEntries: AndroidManifestMetaDataEntry[]
 ): AndroidStringResourceEntry[] {
   const stringResourceNames = getReferencedStringResourceNames(metaDataEntries);
@@ -75,7 +75,11 @@ export function readExpoUpdatesStringResources(
     return [];
   }
 
-  const stringsPath = path.join(androidDir, ...APP_STRINGS_PATH_SEGMENTS);
+  const stringsPath = path.join(
+    androidDir,
+    appModuleName,
+    ...APP_STRINGS_PATH_SEGMENTS
+  );
 
   if (!fs.existsSync(stringsPath)) {
     Logger.logDebug(

packages/react-native-brownfield/src/expo-config-plugin/android/withAndroidModuleFiles.ts

@@ -222,9 +222,14 @@ export function syncAndroidModuleExpoUpdatesFromAppFiles({
   // results. This keeps Expo Updates sync compatible with the dangerous/finalized
   // mod phases, where other config plugins may already have rewritten the app
   // manifest or strings resources that we need to mirror into the library module.
-  const expoUpdatesMetaData = readExpoUpdatesApplicationMetaData(androidDir);
+  const appModuleName = config.android.moduleName;
+  const expoUpdatesMetaData = readExpoUpdatesApplicationMetaData(
+    androidDir,
+    appModuleName
+  );
   const expoUpdatesStringResources = readExpoUpdatesStringResources(
     androidDir,
+    appModuleName,
     expoUpdatesMetaData
   );