react-native-bootsplash 5.0.3 → 5.1.0-beta.0

package/src/generate.ts

@@ -9,9 +9,9 @@ import { parse as parseHtml } from "node-html-parser";
 import path from "path";
 import pc from "picocolors";
 import { Options as PrettierOptions } from "prettier";
-import htmlPlugin from "prettier/parser-html";
-import cssPlugin from "prettier/parser-postcss";
-import prettier from "prettier/standalone";
+import * as htmlPlugin from "prettier/plugins/html";
+import * as cssPlugin from "prettier/plugins/postcss";
+import * as prettier from "prettier/standalone";
 import sharp, { Sharp } from "sharp";
 import { dedent } from "ts-dedent";
 import formatXml, { XMLFormatterOptions } from "xml-formatter";
@@ -165,12 +165,12 @@ export const readHtml = (file: string) => {
   return { root: parseHtml(html), formatOptions };
 };
 
-export const writeHtml = (
+export const writeHtml = async (
   file: string,
   html: string,
   options?: Omit<PrettierOptions, "parser" | "plugins">,
 ) => {
-  const formatted = prettier.format(html, {
+  const formatted = await prettier.format(html, {
     parser: "html",
     plugins: [htmlPlugin, cssPlugin],
     tabWidth: 2,
@@ -684,7 +684,7 @@ export const generate: CommandFunction<{
       root.querySelector("body")?.appendChild(nextDiv);
     }
 
-    writeHtml(htmlTemplatePath, root.toString(), formatOptions);
+    await writeHtml(htmlTemplatePath, root.toString(), formatOptions);
   }
 
   if (assetsOutputPath != null) {

package/src/index.ts

@@ -31,7 +31,7 @@ export type Manifest = {
 export type UseHideAnimationConfig = {
   manifest: Manifest;
 
-  logo: ImageRequireSource;
+  logo?: ImageRequireSource;
   darkLogo?: ImageRequireSource;
   brand?: ImageRequireSource;
   darkBrand?: ImageRequireSource;
@@ -45,7 +45,7 @@ export type UseHideAnimationConfig = {
 export type UseHideAnimation = {
   container: ViewProps;
   logo: ImageProps;
-  brand?: ImageProps;
+  brand: ImageProps;
 };
 
 export function hide(config: Config = {}): Promise<void> {
@@ -72,7 +72,9 @@ export function useHideAnimation(config: UseHideAnimationConfig) {
     navigationBarTranslucent = false,
   } = config;
 
-  const hasBrand = manifest.brand != null && brandSrc != null;
+  const skipLogo = logoSrc == null;
+  const skipBrand = manifest.brand == null || brandSrc == null;
+
   const logoWidth = manifest.logo.width;
   const logoHeight = manifest.logo.height;
   const brandBottom = manifest.brand?.bottom;
@@ -86,19 +88,22 @@ export function useHideAnimation(config: UseHideAnimationConfig) {
       ? manifest.darkBackground
       : manifest.background;
 
-  const logoFinalSrc: ImageRequireSource =
-    colorScheme === "dark" && darkLogoSrc != null ? darkLogoSrc : logoSrc;
+  const logoFinalSrc: ImageRequireSource | undefined = skipLogo
+    ? undefined
+    : colorScheme === "dark" && darkLogoSrc != null
+    ? darkLogoSrc
+    : logoSrc;
 
-  const brandFinalSrc: ImageRequireSource | undefined = hasBrand
-    ? colorScheme === "dark" && darkBrandSrc != null
-      ? darkBrandSrc
-      : brandSrc
-    : undefined;
+  const brandFinalSrc: ImageRequireSource | undefined = skipBrand
+    ? undefined
+    : colorScheme === "dark" && darkBrandSrc != null
+    ? darkBrandSrc
+    : brandSrc;
 
   const animateFn = useRef(animate);
   const layoutReady = useRef(false);
-  const logoReady = useRef(false);
-  const brandReady = useRef(!hasBrand);
+  const logoReady = useRef(skipLogo);
+  const brandReady = useRef(skipBrand);
   const animateHasBeenCalled = useRef(false);
 
   useEffect(() => {
@@ -136,23 +141,27 @@ export function useHideAnimation(config: UseHideAnimationConfig) {
       },
     };
 
-    const logo: ImageProps = {
-      fadeDuration: 0,
-      resizeMode: "contain",
-      source: logoFinalSrc,
-      style: {
-        width: logoWidth,
-        height: logoHeight,
-      },
-      onLoadEnd: () => {
-        logoReady.current = true;
-        maybeRunAnimate();
-      },
-    };
+    const logo: ImageProps =
+      logoFinalSrc == null
+        ? { source: -1 }
+        : {
+            fadeDuration: 0,
+            resizeMode: "contain",
+            source: logoFinalSrc,
+            style: {
+              width: logoWidth,
+              height: logoHeight,
+            },
+            onLoadEnd: () => {
+              logoReady.current = true;
+              maybeRunAnimate();
+            },
+          };
 
-    const brand: ImageProps | undefined =
-      brandFinalSrc != null
-        ? {
+    const brand: ImageProps =
+      brandFinalSrc == null
+        ? { source: -1 }
+        : {
             fadeDuration: 0,
             resizeMode: "contain",
             source: brandFinalSrc,
@@ -166,14 +175,13 @@ export function useHideAnimation(config: UseHideAnimationConfig) {
               brandReady.current = true;
               maybeRunAnimate();
             },
-          }
-        : undefined;
+          };
 
     if (Platform.OS !== "android") {
       return { container, logo, brand };
     }
 
-    const { statusBarHeight, navigationBarHeight } =
+    const { logoSizeRatio, navigationBarHeight, statusBarHeight } =
       NativeModule.getConstants();
 
     return {
@@ -187,7 +195,13 @@ export function useHideAnimation(config: UseHideAnimationConfig) {
             : -navigationBarHeight,
         },
       },
-      logo,
+      logo: {
+        ...logo,
+        style: {
+          width: logoWidth * logoSizeRatio,
+          height: logoHeight * logoSizeRatio,
+        },
+      },
       brand,
     };
   }, [

package/android/src/main/java/com/zoontek/rnbootsplash/RNBootSplashDialog.java

@@ -1,52 +0,0 @@
-package com.zoontek.rnbootsplash;
-
-import android.app.Activity;
-import android.app.Dialog;
-import android.os.Bundle;
-import android.view.Window;
-import android.view.WindowManager;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.StyleRes;
-
-public class RNBootSplashDialog extends Dialog {
-
-  public final boolean mFade;
-
-  public RNBootSplashDialog(@NonNull Activity activity, @StyleRes int themeResId, boolean fade) {
-    super(activity, themeResId);
-
-    mFade = fade;
-
-    setOwnerActivity(activity);
-    setCancelable(false);
-    setCanceledOnTouchOutside(false);
-  }
-
-  @Override
-  public void onBackPressed() {
-    Activity activity = getOwnerActivity();
-
-    if (activity != null) {
-      activity.moveTaskToBack(true);
-    }
-  }
-
-  @Override
-  protected void onCreate(Bundle savedInstanceState) {
-    final Window window = getWindow();
-
-    if (window != null) {
-      window.setLayout(
-        WindowManager.LayoutParams.MATCH_PARENT,
-        WindowManager.LayoutParams.MATCH_PARENT
-      );
-
-      if (mFade) {
-        window.setWindowAnimations(R.style.BootSplashFadeOutAnimation);
-      }
-    }
-
-    super.onCreate(savedInstanceState);
-  }
-}