From 9bdee843998e661aa745d97e2b5ffba8794fc01b Mon Sep 17 00:00:00 2001 From: pompurin404 Date: Thu, 8 Aug 2024 16:06:48 +0800 Subject: [PATCH] add emoji font --- .gitignore | 1 + scripts/prepare.mjs | 19 ++++++++++++++++ src/renderer/src/assets/main.css | 22 +++++++++++++++++++ .../components/profiles/edit-file-modal.tsx | 2 +- .../src/components/proxies/proxy-item.tsx | 2 +- .../src/components/sider/config-viewer.tsx | 2 +- .../src/components/sider/profile-card.tsx | 4 ++-- .../components/sysproxy/pac-editor-modal.tsx | 2 +- src/renderer/src/pages/proxies.tsx | 4 ++-- 9 files changed, 50 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index d072e8a..b30c592 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ out .DS_Store *.log* .idea +*.ttf diff --git a/scripts/prepare.mjs b/scripts/prepare.mjs index 61c7691..48c1916 100644 --- a/scripts/prepare.mjs +++ b/scripts/prepare.mjs @@ -257,6 +257,20 @@ const resolveEnableLoopback = () => downloadURL: `https://github.com/Kuingsmile/uwp-tool/releases/download/latest/enableLoopback.exe` }) +const resolveFont = async () => { + const targetPath = path.join(cwd, 'src', 'renderer', 'src', 'assets', 'NotoColorEmoji.ttf') + + if (fs.existsSync(targetPath)) { + return + } + await downloadFile( + 'https://github.com/googlefonts/noto-emoji/raw/main/fonts/NotoColorEmoji.ttf', + targetPath + ) + + console.log(`[INFO]: NotoColorEmoji.ttf finished`) +} + const tasks = [ { name: 'verge-mihomo-alpha', @@ -271,6 +285,11 @@ const tasks = [ { name: 'mmdb', func: resolveMmdb, retry: 5 }, { name: 'geosite', func: resolveGeosite, retry: 5 }, { name: 'geoip', func: resolveGeoIP, retry: 5 }, + { + name: 'font', + func: resolveFont, + retry: 5 + }, { name: 'enableLoopback', func: resolveEnableLoopback, diff --git a/src/renderer/src/assets/main.css b/src/renderer/src/assets/main.css index f985ad0..0ef185f 100644 --- a/src/renderer/src/assets/main.css +++ b/src/renderer/src/assets/main.css @@ -2,6 +2,28 @@ @tailwind components; @tailwind utilities; +@font-face { + font-family: 'Noto Color Emoji'; + src: url('./NotoColorEmoji.ttf'); +} + +.flag-empji { + font-family: + system-ui, + -apple-system, + BlinkMacSystemFont, + 'Segoe UI', + Roboto, + Oxygen, + Ubuntu, + Cantarell, + 'Open Sans', + 'Helvetica Neue', + sans-serif, + 'Apple Color Emoji', + 'Noto Color Emoji'; +} + .no-scrollbar::-webkit-scrollbar { display: none; } diff --git a/src/renderer/src/components/profiles/edit-file-modal.tsx b/src/renderer/src/components/profiles/edit-file-modal.tsx index 703b7bd..bab92b9 100644 --- a/src/renderer/src/components/profiles/edit-file-modal.tsx +++ b/src/renderer/src/components/profiles/edit-file-modal.tsx @@ -46,7 +46,7 @@ const EditFileModal: React.FC = (props) => { enabled: false }, mouseWheelZoom: true, - fontFamily: `Fira Code, JetBrains Mono, Roboto Mono, "Source Code Pro", Consolas, Menlo, Monaco, monospace, "Courier New", "Apple Color Emoji"`, + fontFamily: `Fira Code, JetBrains Mono, Roboto Mono, "Source Code Pro", Consolas, Menlo, Monaco, monospace, "Courier New", "Apple Color Emoji", "Noto Color Emoji"`, fontLigatures: true, // 连字符 smoothScrolling: true // 平滑滚动 }} diff --git a/src/renderer/src/components/proxies/proxy-item.tsx b/src/renderer/src/components/proxies/proxy-item.tsx index 16759fe..07f9447 100644 --- a/src/renderer/src/components/proxies/proxy-item.tsx +++ b/src/renderer/src/components/proxies/proxy-item.tsx @@ -64,7 +64,7 @@ const ProxyItem: React.FC = (props) => {
-
+
{proxy.name}
{proxyDisplayMode === 'full' && ( diff --git a/src/renderer/src/components/sider/config-viewer.tsx b/src/renderer/src/components/sider/config-viewer.tsx index e77e836..e22ad0b 100644 --- a/src/renderer/src/components/sider/config-viewer.tsx +++ b/src/renderer/src/components/sider/config-viewer.tsx @@ -46,7 +46,7 @@ const ConfigViewer: React.FC = (props) => { enabled: false }, mouseWheelZoom: true, - fontFamily: `Fira Code, JetBrains Mono, Roboto Mono, "Source Code Pro", Consolas, Menlo, Monaco, monospace, "Courier New", "Apple Color Emoji"`, + fontFamily: `Fira Code, JetBrains Mono, Roboto Mono, "Source Code Pro", Consolas, Menlo, Monaco, monospace, "Courier New", "Apple Color Emoji", "Noto Color Empji"`, fontLigatures: true, // 连字符 smoothScrolling: true // 平滑滚动 }} diff --git a/src/renderer/src/components/sider/profile-card.tsx b/src/renderer/src/components/sider/profile-card.tsx index 9d3cdd1..3ff174a 100644 --- a/src/renderer/src/components/sider/profile-card.tsx +++ b/src/renderer/src/components/sider/profile-card.tsx @@ -2,7 +2,7 @@ import { Button, Card, CardBody, CardFooter, Chip, Progress } from '@nextui-org/ import { useProfileConfig } from '@renderer/hooks/use-profile-config' import { useLocation, useNavigate } from 'react-router-dom' import { calcTraffic, calcPercent } from '@renderer/utils/calc' -import { LiaGripfire } from 'react-icons/lia' +import { CgLoadbarDoc } from 'react-icons/cg' import { IoMdRefresh } from 'react-icons/io' import relativeTime from 'dayjs/plugin/relativeTime' import 'dayjs/locale/zh-cn' @@ -57,7 +57,7 @@ const ProfileCard: React.FC = () => { setShowRuntimeConfig(true) }} > - + {info.type === 'remote' && (