fix _parseNode func, add strings_xml and colors_xml generating

packages/app-harness/renative.json

@@ -26,6 +26,16 @@
                             ]
                         }
                     ]
+                },
+                "colors_xml": {
+                    "tag": "resources",
+                    "children": [
+                        {
+                            "tag": "color",
+                            "name": "bg_line",
+                            "value": "#E7E7E7"
+                        }
+                    ]
                 }
             }
         }

packages/engine-rn/templates/platforms/android/app/src/main/res/values/colors.xml

@@ -1,3 +1,5 @@
-<resources>
-    <color name="bg">{{PLUGIN_COLORS_BG}}</color>
-</resources>
+<!--
+Generate by ReNative (https://renative.org)
+BASE: packages/sdk-android/supportFiles/colors_xml.json
+-->
+{{PLUGIN_COLORS_XML_FILE}}

packages/engine-rn/templates/platforms/android/app/src/main/res/values/strings.xml

@@ -1,4 +1,5 @@
-<!-- HARDCODED -->
-<resources>
-    <string name="app_name">ReNative</string>
-</resources>
+<!--
+Generate by ReNative (https://renative.org)
+BASE: packages/sdk-android/supportFiles/strings_xml.json
+-->
+{{PLUGIN_STRINGS_XML_FILE}}

packages/sdk-android/src/manifestParser.ts

@@ -67,20 +67,26 @@ const _parseNode = <T extends AndroidManifestNode | AndroidResourcesNode>(n: T,
         if (!SYSTEM_TAGS.includes(v)) nodeKeysCount++;
     });
     const isSingleLine = nodeKeysCount < 2;
-
+    let closedTag = false;
     if (!n.tag) {
         logWarning('Each node must have tag key!');
         return;
     }
 
     if (n) {
-        const endLine = isSingleLine ? ' ' : '\n';
-        output += `${space}<${n.tag}${endLine}`;
-        Object.keys(n).forEach((k) => {
-            if (!SYSTEM_TAGS.includes(k)) {
-                output += `${isSingleLine ? '' : `${space}  `}${k}="${n[k as keyof T]}"${endLine}`;
-            }
-        });
+        if ('value' in n) {
+            closedTag = true;
+            output += `${space}  <${n.tag} name="${(n as AndroidResourcesNode).name}">${n.value}`;
+        } else {
+            closedTag = false;
+            const endLine = isSingleLine ? ' ' : '\n';
+            output += `${space}<${n.tag}${endLine}`;
+            Object.keys(n).forEach((k) => {
+                if (!SYSTEM_TAGS.includes(k)) {
+                    output += `${isSingleLine ? '' : `${space}  `}${k}="${n[k as keyof T]}"${endLine}`;
+                }
+            });
+        }
     }
     // else {
     //     output += `${space}<${n.tag}`;
@@ -98,7 +104,11 @@ const _parseNode = <T extends AndroidManifestNode | AndroidResourcesNode>(n: T,
         });
         output += `${space}</${n.tag}>\n`;
     } else {
-        output += `${isSingleLine ? '' : space}/>\n`;
+        if (isSingleLine) {
+            output += '/>\n';
+        } else {
+            output += !closedTag ? `${space}/>\n` : `</${n.tag}>\n`;
+        }
     }
     return output;
 };

packages/sdk-android/src/runner.ts

@@ -49,9 +49,7 @@ import {
 } from './gradleParser';
 import { parseGradleWrapperSync } from './gradleWrapperParser';
 import {
-    parseValuesStringsSync,
-    injectPluginXmlValuesSync,
-    parseValuesColorsSync,
+    // injectPluginXmlValuesSync,
     parseValuesXml,
 } from './xmlValuesParser';
 import { ejectGradleProject } from './ejector';
