react-native-bootsplash 5.0.0-beta.2 → 5.0.0-beta.4

package/src/generate.ts

@@ -3,26 +3,24 @@ import {
   CommandFunction,
   IOSProjectConfig,
 } from "@react-native-community/cli-types";
+import detectIndent from "detect-indent";
 import fs from "fs-extra";
 import path from "path";
 import pc from "picocolors";
 import type { Sharp } from "sharp";
 import sharp from "sharp";
+import xmlFormat, { XMLFormatterOptions } from "xml-formatter";
 import type { Manifest } from ".";
 
-export type Color = {
-  hex: string;
-  rgb: {
-    R: string;
-    G: string;
-    B: string;
-  };
-};
+const workingPath = process.env.INIT_CWD ?? process.env.PWD ?? process.cwd();
 
 export const androidColorRegex =
   /<color name="bootsplash_background">#\w+<\/color>/g;
 
-const workingPath = process.env.INIT_CWD ?? process.env.PWD ?? process.cwd();
+export type Color = {
+  hex: string;
+  rgb: { R: string; G: string; B: string };
+};
 
 const parseColor = (value: string): Color => {
   const up = value.toUpperCase().replace(/[^0-9A-F]/g, "");
@@ -42,31 +40,6 @@ const parseColor = (value: string): Color => {
   return { hex, rgb };
 };
 
-const ContentsJson = `{
-  "images": [
-    {
-      "idiom": "universal",
-      "filename": "bootsplash_logo.png",
-      "scale": "1x"
-    },
-    {
-      "idiom": "universal",
-      "filename": "bootsplash_logo@2x.png",
-      "scale": "2x"
-    },
-    {
-      "idiom": "universal",
-      "filename": "bootsplash_logo@3x.png",
-      "scale": "3x"
-    }
-  ],
-  "info": {
-    "author": "xcode",
-    "version": 1
-  }
-}
-`;
-
 const getStoryboard = ({
   logoHeight,
   logoWidth,
@@ -143,6 +116,44 @@ export const logWrite = (
       (dimensions != null ? ` (${dimensions.width}x${dimensions.height})` : ""),
   );
 
+export const writeJson = (file: string, json: object) => {
+  fs.writeFileSync(file, JSON.stringify(json, null, 2) + "\n", "utf-8");
+  logWrite(file);
+};
+
+export const readXml = (file: string) => {
+  const xml = fs.readFileSync(file, "utf-8");
+
+  const minified = xmlFormat(xml, {
+    collapseContent: true,
+    forceSelfClosingEmptyTag: true,
+    indentation: "",
+    lineSeparator: "",
+    whiteSpaceAtEndOfSelfclosingTag: true,
+  });
+
+  const indentation = detectIndent(xml).indent || "    ";
+  return { minified, indentation };
+};
+
+export const writeXml = (
+  file: string,
+  xml: string,
+  options?: XMLFormatterOptions,
+) => {
+  const formatted = xmlFormat(xml, {
+    collapseContent: true,
+    forceSelfClosingEmptyTag: true,
+    indentation: "    ",
+    lineSeparator: "\n",
+    whiteSpaceAtEndOfSelfclosingTag: true,
+    ...options,
+  });
+
+  fs.writeFileSync(file, formatted + "\n", "utf-8");
+  logWrite(file);
+};
+
 const ensureSupportedFormat = async (
   name: string,
   image: Sharp | undefined,
@@ -408,34 +419,17 @@ export const generate: CommandFunction<{
     const colorsXmlEntry = `<color name="bootsplash_background">${background.hex}</color>`;
 
     if (fs.existsSync(colorsXmlPath)) {
-      const colorsXml = fs.readFileSync(colorsXmlPath, "utf-8");
+      const { minified: colorsXml, indentation } = readXml(colorsXmlPath);
 
-      if (colorsXml.match(androidColorRegex)) {
-        fs.writeFileSync(
-          colorsXmlPath,
-          colorsXml.replace(androidColorRegex, colorsXmlEntry),
-          "utf-8",
-        );
-      } else {
-        fs.writeFileSync(
-          colorsXmlPath,
-          colorsXml.replace(
-            /<\/resources>/g,
-            `    ${colorsXmlEntry}\n</resources>`,
-          ),
-          "utf-8",
-        );
-      }
+      const nextXml = colorsXml.match(androidColorRegex)
+        ? colorsXml.replace(androidColorRegex, colorsXmlEntry)
+        : colorsXml.replace(/<\/resources>/g, `${colorsXmlEntry}</resources>`);
+
+      writeXml(colorsXmlPath, nextXml, { indentation });
     } else {
-      fs.writeFileSync(
-        colorsXmlPath,
-        `<resources>\n    ${colorsXmlEntry}\n</resources>\n`,
-        "utf-8",
-      );
+      writeXml(colorsXmlPath, `<resources>${colorsXmlEntry}</resources>`);
     }
 
-    logWrite(colorsXmlPath);
-
     await Promise.all(
       [
         { ratio: 1, suffix: "mdpi" },
@@ -519,11 +513,29 @@ export const generate: CommandFunction<{
 
     fs.ensureDirSync(imageSetPath);
 
-    fs.writeFileSync(
-      path.resolve(imageSetPath, "Contents.json"),
-      ContentsJson,
-      "utf-8",
-    );
+    writeJson(path.resolve(imageSetPath, "Contents.json"), {
+      images: [
+        {
+          idiom: "universal",
+          filename: "bootsplash_logo.png",
+          scale: "1x",
+        },
+        {
+          idiom: "universal",
+          filename: "bootsplash_logo@2x.png",
+          scale: "2x",
+        },
+        {
+          idiom: "universal",
+          filename: "bootsplash_logo@3x.png",
+          scale: "3x",
+        },
+      ],
+      info: {
+        author: "xcode",
+        version: 1,
+      },
+    });
 
     await Promise.all(
       [
@@ -553,26 +565,13 @@ export const generate: CommandFunction<{
 
     fs.ensureDirSync(assetsOutputPath);
 
-    const manifest: Manifest = {
+    writeJson(path.resolve(assetsOutputPath, "bootsplash_manifest.json"), {
       background: background.hex,
       logo: {
         width: logoWidth,
         height: logoHeight,
       },
-    };
-
-    const manifestPath = path.resolve(
-      assetsOutputPath,
-      "bootsplash_manifest.json",
-    );
-
-    fs.writeFileSync(
-      manifestPath,
-      JSON.stringify(manifest, null, 2) + "\n",
-      "utf-8",
-    );
-
-    logWrite(manifestPath);
+    } satisfies Manifest);
 
     await Promise.all(
       [

package/src/index.ts

@@ -158,7 +158,7 @@ export function useHideAnimation(config: UseHideAnimationConfig) {
             source: brandFinalSrc,
             style: {
               position: "absolute",
-              bottom: brandBottom,
+              bottom: Platform.OS === "web" ? 60 : brandBottom,
               width: brandWidth,
               height: brandHeight,
             },