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

package/src/generate.ts

@@ -117,34 +117,40 @@ export const logWrite = (
   );
 
 export const writeJson = (file: string, json: object) => {
-  const amount = fs.existsSync(file)
-    ? detectIndent(fs.readFileSync(file, "utf-8")).amount || 2
-    : 2;
-
-  fs.writeFileSync(file, JSON.stringify(json, null, amount) + "\n", "utf-8");
+  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 indentation = fs.existsSync(file)
-    ? detectIndent(fs.readFileSync(file, "utf-8")).indent || "    "
-    : "    ";
-
-  fs.writeFileSync(
-    file,
-    xmlFormat(xml, {
-      collapseContent: true,
-      ...options,
-      indentation,
-      lineSeparator: "\n",
-    }) + "\n",
-    "utf-8",
-  );
-
+  const formatted = xmlFormat(xml, {
+    collapseContent: true,
+    forceSelfClosingEmptyTag: true,
+    indentation: "    ",
+    lineSeparator: "\n",
+    whiteSpaceAtEndOfSelfclosingTag: true,
+    ...options,
+  });
+
+  fs.writeFileSync(file, formatted + "\n", "utf-8");
   logWrite(file);
 };
 
@@ -413,13 +419,13 @@ 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);
 
       const nextXml = colorsXml.match(androidColorRegex)
         ? colorsXml.replace(androidColorRegex, colorsXmlEntry)
         : colorsXml.replace(/<\/resources>/g, `${colorsXmlEntry}</resources>`);
 
-      writeXml(colorsXmlPath, nextXml);
+      writeXml(colorsXmlPath, nextXml, { indentation });
     } else {
       writeXml(colorsXmlPath, `<resources>${colorsXmlEntry}</resources>`);
     }

package/src/index.ts

@@ -22,6 +22,7 @@ export type Manifest = {
     height: number;
   };
   brand?: {
+    bottom: number;
     width: number;
     height: number;
   };
@@ -74,6 +75,7 @@ export function useHideAnimation(config: UseHideAnimationConfig) {
   const hasBrand = manifest.brand != null && brandSrc != null;
   const logoWidth = manifest.logo.width;
   const logoHeight = manifest.logo.height;
+  const brandBottom = manifest.brand?.bottom;
   const brandWidth = manifest.brand?.width;
   const brandHeight = manifest.brand?.height;
 
@@ -156,7 +158,7 @@ export function useHideAnimation(config: UseHideAnimationConfig) {
             source: brandFinalSrc,
             style: {
               position: "absolute",
-              bottom: 60,
+              bottom: Platform.OS === "web" ? 60 : brandBottom,
               width: brandWidth,
               height: brandHeight,
             },
@@ -193,6 +195,7 @@ export function useHideAnimation(config: UseHideAnimationConfig) {
 
     logoWidth,
     logoHeight,
+    brandBottom,
     brandWidth,
     brandHeight,