@@ -456,7 +454,7 @@ export const configureProject = async () => {
         injectPluginGradleSync(plugin, pluginPlat, key);
         injectPluginKotlinSync(pluginPlat, key, pluginPlat.package);
         injectPluginManifestSync();
-        injectPluginXmlValuesSync(pluginPlat);
+        // injectPluginXmlValuesSync(pluginPlat);
     });
 
     c.payload.pluginConfigAndroid.pluginPackages = c.payload.pluginConfigAndroid.pluginPackages.substring(
@@ -496,10 +494,12 @@ export const configureProject = async () => {
     parseMainActivitySync();
     parseMainApplicationSync();
     parseSplashActivitySync();
-    parseValuesStringsSync();
+    // parseValuesStringsSync();
+    parseValuesXml('strings_xml', true);
     parseValuesXml('styles_xml');
+    parseValuesXml('colors_xml', true);
     // parseValuesStylesSync();
-    parseValuesColorsSync();
+    // parseValuesColorsSync();
     parseAndroidManifestSync();
     parseGradlePropertiesSync();
     // parseFlipperSync(c, 'debug');

packages/sdk-android/src/types.ts

@@ -102,3 +102,4 @@ export type TemplateAndroid = Required<Required<RenativeConfigPluginPlatform>['t
 // export type AndroidManifestJSON = AndroidManifestJSONNode & {
 //     package?: string;
 // };
+export type TargetResourceFile = 'styles_xml' | 'strings_xml' | 'colors_xml';

packages/sdk-android/src/xmlValuesParser.ts

@@ -3,10 +3,8 @@ import {
     RenativeConfigPluginPlatform,
     getAppFolder,
     getConfigProp,
-    writeFileSync,
     writeCleanFile,
     getContext,
-    OverridesOptions,
     logDefault,
     readObjectSync,
     AndroidResources,
@@ -15,92 +13,20 @@ import {
     getFlavouredProp,
 } from '@rnv/core';
 import { getBuildFilePath, getAppTitle, sanitizeColor, addSystemInjects } from '@rnv/sdk-utils';
-import { Payload, ResourceStyles, TemplateAndroid } from './types';
 import { _convertToXML, _mergeNodeChildren, _mergeNodeParameters, getConfigPropArray } from './manifestParser';
+import { TargetResourceFile } from './types';
 
-export const parseValuesStringsSync = () => {
-    const c = getContext<Payload>();
-    const appFolder = getAppFolder();
-    const templateAndroid = getConfigProp('templateAndroid', {});
-
-    const resourceStrings = templateAndroid?.strings_xml?.children;
-    if (resourceStrings) {
-        resourceStrings.forEach((obj) => {
-            c.payload.pluginConfigAndroid.resourceStrings.push(obj);
-        });
-    }
-    const stringsPath = 'app/src/main/res/values/strings.xml';
-    let strings = '<resources>\n';
-    strings += `  <string name="app_name">${getAppTitle()}</string>\n`;
-    c.payload.pluginConfigAndroid.resourceStrings.forEach((v) => {
-        strings += `  <${v.tag} name="${v.name}">${v.child_value}</${v.tag}>\n`;
-    });
-    strings += '</resources>';
-    writeFileSync(path.join(appFolder, stringsPath), strings);
-};
-export const parseValuesStylesSync = () => {
-    const c = getContext<Payload>();
-    const appFolder = getAppFolder();
-    const templateAndroid = getConfigProp('templateAndroid', {});
-
-    const resourceStylesValues = templateAndroid?.styles_xml;
-
-    if (resourceStylesValues) {
-        Object.entries(resourceStylesValues).forEach(([key, values]) => {
-            const xmlStringObject: Partial<ResourceStyles> = {};
-            Object.entries(values).forEach(([childKey, children]) => {
-                let string = '';
-                children.forEach((child) => {
-                    string += `<${child.tag} name="${child.name}">${child.child_value}</${child.tag}>\n`;
-                });
-                xmlStringObject[childKey as keyof ResourceStyles] = string;
-            });
-
-            if (key === 'values') {
-                c.payload.pluginConfigAndroid.resourceStylesValue = xmlStringObject as ResourceStyles;
-            } else if (key === 'values_v28') {
-                c.payload.pluginConfigAndroid.resourceStylesValueV28 = xmlStringObject as ResourceStyles;
-            }
-        });
-    }
-
-    const injects: OverridesOptions = [
-        {
-            pattern: '{{VALUES_STYLES_APP}}',
-            override: c.payload.pluginConfigAndroid.resourceStylesValue.app_children || '',
-        },
-        {
-            pattern: '{{VALUES_STYLES_SPLASH}}',
-            override: c.payload.pluginConfigAndroid.resourceStylesValue.splash_children || '',
-        },
-
-        {
-            pattern: '{{VALUES_V28_STYLES_APP}}',
-            override: c.payload.pluginConfigAndroid.resourceStylesValueV28.app_children || '',
-        },
-
-        {
-            pattern: '{{VALUES_V28_STYLES_SPLASH}}',
-            override: c.payload.pluginConfigAndroid.resourceStylesValueV28.splash_children || '',
-        },
-    ];
-
-    addSystemInjects(injects);
-    const stylePath1 = 'app/src/main/res/values/styles.xml';
-    const stylePath2 = 'app/src/main/res/values-v28/styles.xml';
-    writeCleanFile(getBuildFilePath(stylePath1), path.join(appFolder, stylePath1), injects, undefined, c);
-    writeCleanFile(getBuildFilePath(stylePath2), path.join(appFolder, stylePath2), injects, undefined, c);
-};
-export const parseValuesXml = (targetRes: 'styles_xml' | 'strings_xml' | 'colors_xml') => {
+export const parseValuesXml = (targetRes: TargetResourceFile, injectValue?: boolean) => {
     const c = getContext();
-    logDefault('parseValuesStylesSync');
+    logDefault(`parseValuesXml: ${targetRes}`);
     const { platform } = c;
-
+    const appFolder = getAppFolder();
     if (!platform) return;
 
     try {
         const baseResoutcesFilePath = path.join(__dirname, `../supportFiles/${targetRes}.json`);
         const baseResourcesFile = readObjectSync<AndroidResources>(baseResoutcesFilePath);
+        const resourceFile = `app/src/main/res/values/${targetRes.replace('_', '.')}`;
 
         if (!baseResourcesFile) {
             return;
@@ -130,45 +56,51 @@ export const parseValuesXml = (targetRes: 'styles_xml' | 'strings_xml' | 'colors
         });
 
         const resourceXml = _convertToXML(baseResourcesFile);
-        const resourceFile = `app/src/main/res/values/${targetRes.replace('_', '.')}`;
-        const getPattern = (): string => {
-            return `{{PLUGIN_${targetRes.toUpperCase()}_FILE}}`;
-        };
-        const injects = [{ pattern: getPattern(), override: resourceXml || '' }];
 
-        addSystemInjects(injects);
+        const injects = [{ pattern: _getPattern(targetRes), override: resourceXml || '' }];
 
-        const appFolder = getAppFolder();
-        writeCleanFile(getBuildFilePath(resourceFile), path.join(appFolder, resourceFile), injects, undefined, c);
+        addSystemInjects(injects);
+        const buildFilePath = getBuildFilePath(resourceFile);
+        const projectFilePath = path.join(appFolder, resourceFile);
+
+        if (!injectValue) {
+            writeCleanFile(buildFilePath, projectFilePath, injects, undefined, c);
+        } else {
+            writeCleanFile(buildFilePath, projectFilePath, injects, undefined, c);
+            _overrideDynamicValue(projectFilePath);
+        }
 
         return;
     } catch (e) {
         logError(e);
     }
 };
-export const parseValuesColorsSync = () => {
+
+const _getPattern = (targetRes: TargetResourceFile): string => {
+    return `{{PLUGIN_${targetRes.toUpperCase()}_FILE}}`;
+};
+const _overrideDynamicValue = (stringsPath: string) => {
     const c = getContext();
-    const appFolder = getAppFolder();
-    const stringsPath = 'app/src/main/res/values/colors.xml';
 
     const injects = [
         {
             pattern: '{{PLUGIN_COLORS_BG}}',
-            override: sanitizeColor(getConfigProp('backgroundColor'), 'backgroundColor').hex,
+            override: sanitizeColor(getConfigProp('backgroundColor'), 'backgroundColor').hex || '#FFFFFF',
         },
+        { pattern: '{{APP_TITLE}}', override: getAppTitle() || '' },
     ];
 
     addSystemInjects(injects);
 
-    writeCleanFile(getBuildFilePath(stringsPath), path.join(appFolder, stringsPath), injects, undefined, c);
+    writeCleanFile(stringsPath, stringsPath, injects, undefined, c);
 };
 
-export const injectPluginXmlValuesSync = (plugin: RenativeConfigPluginPlatform) => {
-    const rStrings = plugin.templateAndroid?.strings_xml?.children;
-    if (rStrings) {
-        const c = getContext();
-        rStrings.forEach((obj) => {
-            c.payload.pluginConfigAndroid.resourceStrings.push(obj);
-        });
-    }
-};
+// export const injectPluginXmlValuesSync = (plugin: RenativeConfigPluginPlatform) => {
+//     const rStrings = plugin.templateAndroid?.strings_xml?.children;
+//     if (rStrings) {
+//         const c = getContext();
+//         rStrings.forEach((obj) => {
+//             c.payload.pluginConfigAndroid.resourceStrings.push(obj);
+//         });
+//     }
+// };

packages/sdk-android/supportFiles/colors_xml.json

@@ -0,0 +1,10 @@
+{
+    "tag": "resources",
+    "children": [
+        {
+            "tag": "color",
+            "name": "bg",
+            "value": "{{PLUGIN_COLORS_BG}}"
+        }
+    ]
+}

packages/sdk-android/supportFiles/strings_xml.json

@@ -0,0 +1,10 @@
+{
+    "tag": "resources",
+    "children": [
+        {
+            "tag": "string",
+            "name": "app_name",
+            "value": "{{APP_TITLE}}"
+        }
+    ]
+}