release: 1.4.2, tweak UI, fix emoji on mac

This commit is contained in:
wonfen 2023-12-03 14:01:53 +08:00
parent 225b829c1a
commit b10c1d5006
14 changed files with 69 additions and 48 deletions

View File

@ -1,3 +1,21 @@
## v1.4.2
### Features
- update clash meta core to mihomo 1.17.0
- fixed the problem of not being able to set the system proxy when there is a dial-up link on windows system [#833](https://github.com/zzzgydi/clash-verge/issues/833)
- support new clash field
- support random mixed port
- add windows x86 and linux armv7 support
- support disable tray click event
- add download progress for updater
- support drag to reorder the profile
- embed emoji fonts
- update depends
- improve UI style
---
## v1.4.1 ## v1.4.1
### Features ### Features

View File

@ -1,6 +1,6 @@
{ {
"name": "clash-verge", "name": "clash-verge",
"version": "1.4.1", "version": "1.4.2",
"license": "GPL-3.0", "license": "GPL-3.0",
"scripts": { "scripts": {
"dev": "tauri dev -f default-meta", "dev": "tauri dev -f default-meta",

View File

@ -34,8 +34,8 @@ const CLASH_MAP = {
*/ */
/* ======= clash meta ======= */ /* ======= clash meta ======= */
const VERSION_URL = const VERSION_URL =
"https://github.com/MetaCubeX/mihomo/releases/download/Prerelease-Alpha/version.txt"; "https://github.com/MetaCubeX/mihomo/releases/download/v1.17.0/version.txt";
const META_URL_PREFIX = `https://github.com/MetaCubeX/mihomo/releases/download/Prerelease-Alpha`; const META_URL_PREFIX = `https://github.com/MetaCubeX/mihomo/releases/download/v1.17.0`;
let META_VERSION; let META_VERSION;
const META_MAP = { const META_MAP = {

31
src-tauri/Cargo.lock generated
View File

@ -131,11 +131,11 @@ version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c"
dependencies = [ dependencies = [
"async-lock 3.1.2", "async-lock 3.2.0",
"async-task", "async-task",
"concurrent-queue", "concurrent-queue",
"fastrand 2.0.1", "fastrand 2.0.1",
"futures-lite 2.0.1", "futures-lite 2.1.0",
"slab", "slab",
] ]
@ -177,11 +177,11 @@ version = "2.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6d3b15875ba253d1110c740755e246537483f152fa334f91abd7fe84c88b3ff" checksum = "d6d3b15875ba253d1110c740755e246537483f152fa334f91abd7fe84c88b3ff"
dependencies = [ dependencies = [
"async-lock 3.1.2", "async-lock 3.2.0",
"cfg-if", "cfg-if",
"concurrent-queue", "concurrent-queue",
"futures-io", "futures-io",
"futures-lite 2.0.1", "futures-lite 2.1.0",
"parking", "parking",
"polling 3.3.1", "polling 3.3.1",
"rustix 0.38.26", "rustix 0.38.26",
@ -201,9 +201,9 @@ dependencies = [
[[package]] [[package]]
name = "async-lock" name = "async-lock"
version = "3.1.2" version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dea8b3453dd7cc96711834b75400d671b73e3656975fa68d9f277163b7f7e316" checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c"
dependencies = [ dependencies = [
"event-listener 4.0.0", "event-listener 4.0.0",
"event-listener-strategy", "event-listener-strategy",
@ -390,11 +390,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118"
dependencies = [ dependencies = [
"async-channel 2.1.1", "async-channel 2.1.1",
"async-lock 3.1.2", "async-lock 3.2.0",
"async-task", "async-task",
"fastrand 2.0.1", "fastrand 2.0.1",
"futures-io", "futures-io",
"futures-lite 2.0.1", "futures-lite 2.1.0",
"piper", "piper",
"tracing", "tracing",
] ]
@ -559,7 +559,7 @@ dependencies = [
[[package]] [[package]]
name = "clash-verge" name = "clash-verge"
version = "1.4.1" version = "1.4.2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"auto-launch", "auto-launch",
@ -669,9 +669,9 @@ dependencies = [
[[package]] [[package]]
name = "concurrent-queue" name = "concurrent-queue"
version = "2.3.0" version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363"
dependencies = [ dependencies = [
"crossbeam-utils", "crossbeam-utils",
] ]
@ -956,9 +956,9 @@ dependencies = [
[[package]] [[package]]
name = "deranged" name = "deranged"
version = "0.3.9" version = "0.3.10"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" checksum = "8eb30d70a07a3b04884d2677f06bec33509dc67ca60d92949e5535352d3191dc"
dependencies = [ dependencies = [
"powerfmt", "powerfmt",
"serde", "serde",
@ -1389,14 +1389,13 @@ dependencies = [
[[package]] [[package]]
name = "futures-lite" name = "futures-lite"
version = "2.0.1" version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" checksum = "aeee267a1883f7ebef3700f262d2d54de95dfaf38189015a74fdc4e0c7ad8143"
dependencies = [ dependencies = [
"fastrand 2.0.1", "fastrand 2.0.1",
"futures-core", "futures-core",
"futures-io", "futures-io",
"memchr",
"parking", "parking",
"pin-project-lite", "pin-project-lite",
] ]

View File

@ -1,6 +1,6 @@
[package] [package]
name = "clash-verge" name = "clash-verge"
version = "1.4.1" version = "1.4.2"
description = "clash verge" description = "clash verge"
authors = ["zzzgydi"] authors = ["zzzgydi"]
license = "GPL-3.0" license = "GPL-3.0"
@ -37,7 +37,7 @@ parking_lot = "0.12"
tokio = { version = "1", features = ["full"] } tokio = { version = "1", features = ["full"] }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
reqwest = { version = "0.11", features = ["json", "rustls-tls"] } reqwest = { version = "0.11", features = ["json", "rustls-tls"] }
tauri = { version = "1.5", features = [ "clipboard-all", "global-shortcut-all", "process-all", "shell-all", "system-tray", "updater", "window-all"] } tauri = { version = "1.5", features = ["clipboard-all", "global-shortcut-all", "process-all", "shell-all", "system-tray", "updater", "window-all"] }
window-vibrancy = { version = "0.4.3" } window-vibrancy = { version = "0.4.3" }
window-shadows = { version = "0.2" } window-shadows = { version = "0.2" }

View File

@ -1,7 +1,7 @@
{ {
"package": { "package": {
"productName": "Clash Verge", "productName": "Clash Verge",
"version": "1.4.1" "version": "1.4.2"
}, },
"build": { "build": {
"distDir": "../dist", "distDir": "../dist",

Binary file not shown.

View File

@ -1,21 +1,21 @@
.page-enter { .page-enter {
opacity: 0; opacity: 0;
transform: scale(0.9); clip-path: inset(0 100% 0 0); /* 完全隐藏内容 */
} }
.page-enter-active { .page-enter-active {
opacity: 1; opacity: 1;
transform: scale(1); clip-path: inset(0 0 0 0); /* 逐渐显示整个内容 */
transition: opacity 300ms, transform 300ms; transition: opacity 300ms, clip-path 300ms ease-in-out;
} }
.page-exit { .page-exit {
opacity: 1; opacity: 1;
transform: scale(0); clip-path: inset(0 0 0 0); /* 完全显示内容 */
} }
.page-exit-active { .page-exit-active {
opacity: 0; opacity: 0;
transform: scale(0.9); clip-path: inset(0 100% 0 0); /* 逐渐隐藏内容 */
transition: opacity 300ms, transform 300ms; transition: opacity 300ms, clip-path 300ms ease-in-out;
} }

View File

@ -18,7 +18,7 @@ body {
--scroller-color: #90939980; --scroller-color: #90939980;
--background-color: #ffffff; --background-color: #ffffff;
--background-color-alpha: rgba(24, 103, 192, 0.1); --background-color-alpha: rgba(24, 103, 192, 0.1);
--border-radius: 12px; --border-radius: 8px;
} }
::selection { ::selection {

View File

@ -57,7 +57,7 @@
.the-menu { .the-menu {
flex: 1 1 80%; flex: 1 1 80%;
overflow-y: auto; overflow-y: auto;
margin-bottom: 8px; margin-bottom: 0px;
} }
.the-traffic { .the-traffic {

View File

@ -10,9 +10,7 @@ export const LayoutItem = (props: LinkProps) => {
const navigate = useNavigate(); const navigate = useNavigate();
return ( return (
<ListItem <ListItem sx={{ py: 0.5, maxWidth: 250, mx: "auto", padding: "1px 0px" }}>
sx={{ py: 0.5, maxWidth: 250, mx: "auto", padding: "4px 0px 4px 2px" }}
>
<ListItemButton <ListItemButton
selected={!!match} selected={!!match}
sx={[ sx={[

View File

@ -87,7 +87,7 @@ export const useCustomTheme = () => {
} }
// css // css
const backgroundColor = mode === "light" ? "#ffffff" : "#0E1621"; const backgroundColor = mode === "light" ? "#ffffff" : "#0B121C";
const selectColor = mode === "light" ? "#f5f5f5" : "#d5d5d5"; const selectColor = mode === "light" ? "#f5f5f5" : "#d5d5d5";
const scrollColor = mode === "light" ? "#90939980" : "#54545480"; const scrollColor = mode === "light" ? "#90939980" : "#54545480";

View File

@ -8,7 +8,7 @@ import { Lock } from "@mui/icons-material";
import { import {
Box, Box,
Button, Button,
IconButton, Tooltip,
List, List,
ListItemButton, ListItemButton,
ListItemText, ListItemText,
@ -124,10 +124,10 @@ export const ClashCoreViewer = forwardRef<DialogRef>((props, ref) => {
> >
<Lock fontSize="inherit" /> <Lock fontSize="inherit" />
</IconButton> */ </IconButton> */
<Tooltip title={t("Tun mode requires")}>
<Button <Button
variant="outlined" variant="outlined"
size="small" size="small"
title={t("Tun mode requires")}
onClick={(e) => { onClick={(e) => {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
@ -136,6 +136,7 @@ export const ClashCoreViewer = forwardRef<DialogRef>((props, ref) => {
> >
{t("Grant")} {t("Grant")}
</Button> </Button>
</Tooltip>
)} )}
</ListItemButton> </ListItemButton>
))} ))}

View File

@ -1,3 +1,6 @@
import getSystem from "@/utils/get-system";
const OS = getSystem();
// default theme setting // default theme setting
export const defaultTheme = { export const defaultTheme = {
primary_color: "#1867c0", primary_color: "#1867c0",
@ -9,7 +12,9 @@ export const defaultTheme = {
warning_color: "#ed6c02", warning_color: "#ed6c02",
success_color: "#2e7d32", success_color: "#2e7d32",
background_color: "#ffffff", background_color: "#ffffff",
font_family: `"Roboto", "Helvetica", "Arial", sans-serif, "twemoji mozilla"`, font_family: `"Roboto", "Helvetica", "Arial", sans-serif, ${
OS === "windows" ? "twemoji mozilla" : ""
}`,
}; };
// dark mode // dark mode