Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make header buttons more button-like #2578

Merged
merged 3 commits into from
Dec 18, 2024
Merged

Make header buttons more button-like #2578

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a1dea3
make header buttons more button-like
frzyc Dec 16, 2024
7d9e0fa
cleanup
frzyc Dec 16, 2024
ca28bce
Add more outline card buttons
frzyc Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions libs/common/ui/src/theme/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,16 @@ declare module '@mui/material/Button' {
roll4: true
roll5: true
roll6: true

neutral100: true
neutral200: true
neutral300: true
neutral400: true
neutral500: true
neutral600: true
neutral700: true
neutral800: true
neutral900: true
}
}

Expand Down
41 changes: 22 additions & 19 deletions libs/gi/page-team/src/CharacterDisplay/Content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { CardThemed } from '@genshin-optimizer/common/ui'
import { colorToRgbaString, hexToColor } from '@genshin-optimizer/common/util'
import { characterAsset } from '@genshin-optimizer/gi/assets'
import type { CharacterKey, ElementKey } from '@genshin-optimizer/gi/consts'
import { TeamCharacterContext, useDBMeta } from '@genshin-optimizer/gi/db-ui'
Expand All @@ -8,14 +9,7 @@ import PersonIcon from '@mui/icons-material/Person'
import ScienceIcon from '@mui/icons-material/Science'
import TrendingUpIcon from '@mui/icons-material/TrendingUp'
import UpgradeIcon from '@mui/icons-material/Upgrade'
import {
Divider,
Skeleton,
Tab,
Tabs,
useMediaQuery,
useTheme,
} from '@mui/material'
import { Skeleton, Tab, Tabs, useMediaQuery, useTheme } from '@mui/material'
import { Suspense, useContext } from 'react'
import { useTranslation } from 'react-i18next'
import { Navigate, Route, Link as RouterLink, Routes } from 'react-router-dom'
Expand Down Expand Up @@ -91,7 +85,7 @@ function TabNav({
return {
position: 'relative',
boxShadow: elementKey
? `0px 0px 0px 0.5px ${theme.palette[elementKey].main} inset`
? `0px 0px 0px 1px ${theme.palette[elementKey].main} inset`
: undefined,
'&::before': {
content: '""',
Expand All @@ -101,20 +95,15 @@ function TabNav({
left: 0,
width: '100%',
height: '100%',
opacity: 0.4,
opacity: 0.3,
backgroundImage: `url(${banner})`,
backgroundPosition: 'center',
backgroundSize: 'cover',
},
}
}}
>
{!hideTitle && (
<>
<LoadoutHeader />
<Divider />
</>
)}
{!hideTitle && <LoadoutHeader elementKey={elementKey} />}
<LoadoutTabs tab={tab} isTCBuild={isTCBuild} elementKey={elementKey} />
</CardThemed>
)
Expand All @@ -138,27 +127,37 @@ function LoadoutTabs({
variant={isXs ? 'scrollable' : 'fullWidth'}
allowScrollButtonsMobile
sx={(theme) => {
const color = elementKey && theme.palette[elementKey]?.main
const colorrgb = color && hexToColor(color)
const colorrbga = (alpha = 1) =>
(colorrgb && colorToRgbaString(colorrgb, alpha)) ??
`rgba(255,255,255,${alpha})`
return {
minHeight: 0,
position: 'relative',
'& .MuiTab-root:hover': {
transition: 'background-color 0.25s ease',
backgroundColor: 'rgba(255,255,255,0.1)',
backgroundColor: colorrbga(0.1),
border: `1px solid ${colorrbga(0.8)}`,
},
'& .MuiTab-root.Mui-selected': {
color: 'white !important',
color: `${color} !important`,
},
'& .MuiTab-root': {
textShadow: '#000 0 0 10px !important',
border: `1px solid ${colorrbga(0.3)}`,
minHeight: 0,
},
'& .MuiTabs-indicator': {
backgroundColor: elementKey && theme.palette[elementKey]?.main,
backgroundColor: color,
height: '4px',
},
}
}}
>
{isTCBuild ? (
<Tab
iconPosition="start"
value="overview"
label={t('tabs.theorycraft')}
icon={<ScienceIcon />}
Expand All @@ -167,6 +166,7 @@ function LoadoutTabs({
/>
) : (
<Tab
iconPosition="start"
value="overview"
label={t('tabs.overview')}
icon={<PersonIcon />}
Expand All @@ -175,6 +175,7 @@ function LoadoutTabs({
/>
)}
<Tab
iconPosition="start"
value="talent"
label={t('tabs.talent')}
icon={<FactCheckIcon />}
Expand All @@ -183,6 +184,7 @@ function LoadoutTabs({
/>
{!isTCBuild && (
<Tab
iconPosition="start"
value="optimize"
label={t('tabs.optimize')}
icon={<TrendingUpIcon />}
Expand All @@ -192,6 +194,7 @@ function LoadoutTabs({
)}
{!isTCBuild && (
<Tab
iconPosition="start"
value="upopt"
label={t('tabs.upopt')}
icon={<UpgradeIcon />}
Expand Down
160 changes: 65 additions & 95 deletions libs/gi/page-team/src/CharacterDisplay/LoadoutHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,17 @@
import { useBoolState } from '@genshin-optimizer/common/react-util'
import { BootstrapTooltip } from '@genshin-optimizer/common/ui'
import type { ElementKey } from '@genshin-optimizer/gi/consts'
import { TeamCharacterContext, useDatabase } from '@genshin-optimizer/gi/db-ui'
import BorderColorIcon from '@mui/icons-material/BorderColor'
import CheckroomIcon from '@mui/icons-material/Checkroom'
import PersonIcon from '@mui/icons-material/Person'
import {
Box,
CardActionArea,
CardContent,
Divider,
Typography,
} from '@mui/material'
import { Box, Button, Typography } from '@mui/material'
import { useContext } from 'react'
import { useTranslation } from 'react-i18next'
import { BuildsEditorModal } from './BuildsEditorModal'
import { LoadoutEditorModal } from './LoadoutEditorModal'

export function LoadoutHeader() {
export function LoadoutHeader({ elementKey }: { elementKey: ElementKey }) {
const { teamChar, loadoutDatum } = useContext(TeamCharacterContext)
const database = useDatabase()
const { t } = useTranslation('page_team')
Expand All @@ -25,98 +20,73 @@ export function LoadoutHeader() {

return (
<Box sx={{ display: 'flex' }}>
<CardActionArea onClick={onShowLoadout}>
<BootstrapTooltip
placement="top"
title={
<Box>
<Box sx={{ display: 'flex', color: 'info.light', gap: 1 }}>
<BorderColorIcon />
<Typography>
<strong>{t('loadout.edit')}</strong>
</Typography>
</Box>
{!!teamChar.description && (
<Typography>{teamChar.description}</Typography>
)}
<BootstrapTooltip
placement="top"
title={
<Box>
<Box sx={{ display: 'flex', color: 'info.light', gap: 1 }}>
<BorderColorIcon />
<Typography>
<strong>{t('loadout.edit')}</strong>
</Typography>
</Box>
}
{!!teamChar.description && (
<Typography>{teamChar.description}</Typography>
)}
</Box>
}
>
<Button
variant="outlined"
fullWidth
startIcon={<PersonIcon />}
color={elementKey}
sx={{
borderBottomLeftRadius: 0,
borderBottomRightRadius: 0,
borderTopRightRadius: 0,
}}
onClick={onShowLoadout}
>
<CardContent
sx={{
display: 'flex',
gap: 1,
justifyContent: 'center',
position: 'relative',
'&:hover': {
color: 'info.light',
},
alignItems: 'center',
}}
>
<PersonIcon />
<Typography
variant="h6"
noWrap
sx={{
gap: 1,
alignItems: 'center',
justifyContent: 'center',
textShadow: '#000 0 0 10px !important',
}}
>
<strong>{teamChar.name}</strong>
</Typography>
</CardContent>
</BootstrapTooltip>
</CardActionArea>
<Typography variant="h6" noWrap>
{teamChar.name}
</Typography>
</Button>
</BootstrapTooltip>
<LoadoutEditorModal open={showLoadout} onClose={onCloseLoadout} />
<Divider orientation="vertical" flexItem />
<CardActionArea onClick={onShowBuild}>
<BootstrapTooltip
placement="top"
title={
<Box>
<Box sx={{ display: 'flex', color: 'info.light', gap: 1 }}>
<BorderColorIcon />
<Typography>
<strong>{t('buildInfo.editorTitle')}</strong>
</Typography>
</Box>
{!!teamChar.description && (
<Typography>{teamChar.description}</Typography>
)}
<BootstrapTooltip
placement="top"
title={
<Box>
<Box sx={{ display: 'flex', color: 'info.light', gap: 1 }}>
<BorderColorIcon />
<Typography>
<strong>{t('buildInfo.editorTitle')}</strong>
</Typography>
</Box>
}
{!!teamChar.description && (
<Typography>{teamChar.description}</Typography>
)}
</Box>
}
>
<Button
variant="outlined"
fullWidth
startIcon={<CheckroomIcon />}
color={elementKey}
sx={{
borderBottomLeftRadius: 0,
borderBottomRightRadius: 0,
borderTopLeftRadius: 0,
}}
onClick={onShowBuild}
>
<CardContent
sx={{
display: 'flex',
gap: 1,
justifyContent: 'center',
position: 'relative',
'&:hover': {
color: 'info.light',
},
alignItems: 'center',
}}
>
<CheckroomIcon />
<Typography
variant="h6"
noWrap
sx={{
gap: 1,
alignItems: 'center',
justifyContent: 'center',
textShadow: '#000 0 0 10px !important',
}}
>
{database.teams.getActiveBuildName(loadoutDatum)}
</Typography>
</CardContent>
</BootstrapTooltip>
</CardActionArea>
<Typography variant="h6" noWrap>
{database.teams.getActiveBuildName(loadoutDatum)}
</Typography>
</Button>
</BootstrapTooltip>
<BuildsEditorModal open={showBuild} onClose={onCloseBuild} />
</Box>
)
Expand Down
Loading
Loading