add styles_xml generating

packages/app-harness/renative.json

@@ -12,12 +12,20 @@
         "android": {
             "templateAndroid": {
                 "styles_xml": {
-                    "values": {
-                        "app_children": [{ "tag": "item", "name": "android:windowIsTranslucent", "child_value": true }]
-                    },
-                    "values_v28": {
-                        "app_children": [{ "tag": "item", "name": "android:windowIsTranslucent", "child_value": true }]
-                    }
+                    "tag": "resources",
+                    "children": [
+                        {
+                            "tag": "style",
+                            "name": "AppTheme",
+                            "children": [
+                                {
+                                    "tag": "item",
+                                    "name": "android:windowIsTranslucent",
+                                    "value": "true"
+                                }
+                            ]
+                        }
+                    ]
                 }
             }
         }

packages/core/src/schema/platforms/fragments/templateAndroid.ts

@@ -8,7 +8,6 @@ export const TemplateAndroidFragment = {
             settings_gradle: z.optional(z.object({})),
             gradle_wrapper_properties: z.optional(z.object({})),
             SplashActivity_java: z.optional(z.object({})),
-            colors_xml: z.optional(z.object({})),
             proguard_rules_pro: z.optional(z.object({})),
         })
     ),

packages/core/src/schema/platforms/fragments/templateAndroidBase.ts

@@ -46,6 +46,12 @@ const ManifestChildBase = z.object({
     // 'tools:targetApi': 28,
 });
 
+const ResourcesChildBase = z.object({
+    tag: z.string(),
+    name: z.string(),
+    parent: z.optional(z.string()),
+});
+
 // type ManifestFeature = {
 //     tag: string;
 //     'android:name': string;
@@ -61,6 +67,13 @@ const ManifestChildWithChildren: z.ZodType<_ManifestChildType> = ManifestChildBa
     children: z.lazy(() => ManifestChildWithChildren.array()),
 });
 
