#220 Shanghai Metro Style Station Number #291
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,23 @@ | ||
| import React, { ChangeEvent, useMemo } from 'react'; | ||
| import { useTranslation } from 'react-i18next'; | ||
| import { | ||
| Switch, | ||
| ListItem, | ||
| ListItemIcon, | ||
| Icon, | ||
| ListItemText, | ||
| Divider, | ||
| Select, | ||
| makeStyles, | ||
| createStyles, | ||
| ListItemSecondaryAction, | ||
| Collapse, | ||
| List, | ||
| TextField, | ||
| } from '@material-ui/core'; | ||
| import { PanelTypeShmetro } from '../../constants/constants'; | ||
| import { useAppDispatch, useAppSelector } from '../../redux'; | ||
| import { setPanelType, setLineNum, setShowStationNumber, setShowStationNumberRailmap } from '../../redux/param/action'; | ||
|
|
||
| const DesignListShmetro = () => { | ||
| return ( | ||
|
|
@@ -27,30 +41,110 @@ const DesignListShmetro = () => { | |
|
|
||
| export default DesignListShmetro; | ||
|
|
||
| const useStyles = makeStyles(theme => | ||
| createStyles({ | ||
| dividerVertical: { | ||
| margin: theme.spacing(0, 2), | ||
| }, | ||
| nestedList: { | ||
| paddingLeft: theme.spacing(5), | ||
| }, | ||
| }) | ||
| ); | ||
|
|
||
| const StationNumberSHMetroLi = () => { | ||
| const { t } = useTranslation(); | ||
| const classes = useStyles(); | ||
| const dispatch = useAppDispatch(); | ||
|
|
||
| const station_number = useAppSelector(store => store.param.showStationNumber); | ||
| const station_number_railmap = useAppSelector(store => store.param.showStationNumberRailmap); | ||
| const line_number = useAppSelector(store => store.param.line_num); | ||
|
|
||
| return useMemo(() => { | ||
| const handleSwitch = (_: React.ChangeEvent<HTMLInputElement>, checked: boolean) => { | ||
| if (checked) { | ||
| dispatch(setShowStationNumber(true)); | ||
| } else { | ||
| dispatch(setShowStationNumber(false)); | ||
| } | ||
| }; | ||
|
|
||
| const handleSwitchSecondary = (_: React.ChangeEvent<HTMLInputElement>, checked: boolean) => { | ||
| if (checked) { | ||
| dispatch(setShowStationNumberRailmap(true)); | ||
| } else { | ||
| dispatch(setShowStationNumberRailmap(false)); | ||
| } | ||
| }; | ||
|
|
||
| const handleChange = ({ target: { value } }: ChangeEvent<HTMLInputElement>) => { | ||
| dispatch(setLineNum(value)); | ||
| }; | ||
|
|
||
| return ( | ||
| <> | ||
| <ListItem> | ||
| <ListItemIcon> | ||
| <Icon>account_balance_wallet</Icon> | ||
| </ListItemIcon> | ||
| <ListItemText primary={t('design.stationNumber')} /> | ||
| <ListItemSecondaryAction> | ||
| <Switch color="primary" checked={station_number !== false} onChange={handleSwitch} /> | ||
| </ListItemSecondaryAction> | ||
| </ListItem> | ||
| <Collapse in={station_number !== false} unmountOnExit> | ||
| <List component="div" disablePadding className={classes.nestedList}> | ||
| <ListItem> | ||
| <ListItemText primary={t('design.stationNumberRailmap')} /> | ||
| <ListItemSecondaryAction> | ||
| <Switch | ||
| color="primary" | ||
| checked={station_number_railmap !== false} | ||
| onChange={handleSwitchSecondary} | ||
| /> | ||
| </ListItemSecondaryAction> | ||
| </ListItem> | ||
| <ListItem> | ||
| <TextField | ||
|
There was a problem hiding this comment. Will you put a label before the line num? Just like what GTMTR did https://github.com/wongchito/RailMapGenerator/blob/rmg-3.12.3/src/panels/design/list-gzmtr.tsx#L63 There was a problem hiding this comment. ....I forget to do it because there are only one field in part 1. |
||
| placeholder={t('design.lineNum')} | ||
| defaultValue={line_number} | ||
| onChange={handleChange} | ||
| /> | ||
| </ListItem> | ||
| </List> | ||
| </Collapse> | ||
| </> | ||
| ); | ||
| }, [line_number, station_number, station_number_railmap]); | ||
| }; | ||
|
|
||
| const PanelTypeLi = () => { | ||
| const { t } = useTranslation(); | ||
| const dispatch = useAppDispatch(); | ||
|
|
||
| const panelType = useAppSelector(store => store.param.info_panel_type); | ||
| return useMemo(() => { | ||
| const handleChange = ({ target: { value } }: ChangeEvent<{ name?: string; value: unknown }>) => { | ||
| dispatch(setPanelType(value as PanelTypeShmetro)); | ||
| }; | ||
| return ( | ||
| <> | ||
| <StationNumberSHMetroLi /> | ||
| <ListItem> | ||
| <ListItemIcon> | ||
| <Icon style={{ transform: 'rotate(180deg)' }}>credit_card</Icon> | ||
| </ListItemIcon> | ||
| <ListItemText primary={t('design.panelType.button')} /> | ||
| <Select native value={panelType} onChange={handleChange} style={{ width: 166 }}> | ||
| {Object.values(PanelTypeShmetro).map(type => ( | ||
| <option key={type} value={type}> | ||
|
There was a problem hiding this comment. Have you tested default info_panel_type There was a problem hiding this comment. Oh! Sorry my test template is using sh2020. There was a problem hiding this comment. Just find a problem: Shanghai Line 10 removed all station number on railmap in the 2012 style (which is the current style (without platform number version) that RMG uses) update although the station number still remain on Running-in): Which now looks like this (the 2020 style also used the normal railmap without station number) (source: https://zhuanlan.zhihu.com/p/57368457) There was a problem hiding this comment. @52PD Yes, this is the reason why station number in There was a problem hiding this comment. I am going to rewrite it for v5. Thinks that we can make There was a problem hiding this comment. I'm still insisting that |
||
| {t('design.panelType.' + type)} | ||
| </option> | ||
| ))} | ||
| </Select> | ||
| </ListItem> | ||
| </> | ||
| ); | ||
| }, [panelType, t, dispatch]); | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As we said before, no need for another class style,
.rmg-name__enwould be fine for numbers.