style: add fancy image assets

yaagl · Mar 6, 2023 · c80eca6 · c80eca6
1 parent 5954b08
commit c80eca6
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 21 deletions.
diff --git a/build-app.js b/build-app.js
@@ -83,11 +83,11 @@ const { IconIcns } = require("@shockpkg/icon-encoder");
   // check if file exists
   if (
     fs.existsSync(
-      path.resolve(process.cwd(), "src", "icons", "appIcon.png")
+      path.join(process.cwd(), config.modes.window.icon)
     )
   ) {
     const iconFile = await fs.readFile(
-      path.resolve(process.cwd(), "src", "icons", "appIcon.png")
+      path.join(process.cwd(), config.modes.window.icon)
     );
     icns.addFromPng(iconFile, ["ic09"], raw);
     // icns.addFromPng(iconFile, ['ic07'], raw);
@@ -194,9 +194,9 @@ PATH_LAUNCH="$(dirname "$CONTENTS_DIR")" exec "$SCRIPT_DIR/${appname}" --path="$
         <key>CFBundleIdentifier</key>
         <string>${config.applicationId}</string>
         <key>CFBundleName</key>
-        <string>${pkg.name}</string>
+        <string>${config.modes.window.title}</string>
         <key>CFBundleDisplayName</key>
-        <string>${config.cli.binaryName}</string>
+        <string>${config.modes.window.title}</string>
         <key>CFBundlePackageType</key>
         <string>APPL</string>
         <key>CFBundleVersion</key>

diff --git a/neutralino.config.json b/neutralino.config.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/neutralinojs/neutralinojs/main/schemas/neutralino.config.schema.json",
-  "applicationId": "com.3s.yaagl",
+  "applicationId": "com.3shain.yaagl",
   "version": "1.0.0",
   "defaultMode": "window",
   "port": 0,
@@ -36,7 +36,7 @@
       "maximize": false,
       "hidden": true,
       "resizable": false,
-      "icon": "/src/icons/appIcon.png",
+      "icon": "/src/icons/Paimon.cr.png",
       "exitProcessOnClose": false
     }
   },

diff --git a/src/app.tsx b/src/app.tsx
@@ -65,13 +65,14 @@ export async function createApp() {
     aria2,
   });
   // return createCommonUpdateUI(async function *(){
-  //   yield ['setStateText','progressing'];
+  //   yield ['setStateText','测试进度'];
   //   for(let i=0;i<=100;i++) {
   //     yield ['setProgress', i];
-  //     await wait(1000);
+  //     await wait(50);
   //   }
   //   yield ['setUndeterminedProgress'];
-  //   await wait(10000);
+  //   await wait(2000);
+  //   yield ['setStateText','完成'];
   // });
   if (!latest) {
     if (

diff --git a/src/assets/Nahida.cr.png b/src/assets/Nahida.cr.png
diff --git a/src/common-update-ui.tsx b/src/common-update-ui.tsx
@@ -1,7 +1,8 @@
 import { Button, Progress, ProgressIndicator, Center } from "@hope-ui/solid";
-import { Box, VStack } from "@hope-ui/solid";
+import { Box, VStack, Image } from "@hope-ui/solid";
 import { createSignal, onMount, Show } from "solid-js";
 import { fatal, log, shutdown, wait } from "./utils";
+import s from "./assets/Nahida.cr.png";
 
 export function createCommonUpdateUI(program: () => CommonUpdateProgram) {
   let confirmRestart: (v: any) => void;
@@ -33,9 +34,11 @@ export function createCommonUpdateUI(program: () => CommonUpdateProgram) {
         await shutdown();
         // await wait(1000);
         // HACK
-        if(import.meta.env.PROD) {
+        if (import.meta.env.PROD) {
           const app = await Neutralino.os.getEnv("PATH_LAUNCH");
-          await Neutralino.os.execCommand(`open "${app}"`, {background:true});
+          await Neutralino.os.execCommand(`open "${app}"`, {
+            background: true,
+          });
           Neutralino.app.exit(0);
         } else {
           Neutralino.app.restartProcess();
@@ -48,16 +51,22 @@ export function createCommonUpdateUI(program: () => CommonUpdateProgram) {
     return (
       <Center h="100vh" w="100vw">
         <VStack alignItems="stretch" spacing="$8" w="80vw">
-          <Box bg="transparent" h="40vh" w="100%"></Box>
+          <Center>
+            <Image boxSize={280} src={s}></Image>
+          </Center>
           <h1 style="text-align: center">{statusText()}</h1>
-          <Show
-            when={!done()}
-            fallback={<Button onClick={confirmRestart!}>重启以完成安装</Button>}
-          >
-            <Progress value={progress()} indeterminate={progress() == 0}>
-              <ProgressIndicator animated striped />
-            </Progress>
-          </Show>
+          <Box height={100}>
+            <Show
+              when={!done()}
+              fallback={
+                <Center><Button onClick={confirmRestart!}>重启以完成安装</Button></Center>
+              }
+            >
+              <Progress value={progress()} indeterminate={progress() == 0}>
+                <ProgressIndicator animated striped />
+              </Progress>
+            </Show>
+          </Box>
         </VStack>
       </Center>
     );

diff --git a/src/icons/Paimon.cr.png b/src/icons/Paimon.cr.png
diff --git a/src/index.tsx b/src/index.tsx
@@ -9,6 +9,9 @@ if (typeof Neutralino == "undefined") {
   console.log(`This app doesn't work on browser.`);
 } else {
   Neutralino.init();
+  if (import.meta.env.PROD) {
+    document.addEventListener("contextmenu", (event) => event.preventDefault());
+  }
   createApp()
     .then((UI) => {
       render(