Skip to content

Commit

Permalink
fix: change shipyard icons
Browse files Browse the repository at this point in the history
  • Loading branch information
Nagarian committed Dec 22, 2024
1 parent 6127f2c commit 3379e0a
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 10 deletions.
4 changes: 4 additions & 0 deletions src/components/Icon/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ import SearchBuilder from './searchbuilder.svg?react'
import Settings from './settings.svg?react'
import Share from './share.svg?react'
import Shipyard from './shipyard.svg?react'
import ShipyardBottleSvg from './shipyard-bottle.svg'
import ShipyardBottle from './shipyard-bottle.svg?react'
import ShipyardFull from './shipyard-full.svg?react'
import Show from './show.svg?react'
import SkillBook from './skillbook.svg?react'
import SpecialLvl from './special.png'
Expand Down Expand Up @@ -110,6 +112,7 @@ export {
LevelSvg,
LuckSvg,
PirateFestSvg,
ShipyardBottleSvg,
SpecialLvl,
SpecialSvg,
SupportSvg,
Expand Down Expand Up @@ -186,6 +189,7 @@ export const SettingsIcon: Icon = BaseSvg.withComponent(Settings)
export const SearchIcon: Icon = BaseSvg.withComponent(Search)
export const ShareIcon: Icon = BaseSvg.withComponent(Share)
export const ShipyardIcon: Icon = BaseSvg.withComponent(Shipyard)
export const ShipyardFullIcon: Icon = BaseSvg.withComponent(ShipyardFull)
export const ShipyardBottleIcon: Icon = BaseSvg.withComponent(ShipyardBottle)
export const ShowIcon: Icon = BaseSvg.withComponent(Show)
export const SkillBookIcon: Icon = BaseSvg.withComponent(SkillBook)
Expand Down
2 changes: 1 addition & 1 deletion src/components/Icon/shipyard-bottle.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/components/forms/ShipLevelInput.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useTheme } from '@emotion/react'
import { LevelSvg } from 'components/Icon'
import { ShipyardBottleSvg } from 'components/Icon'
import { ShipMedal } from 'components/ShipMedal'
import { UserShipModification } from 'models/shipBox'
import { InputLabel } from 'pages/Detail/components'
Expand Down Expand Up @@ -45,7 +45,7 @@ export function ShipLevelInput({
value={value[type].value}
onChange={v => onChange(updateModification(value, type, v))}
adders={[-1, 1, 5, 30, 50, 100]}
thumbSvg={LevelSvg}
thumbSvg={ShipyardBottleSvg}
range={{
color: color ?? theme.colors.primaryText,
}}
Expand Down
6 changes: 3 additions & 3 deletions src/pages/ShipDetail/components/ShipEventDisplayer.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useTheme } from '@emotion/react'
import { ExpansionPanel } from 'components/ExpansionPanel'
import { RangeInput } from 'components/forms/RangeInput'
import { PirateFestIcon, PirateFestSvg } from 'components/Icon'
import { NewsCooIcon, ShipyardBottleSvg } from 'components/Icon'
import { ShipEventLevel, ShipLevel } from 'models/ships'
import { InputLabel } from 'pages/Detail/components'
import { useMemo, useState } from 'react'
Expand Down Expand Up @@ -38,7 +38,7 @@ export function ShipEventDisplayer({
}

return (
<ExpansionPanel title="Event override" icon={PirateFestIcon}>
<ExpansionPanel title="Event override" icon={NewsCooIcon}>
<InputLabel
value={lvl}
max={levels.length + eventLevels.length}
Expand All @@ -51,7 +51,7 @@ export function ShipEventDisplayer({
onChange={e => setLvl(e.currentTarget.valueAsNumber)}
min={1}
max={all.length}
thumbSvg={PirateFestSvg}
thumbSvg={ShipyardBottleSvg}
range={{
color: theme.colors.primaryText,
}}
Expand Down
4 changes: 2 additions & 2 deletions src/pages/ShipDetail/components/ShipLevelEdit/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'rc-slider/assets/index.css'
import { useTheme } from '@emotion/react'
import { Box } from 'components/Box'
import { ExpansionPanel } from 'components/ExpansionPanel'
import { SpecialLvlIcon } from 'components/Icon'
import { ShipyardBottleIcon, SpecialLvlIcon } from 'components/Icon'
import { Image } from 'components/Image'
import { Text } from 'components/Title'
import { UserShip } from 'models/shipBox'
Expand Down Expand Up @@ -78,7 +78,7 @@ export function ShipLevelEdit({ userShip, onChange }: ShipLevelEditProps) {
)

return (
<ExpansionPanel title="Ship level" icon={SpecialLvlIcon}>
<ExpansionPanel title="Ship level" icon={ShipyardBottleIcon}>
<InputLabel
value={lvl}
max={levels.length}
Expand Down
4 changes: 2 additions & 2 deletions src/pages/ShipDetail/components/ShipModificationEdit.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Box } from 'components/Box'
import { DescriptionHighlighter } from 'components/DescriptionHighlighter'
import { ExpansionPanel } from 'components/ExpansionPanel'
import { ShipLevelInput } from 'components/forms/ShipLevelInput'
import { SpecialLvlIcon } from 'components/Icon'
import { ShipyardFullIcon } from 'components/Icon'
import { SubTitle } from 'components/Title'
import { UserShip } from 'models/shipBox'
import { useMemo } from 'react'
Expand Down Expand Up @@ -43,7 +43,7 @@ export function ShipModificationEdit({
const { skillsLvl } = modification

return (
<ExpansionPanel title="Modification rank" icon={SpecialLvlIcon}>
<ExpansionPanel title="Modification rank" icon={ShipyardFullIcon}>
{obtained && level < levels.length && (
<SubTitle color="red" pt="3" pb="2">
You need to first upgrade your ship to its last level to be able to
Expand Down

0 comments on commit 3379e0a

Please sign in to comment.