chore: unified icon style

This commit is contained in:
MystiPanda 2024-07-13 19:01:16 +08:00
parent 48f7c15035
commit c14a33444b
No known key found for this signature in database
13 changed files with 56 additions and 41 deletions

View File

@ -1,7 +1,11 @@
import { createRoot } from "react-dom/client"; import { createRoot } from "react-dom/client";
import { ReactNode, useState, useEffect } from "react"; import { ReactNode, useState, useEffect } from "react";
import { Box, IconButton, Slide, Snackbar, Typography } from "@mui/material"; import { Box, IconButton, Slide, Snackbar, Typography } from "@mui/material";
import { Close, CheckCircleRounded, ErrorRounded } from "@mui/icons-material"; import {
CloseRounded,
CheckCircleRounded,
ErrorRounded,
} from "@mui/icons-material";
import { useVerge } from "@/hooks/use-verge"; import { useVerge } from "@/hooks/use-verge";
import { appWindow } from "@tauri-apps/api/window"; import { appWindow } from "@tauri-apps/api/window";
interface InnerProps { interface InnerProps {
@ -81,7 +85,7 @@ const NoticeInner = (props: InnerProps) => {
transitionDuration={200} transitionDuration={200}
action={ action={
<IconButton size="small" color="inherit" onClick={onBtnClose}> <IconButton size="small" color="inherit" onClick={onBtnClose}>
<Close fontSize="inherit" /> <CloseRounded fontSize="inherit" />
</IconButton> </IconButton>
} }
/> />

View File

@ -1,9 +1,9 @@
import { useEffect, useRef, useState } from "react"; import { useEffect, useRef, useState } from "react";
import { Box, Typography } from "@mui/material"; import { Box, Typography } from "@mui/material";
import { import {
ArrowDownward, ArrowDownwardRounded,
ArrowUpward, ArrowUpwardRounded,
MemoryOutlined, MemoryRounded,
} from "@mui/icons-material"; } from "@mui/icons-material";
import { useClashInfo } from "@/hooks/use-clash"; import { useClashInfo } from "@/hooks/use-clash";
import { useVerge } from "@/hooks/use-verge"; import { useVerge } from "@/hooks/use-verge";
@ -153,7 +153,7 @@ export const LayoutTraffic = () => {
<Box display="flex" flexDirection="column" gap={0.75}> <Box display="flex" flexDirection="column" gap={0.75}>
<Box title={t("Upload Speed")} {...boxStyle}> <Box title={t("Upload Speed")} {...boxStyle}>
<ArrowUpward <ArrowUpwardRounded
{...iconStyle} {...iconStyle}
color={+up > 0 ? "secondary" : "disabled"} color={+up > 0 ? "secondary" : "disabled"}
/> />
@ -164,7 +164,7 @@ export const LayoutTraffic = () => {
</Box> </Box>
<Box title={t("Download Speed")} {...boxStyle}> <Box title={t("Download Speed")} {...boxStyle}>
<ArrowDownward <ArrowDownwardRounded
{...iconStyle} {...iconStyle}
color={+down > 0 ? "primary" : "disabled"} color={+down > 0 ? "primary" : "disabled"}
/> />
@ -184,7 +184,7 @@ export const LayoutTraffic = () => {
isDebug && (await gc()); isDebug && (await gc());
}} }}
> >
<MemoryOutlined {...iconStyle} /> <MemoryRounded {...iconStyle} />
<Typography {...valStyle}>{inuse}</Typography> <Typography {...valStyle}>{inuse}</Typography>
<Typography {...unitStyle}>{inuseUnit}</Typography> <Typography {...unitStyle}>{inuseUnit}</Typography>
</Box> </Box>

View File

@ -10,9 +10,11 @@ import {
DialogTitle, DialogTitle,
IconButton, IconButton,
} from "@mui/material"; } from "@mui/material";
import FormatPaintIcon from "@mui/icons-material/FormatPaint"; import {
import OpenInFullIcon from "@mui/icons-material/OpenInFull"; FormatPaintRounded,
import CloseFullscreenIcon from "@mui/icons-material/CloseFullscreen"; OpenInFullRounded,
CloseFullscreenRounded,
} from "@mui/icons-material";
import { useThemeMode } from "@/services/states"; import { useThemeMode } from "@/services/states";
import { Notice } from "@/components/base"; import { Notice } from "@/components/base";
import { nanoid } from "nanoid"; import { nanoid } from "nanoid";
@ -223,7 +225,7 @@ export const EditorViewer = <T extends Language>(props: Props<T>) => {
?.run() ?.run()
} }
> >
<FormatPaintIcon fontSize="inherit" /> <FormatPaintRounded fontSize="inherit" />
</IconButton> </IconButton>
<IconButton <IconButton
size="medium" size="medium"
@ -231,7 +233,7 @@ export const EditorViewer = <T extends Language>(props: Props<T>) => {
title={t(isMaximized ? "Minimize" : "Maximize")} title={t(isMaximized ? "Minimize" : "Maximize")}
onClick={() => appWindow.toggleMaximize().then(editorResize)} onClick={() => appWindow.toggleMaximize().then(editorResize)}
> >
{isMaximized ? <CloseFullscreenIcon /> : <OpenInFullIcon />} {isMaximized ? <CloseFullscreenRounded /> : <OpenInFullRounded />}
</IconButton> </IconButton>
</ButtonGroup> </ButtonGroup>
</DialogContent> </DialogContent>

View File

@ -30,8 +30,10 @@ import {
TextField, TextField,
styled, styled,
} from "@mui/material"; } from "@mui/material";
import VerticalAlignTopIcon from "@mui/icons-material/VerticalAlignTop"; import {
import VerticalAlignBottomIcon from "@mui/icons-material/VerticalAlignBottom"; VerticalAlignTopRounded,
VerticalAlignBottomRounded,
} from "@mui/icons-material";
import { GroupItem } from "@/components/profile/group-item"; import { GroupItem } from "@/components/profile/group-item";
import { import {
getNetworkInterfaces, getNetworkInterfaces,
@ -712,7 +714,7 @@ export const GroupsEditorViewer = (props: Props) => {
<Button <Button
fullWidth fullWidth
variant="contained" variant="contained"
startIcon={<VerticalAlignTopIcon />} startIcon={<VerticalAlignTopRounded />}
onClick={() => { onClick={() => {
try { try {
validateGroup(); validateGroup();
@ -734,7 +736,7 @@ export const GroupsEditorViewer = (props: Props) => {
<Button <Button
fullWidth fullWidth
variant="contained" variant="contained"
startIcon={<VerticalAlignBottomIcon />} startIcon={<VerticalAlignBottomRounded />}
onClick={() => { onClick={() => {
try { try {
validateGroup(); validateGroup();

View File

@ -15,7 +15,7 @@ import {
Menu, Menu,
CircularProgress, CircularProgress,
} from "@mui/material"; } from "@mui/material";
import { RefreshRounded, DragIndicator } from "@mui/icons-material"; import { RefreshRounded, DragIndicatorRounded } from "@mui/icons-material";
import { useLoadingCache, useSetLoadingCache } from "@/services/states"; import { useLoadingCache, useSetLoadingCache } from "@/services/states";
import { import {
viewProfile, viewProfile,
@ -348,7 +348,7 @@ export const ProfileItem = (props: Props) => {
{...attributes} {...attributes}
{...listeners} {...listeners}
> >
<DragIndicator <DragIndicatorRounded
sx={[ sx={[
{ cursor: "move", marginLeft: "-6px" }, { cursor: "move", marginLeft: "-6px" },
({ palette: { text } }) => { ({ palette: { text } }) => {

View File

@ -27,8 +27,10 @@ import {
TextField, TextField,
styled, styled,
} from "@mui/material"; } from "@mui/material";
import VerticalAlignTopIcon from "@mui/icons-material/VerticalAlignTop"; import {
import VerticalAlignBottomIcon from "@mui/icons-material/VerticalAlignBottom"; VerticalAlignTopRounded,
VerticalAlignBottomRounded,
} from "@mui/icons-material";
import { ProxyItem } from "@/components/profile/proxy-item"; import { ProxyItem } from "@/components/profile/proxy-item";
import { readProfileFile, saveProfileFile } from "@/services/cmds"; import { readProfileFile, saveProfileFile } from "@/services/cmds";
import { Notice } from "@/components/base"; import { Notice } from "@/components/base";
@ -271,7 +273,7 @@ export const ProxiesEditorViewer = (props: Props) => {
<Button <Button
fullWidth fullWidth
variant="contained" variant="contained"
startIcon={<VerticalAlignTopIcon />} startIcon={<VerticalAlignTopRounded />}
onClick={() => { onClick={() => {
let proxies = handleParse(); let proxies = handleParse();
setPrependSeq([...prependSeq, ...proxies]); setPrependSeq([...prependSeq, ...proxies]);
@ -284,7 +286,7 @@ export const ProxiesEditorViewer = (props: Props) => {
<Button <Button
fullWidth fullWidth
variant="contained" variant="contained"
startIcon={<VerticalAlignBottomIcon />} startIcon={<VerticalAlignBottomRounded />}
onClick={() => { onClick={() => {
let proxies = handleParse(); let proxies = handleParse();
setAppendSeq([...appendSeq, ...proxies]); setAppendSeq([...appendSeq, ...proxies]);

View File

@ -29,8 +29,10 @@ import {
TextField, TextField,
styled, styled,
} from "@mui/material"; } from "@mui/material";
import VerticalAlignTopIcon from "@mui/icons-material/VerticalAlignTop"; import {
import VerticalAlignBottomIcon from "@mui/icons-material/VerticalAlignBottom"; VerticalAlignTopRounded,
VerticalAlignBottomRounded,
} from "@mui/icons-material";
import { readProfileFile, saveProfileFile } from "@/services/cmds"; import { readProfileFile, saveProfileFile } from "@/services/cmds";
import { Notice, Switch } from "@/components/base"; import { Notice, Switch } from "@/components/base";
import getSystem from "@/utils/get-system"; import getSystem from "@/utils/get-system";
@ -536,7 +538,7 @@ export const RulesEditorViewer = (props: Props) => {
<Button <Button
fullWidth fullWidth
variant="contained" variant="contained"
startIcon={<VerticalAlignTopIcon />} startIcon={<VerticalAlignTopRounded />}
onClick={() => { onClick={() => {
try { try {
let raw = validateRule(); let raw = validateRule();
@ -554,7 +556,7 @@ export const RulesEditorViewer = (props: Props) => {
<Button <Button
fullWidth fullWidth
variant="contained" variant="contained"
startIcon={<VerticalAlignBottomIcon />} startIcon={<VerticalAlignBottomRounded />}
onClick={() => { onClick={() => {
try { try {
let raw = validateRule(); let raw = validateRule();

View File

@ -5,7 +5,10 @@ import { useTranslation } from "react-i18next";
import { useVerge } from "@/hooks/use-verge"; import { useVerge } from "@/hooks/use-verge";
import { useLockFn } from "ahooks"; import { useLockFn } from "ahooks";
import { LoadingButton } from "@mui/lab"; import { LoadingButton } from "@mui/lab";
import { SwitchAccessShortcut, RestartAlt } from "@mui/icons-material"; import {
SwitchAccessShortcutRounded,
RestartAltRounded,
} from "@mui/icons-material";
import { import {
Box, Box,
Button, Button,
@ -85,7 +88,7 @@ export const ClashCoreViewer = forwardRef<DialogRef>((props, ref) => {
<LoadingButton <LoadingButton
variant="contained" variant="contained"
size="small" size="small"
startIcon={<SwitchAccessShortcut />} startIcon={<SwitchAccessShortcutRounded />}
loadingPosition="start" loadingPosition="start"
loading={upgrading} loading={upgrading}
sx={{ marginRight: "8px" }} sx={{ marginRight: "8px" }}
@ -97,7 +100,7 @@ export const ClashCoreViewer = forwardRef<DialogRef>((props, ref) => {
variant="contained" variant="contained"
size="small" size="small"
onClick={onRestart} onClick={onRestart}
startIcon={<RestartAlt />} startIcon={<RestartAltRounded />}
> >
{t("Restart")} {t("Restart")}
</Button> </Button>

View File

@ -14,7 +14,7 @@ import {
import { useVerge } from "@/hooks/use-verge"; import { useVerge } from "@/hooks/use-verge";
import { getSystemProxy, getAutotemProxy } from "@/services/cmds"; import { getSystemProxy, getAutotemProxy } from "@/services/cmds";
import { BaseDialog, DialogRef, Notice, Switch } from "@/components/base"; import { BaseDialog, DialogRef, Notice, Switch } from "@/components/base";
import { Edit } from "@mui/icons-material"; import { EditRounded } from "@mui/icons-material";
import { EditorViewer } from "@/components/profile/editor-viewer"; import { EditorViewer } from "@/components/profile/editor-viewer";
import { BaseFieldset } from "@/components/base/base-fieldset"; import { BaseFieldset } from "@/components/base/base-fieldset";
import getSystem from "@/utils/get-system"; import getSystem from "@/utils/get-system";
@ -253,7 +253,7 @@ export const SysproxyViewer = forwardRef<DialogRef>((props, ref) => {
sx={{ padding: "3px 0" }} sx={{ padding: "3px 0" }}
/> />
<Button <Button
startIcon={<Edit />} startIcon={<EditRounded />}
variant="outlined" variant="outlined"
onClick={() => { onClick={() => {
setEditorOpen(true); setEditorOpen(true);

View File

@ -14,7 +14,7 @@ import { useVerge } from "@/hooks/use-verge";
import { defaultTheme, defaultDarkTheme } from "@/pages/_theme"; import { defaultTheme, defaultDarkTheme } from "@/pages/_theme";
import { BaseDialog, DialogRef, Notice } from "@/components/base"; import { BaseDialog, DialogRef, Notice } from "@/components/base";
import { EditorViewer } from "@/components/profile/editor-viewer"; import { EditorViewer } from "@/components/profile/editor-viewer";
import { Edit } from "@mui/icons-material"; import { EditRounded } from "@mui/icons-material";
export const ThemeViewer = forwardRef<DialogRef>((props, ref) => { export const ThemeViewer = forwardRef<DialogRef>((props, ref) => {
const { t } = useTranslation(); const { t } = useTranslation();
@ -115,7 +115,7 @@ export const ThemeViewer = forwardRef<DialogRef>((props, ref) => {
<Item> <Item>
<ListItemText primary={t("CSS Injection")} /> <ListItemText primary={t("CSS Injection")} />
<Button <Button
startIcon={<Edit />} startIcon={<EditRounded />}
variant="outlined" variant="outlined"
onClick={() => { onClick={() => {
setEditorOpen(true); setEditorOpen(true);

View File

@ -1,7 +1,7 @@
import useSWR from "swr"; import useSWR from "swr";
import { useRef } from "react"; import { useRef } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { PrivacyTipRounded, Settings } from "@mui/icons-material"; import { PrivacyTipRounded, SettingsRounded } from "@mui/icons-material";
import { checkService } from "@/services/cmds"; import { checkService } from "@/services/cmds";
import { useVerge } from "@/hooks/use-verge"; import { useVerge } from "@/hooks/use-verge";
import { DialogRef, Switch } from "@/components/base"; import { DialogRef, Switch } from "@/components/base";
@ -56,7 +56,7 @@ const SettingSystem = ({ onError }: Props) => {
extra={ extra={
<TooltipIcon <TooltipIcon
title={t("Tun Mode Info")} title={t("Tun Mode Info")}
icon={Settings} icon={SettingsRounded}
onClick={() => tunRef.current?.open()} onClick={() => tunRef.current?.open()}
/> />
} }
@ -106,7 +106,7 @@ const SettingSystem = ({ onError }: Props) => {
<> <>
<TooltipIcon <TooltipIcon
title={t("System Proxy Info")} title={t("System Proxy Info")}
icon={Settings} icon={SettingsRounded}
onClick={() => sysproxyRef.current?.open()} onClick={() => sysproxyRef.current?.open()}
/> />
</> </>

View File

@ -13,7 +13,7 @@ import {
alpha, alpha,
} from "@mui/material"; } from "@mui/material";
import { BaseLoading } from "@/components/base"; import { BaseLoading } from "@/components/base";
import { LanguageTwoTone } from "@mui/icons-material"; import { LanguageRounded } from "@mui/icons-material";
import { Notice } from "@/components/base"; import { Notice } from "@/components/base";
import { TestBox } from "./test-box"; import { TestBox } from "./test-box";
import delayManager from "@/services/delay"; import delayManager from "@/services/delay";
@ -146,7 +146,7 @@ export const TestItem = (props: Props) => {
</Box> </Box>
) : ( ) : (
<Box sx={{ display: "flex", justifyContent: "center" }}> <Box sx={{ display: "flex", justifyContent: "center" }}>
<LanguageTwoTone sx={{ height: "40px" }} fontSize="large" /> <LanguageRounded sx={{ height: "40px" }} fontSize="large" />
</Box> </Box>
)} )}

View File

@ -2,7 +2,7 @@ import { Box, ButtonGroup, Grid, IconButton } from "@mui/material";
import { useLockFn } from "ahooks"; import { useLockFn } from "ahooks";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { BasePage, Notice } from "@/components/base"; import { BasePage, Notice } from "@/components/base";
import { GitHub, HelpOutlineSharp, Telegram } from "@mui/icons-material"; import { GitHub, HelpOutlineRounded, Telegram } from "@mui/icons-material";
import { openWebUrl } from "@/services/cmds"; import { openWebUrl } from "@/services/cmds";
import SettingVerge from "@/components/setting/setting-verge"; import SettingVerge from "@/components/setting/setting-verge";
import SettingClash from "@/components/setting/setting-clash"; import SettingClash from "@/components/setting/setting-clash";
@ -42,7 +42,7 @@ const SettingPage = () => {
title={t("Manual")} title={t("Manual")}
onClick={toGithubDoc} onClick={toGithubDoc}
> >
<HelpOutlineSharp fontSize="inherit" /> <HelpOutlineRounded fontSize="inherit" />
</IconButton> </IconButton>
<IconButton <IconButton
size="medium" size="medium"