+export type _ResourcesChildType = z.infer<typeof ResourcesChildBase> & {
+    children?: _ResourcesChildType[];
+};
+
+const ResourcesChildWithChildren: z.ZodType<_ResourcesChildType> = ResourcesChildBase.extend({
+    children: z.lazy(() => ResourcesChildWithChildren.array()),
+});
 const AndroidManifest = ManifestChildBase.extend({
     package: z.string().optional(),
     children: z.array(ManifestChildWithChildren),
@@ -69,6 +82,14 @@ Injects / Overrides values in AndroidManifest.xml file of generated android base
 > IMPORTANT: always ensure that your object contains \`tag\` and \`android:name\` to target correct tag to merge into
  `);
 
+const Resources = ResourcesChildBase.extend({
+    // package: z.string().optional(),
+    children: z.array(ResourcesChildWithChildren),
+}).describe(`Allows you to directly manipulate \`res/values files\` via json override mechanism
+Injects / Overrides values in res/values files of generated android based project
+> IMPORTANT: always ensure that your object contains \`tag\` and \`name\` to target correct tag to merge into
+ `);
+
 // const Gradle = z.object({
 
 // });
@@ -78,71 +99,10 @@ export const TemplateAndroidBaseFragment = {
     build_gradle: z.optional(BuildGradle),
     app_build_gradle: z.optional(AppBuildGradle),
     AndroidManifest_xml: z.optional(AndroidManifest),
-    styles_xml: z.optional(
-        z.object({
-            values: z
-                .optional(
-                    z.object({
-                        app_children: z.optional(
-                            z.array(
-                                z.object({
-                                    tag: z.string(),
-                                    name: z.string(),
-                                    child_value: z.string(),
-                                })
-                            )
-                        ),
-                        splash_children: z.optional(
-                            z.array(
-                                z.object({
-                                    tag: z.string(),
-                                    name: z.string(),
-                                    child_value: z.string(),
-                                })
-                            )
-                        ),
-                    })
-                )
-                .describe('Allows you to add styles to values/styles.xml'),
-            values_v28: z
-                .optional(
-                    z.object({
-                        app_children: z.optional(
-                            z.array(
-                                z.object({
-                                    tag: z.string(),
-                                    name: z.string(),
-                                    child_value: z.string(),
-                                })
-                            )
-                        ),
-                        splash_children: z.optional(
-                            z.array(
-                                z.object({
-                                    tag: z.string(),
-                                    name: z.string(),
-                                    child_value: z.string(),
-                                })
-                            )
-                        ),
-                    })
-                )
-                .describe('Allows you to add styles to values-v28/styles.xml'),
-        })
-    ),
-    strings_xml: z.optional(
-        z.object({
-            children: z.optional(
-                z.array(
-                    z.object({
-                        tag: z.string(),
-                        name: z.string(),
-                        child_value: z.string(),
-                    })
-                )
-            ),
-        })
-    ),
+    styles_xml: z.optional(Resources),
+    strings_xml: z.optional(Resources),
+    colors_xml: z.optional(Resources),
+
     MainActivity_kt: z.optional(
         z.object({
             onCreate: z
@@ -179,3 +139,6 @@ export const TemplateAndroidBaseFragment = {
 export type _ManifestChildWithChildrenType = z.infer<typeof ManifestChildWithChildren>;
 
 export type _AndroidManifestType = z.infer<typeof AndroidManifest>;
+
+export type _ResourcesChildWithChildrenType = z.infer<typeof ResourcesChildWithChildren>;
+export type _AndroidResourcesType = z.infer<typeof Resources>;

packages/core/src/schema/types.ts

@@ -5,7 +5,12 @@ import type { _MergedPlatformObjectType } from './platforms';
 import type { _RootAppBaseSchemalType } from './configFiles/app';
 
 import type { _RootProjectBaseSchemaType } from './configFiles/project';
-import type { _AndroidManifestType, _ManifestChildWithChildrenType } from './platforms/fragments/templateAndroidBase';
+import type {
+    _AndroidManifestType,
+    _AndroidResourcesType,
+    _ManifestChildWithChildrenType,
+    _ResourcesChildWithChildrenType,
+} from './platforms/fragments/templateAndroidBase';
 import type { _MergedPlatformPrivateObjectType } from './configFiles/private';
 import type { ConfigFileBuildConfig } from './configFiles/buildConfig';
 
@@ -42,6 +47,10 @@ export type AndroidManifestNode = _ManifestChildWithChildrenType;
 
 export type AndroidManifest = _AndroidManifestType;
 
+export type AndroidResources = _AndroidResourcesType;
+
+export type AndroidResourcesNode = _ResourcesChildWithChildrenType;
+
 // export type ManifestNode = _ManifestChildType;
 
 // export const test = (test: _ConfigRootMerged) => {

packages/engine-rn-tvos/templates/platforms/androidtv/app/src/main/res/values/styles.xml

@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
-        <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
-        <item name="android:windowBackground">@color/bg</item>
-         {{VALUES_STYLES_APP}}
-    </style>
-    <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:windowBackground">@color/bg</item>
-        {{VALUES_STYLES_SPLASH}}
-    </style>
-</resources>
+
+<!--
+Generate by ReNative (https://renative.org)
+BASE: packages/sdk-android/supportFiles/styles_xml.json
+-->
+
+{{PLUGIN_STYLES_XML_FILE}}

packages/engine-rn-tvos/templates/platforms/firetv/app/src/main/res/values/styles.xml

@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
-        <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
-        <item name="android:windowBackground">@color/bg</item>
-         {{VALUES_STYLES_APP}}
-    </style>
-    <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:windowBackground">@color/bg</item>
-        {{VALUES_STYLES_SPLASH}}
-    </style>
-</resources>
+
+<!--
+Generate by ReNative (https://renative.org)
+BASE: packages/sdk-android/supportFiles/styles_xml.json
+-->
+
+{{PLUGIN_STYLES_XML_FILE}}

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

@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
-        <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
-        <item name="android:windowBackground">@color/bg</item>
-        {{VALUES_STYLES_APP}}
-    </style>
-    <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:windowBackground">@color/bg</item>
-        {{VALUES_STYLES_SPLASH}}
-    </style>
-</resources>
+
+<!--
+Generate by ReNative (https://renative.org)
+BASE: packages/sdk-android/supportFiles/styles_xml.json
+-->
+
+{{PLUGIN_STYLES_XML_FILE}}

packages/sdk-android/src/manifestParser.ts

@@ -19,14 +19,15 @@ import {
     _getConfigProp,
     ConfigFileBuildConfig,
     getContext,
+    AndroidResourcesNode,
 } from '@rnv/core';
 import { Context } from './types';
 import { getBuildFilePath, getAppId, addSystemInjects } from '@rnv/sdk-utils';
 
 const PROHIBITED_DUPLICATE_TAGS = ['intent-filter'];
 const SYSTEM_TAGS = ['tag', 'children'];
 
-const _findChildNode = (tag: string, name: string, node: AndroidManifestNode) => {
+const _findChildNode = (tag: string, name: string, node: AndroidManifestNode | AndroidResourcesNode) => {
     if (!node) {
         logWarning('_findChildNode: Node is undefined');
         return;
@@ -36,7 +37,11 @@ const _findChildNode = (tag: string, name: string, node: AndroidManifestNode) =>
         for (let i = 0; i < node.children.length; i++) {
             const ch = node.children?.[i];
             if (ch && ch.tag === tag) {
-                if (ch['android:name'] === name || PROHIBITED_DUPLICATE_TAGS.includes(tag)) {
+                if (
+                    ('android:name' in ch && ch['android:name'] === name) ||
+                    ('name' in ch && ch['name'] === name) ||
+                    PROHIBITED_DUPLICATE_TAGS.includes(tag)
+                ) {
                     return ch;
                 }
             }
@@ -46,11 +51,11 @@ const _findChildNode = (tag: string, name: string, node: AndroidManifestNode) =>
     return null;
 };
 
-const _convertToXML = (manifestObj: AndroidManifestNode) => _parseNode(manifestObj, 0);
+export const _convertToXML = (manifestObj: AndroidManifestNode | AndroidResourcesNode) => _parseNode(manifestObj, 0);
 
-type NodeKey = keyof AndroidManifestNode;
+type NodeKeyChildren = keyof AndroidManifestNode['children'] | keyof AndroidResourcesNode['children'];
 
-const _parseNode = (n: AndroidManifestNode, level: number) => {
+const _parseNode = <T extends AndroidManifestNode | AndroidResourcesNode>(n: T, level: number) => {
     let output = '';
     let space = '';
     for (let i = 0; i < level; i++) {
@@ -73,7 +78,7 @@ const _parseNode = (n: AndroidManifestNode, level: number) => {
         output += `${space}<${n.tag}${endLine}`;
         Object.keys(n).forEach((k) => {
             if (!SYSTEM_TAGS.includes(k)) {
-                output += `${isSingleLine ? '' : `${space}  `}${k}="${n[k as NodeKey]}"${endLine}`;
+                output += `${isSingleLine ? '' : `${space}  `}${k}="${n[k as keyof T]}"${endLine}`;
             }
         });
     }
@@ -98,9 +103,9 @@ const _parseNode = (n: AndroidManifestNode, level: number) => {
     return output;
 };
 
-const _mergeNodeParameters = (
-    node: AndroidManifestNode | undefined,
-    nodeParamsExt: AndroidManifestNode | undefined
+export const _mergeNodeParameters = <T extends AndroidManifestNode | AndroidResourcesNode>(
+    node: T | undefined,
+    nodeParamsExt: T | undefined
 ) => {
     if (!nodeParamsExt) {
         logWarning('_mergeNodeParameters: nodeParamsExt value is null');
@@ -112,25 +117,28 @@ const _mergeNodeParameters = (
     }
 
     Object.keys(nodeParamsExt).forEach((k) => {
-        const key = k as NodeKey;
-        const val = nodeParamsExt[key];
+        const key = k as keyof T;
+        const val = (nodeParamsExt as T)[key];
 
         if (val !== 'undefined' && !SYSTEM_TAGS.includes(k)) {
             //TODO: fix this
-            (node as Record<string, any>)[key] = val;
+            (node as T)[key] = val;
         }
     });
 };
 
-const _mergeNodeChildren = (node: AndroidManifestNode, nodeChildrenExt: Array<AndroidManifestNode> = []) => {
+export const _mergeNodeChildren = <T extends AndroidManifestNode | AndroidResourcesNode>(
+    node: T,
+    nodeChildrenExt: Array<T> = []
+) => {
     // console.log('_mergeNodeChildren', node, 'OVERRIDE', nodeChildrenExt);
     if (!node) {
         logWarning('_mergeNodeChildren: Node is undefined');
         return;
     }
     if (!node.children) node.children = [];
     nodeChildrenExt.forEach((v) => {
-        const nameExt = v['android:name'];
+        const nameExt = 'android:name' in v ? v['android:name'] : v.name;
         if (v.tag) {
             const childNode = _findChildNode(v.tag, nameExt, node);
             if (childNode) {
@@ -139,7 +147,7 @@ const _mergeNodeChildren = (node: AndroidManifestNode, nodeChildrenExt: Array<An
                 _mergeNodeChildren(childNode, v.children);
             } else {
                 logDebug(`_mergeNodeChildren: NO android:name found. adding to children ${nameExt} ${v.tag}`);
-                if (node.children) node.children.push(v);
+                if (node.children) node.children.push(v as NodeKeyChildren);
             }
         }
     });
@@ -177,7 +185,7 @@ const _mergeFeatures = (
     }
 };
 
-const getConfigPropArray = <T extends ConfigPropKey>(c: RnvContext, platform: RnvPlatform, key: T) => {
+export const getConfigPropArray = <T extends ConfigPropKey>(c: RnvContext, platform: RnvPlatform, key: T) => {
     const result: Array<ConfigProp[T]> = [];
     const configArr = [
         c.files.defaultWorkspace.config,

packages/sdk-android/src/runner.ts

@@ -52,7 +52,7 @@ import {
     parseValuesStringsSync,
     injectPluginXmlValuesSync,
     parseValuesColorsSync,
-    parseValuesStylesSync,
+    parseValuesXml,
 } from './xmlValuesParser';
 import { ejectGradleProject } from './ejector';
 import { AndroidDevice, Context, Payload } from './types';
@@ -497,7 +497,8 @@ export const configureProject = async () => {
     parseMainApplicationSync();
     parseSplashActivitySync();
     parseValuesStringsSync();
-    parseValuesStylesSync();
+    parseValuesXml('styles_xml');
+    // parseValuesStylesSync();
     parseValuesColorsSync();
     parseAndroidManifestSync();
     parseGradlePropertiesSync();