Skip to content

Commit 8dd2078

Browse files
hjvuorhjvuor
committed
rename multidisplay to doubleview in code
1 parent c2329fd commit 8dd2078

10 files changed

Lines changed: 43 additions & 47 deletions

‎src/ui/Monitor.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const Monitor: FC<IProps> = ({
5656
getWindowDimensions(),
5757
);
5858
const {
59-
isMultiDisplay,
59+
isDoubleView,
6060
fontSizeDivider,
6161
tightenedFontSizeDivider,
6262
previewFontSize,
@@ -161,7 +161,7 @@ const Monitor: FC<IProps> = ({
161161
>
162162
{!isPreview && <MonitorOverlay show={showOverlay} />}
163163
<MonitorTitlebar
164-
isMultiDisplay={isMultiDisplay}
164+
isDoubleView={isDoubleView}
165165
isLandscape={isLandscapeByLayout}
166166
preview={isPreview}
167167
view={view}

‎src/ui/MonitorRowContainer.tsx‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ const formatSingleColumnData = (
7979
return { rows, date, departuresIndex };
8080
};
8181

82-
// Processess rows for a monitor containing a single stop display
83-
const formatSingleDisplayData = (
82+
// Processess rows for a monitor containing a single stop view
83+
const formatSingleViewData = (
8484
departures: IDeparture[],
8585
leftColumnSize: number,
8686
rightColumnSize: number,
@@ -102,8 +102,8 @@ const formatSingleDisplayData = (
102102
return { leftRows, rightRows };
103103
};
104104

105-
// Processes rows for a multi display monitor (where right side has dedicated departures)
106-
const formatMultiDisplayData = (
105+
// Processes rows for a double view monitor (where right side has dedicated departures)
106+
const formatDoubleViewData = (
107107
departuresLeft: IDeparture[],
108108
departuresRight: IDeparture[],
109109
leftColumnSize: number,
@@ -145,7 +145,7 @@ const MonitorRowContainer: FC<IProps> = ({
145145
}) => {
146146
const [t] = useTranslation();
147147
const DATE_FORMAT = 'dd.MM.yyyy HH:mm';
148-
const { leftColumnCount, rightColumnCount, isMultiDisplay, tighten } =
148+
const { leftColumnCount, rightColumnCount, isDoubleView, tighten } =
149149
getLayout(layout);
150150

151151
const isTighten = tighten !== undefined;
@@ -163,16 +163,15 @@ const MonitorRowContainer: FC<IProps> = ({
163163
if (alertComponent && layout < 12) {
164164
leftColumnCountWithAlerts -= alertRowSpan;
165165
}
166-
167-
const { leftRows, rightRows } = isMultiDisplay
168-
? formatMultiDisplayData(
166+
const { leftRows, rightRows } = isDoubleView
167+
? formatDoubleViewData(
169168
departuresLeft,
170169
departuresRight,
171170
leftColumnCountWithAlerts,
172171
rightColumnCount,
173172
currentLang,
174173
)
175-
: formatSingleDisplayData(
174+
: formatSingleViewData(
176175
departuresLeft,
177176
leftColumnCountWithAlerts,
178177
rightColumnCount,
@@ -373,10 +372,7 @@ const MonitorRowContainer: FC<IProps> = ({
373372
<div className="divider" />
374373
{true && (
375374
<div className={cx('grid', { 'two-cols': withTwoColumns })}>
376-
{headers(
377-
rightColumnCount,
378-
isMultiDisplay ? rightStops : leftStops,
379-
)}
375+
{headers(rightColumnCount, isDoubleView ? rightStops : leftStops)}
380376
<div
381377
className={cx('grid-rows', `rows${rightColumnCount}`, {
382378
'two-cols': withTwoColumns,

‎src/ui/MonitorTitleBar.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import cx from 'classnames';
1010

1111
interface IProps {
1212
preview: boolean;
13-
isMultiDisplay?: boolean;
13+
isDoubleView?: boolean;
1414
isLandscape?: boolean;
1515
view: IView;
1616
currentLang: string;
@@ -19,7 +19,7 @@ interface IProps {
1919
const MonitorTitlebar: FC<IProps> = ({
2020
view,
2121
preview,
22-
isMultiDisplay = false,
22+
isDoubleView: isDoubleView = false,
2323
isLandscape = false,
2424
currentLang,
2525
}) => {
@@ -32,7 +32,7 @@ const MonitorTitlebar: FC<IProps> = ({
3232
? view.stops[0].coords[1]
3333
: view.columns.left.stops[0]?.lon;
3434

35-
const showWeather = !isMultiDisplay && isLandscape && lat && lon;
35+
const showWeather = !isDoubleView && isLandscape && lat && lon;
3636

3737
let temperature;
3838
let weatherIconString;
@@ -84,10 +84,10 @@ const MonitorTitlebar: FC<IProps> = ({
8484
<Titlebar
8585
isPreview={preview}
8686
isLandscape={isLandscape}
87-
isMultiDisplay={isMultiDisplay}
87+
isDoubleView={isDoubleView}
8888
>
8989
<Logo isPreview={preview} isLandscape={isLandscape} forMonitor={true} />
90-
{!isMultiDisplay && (
90+
{!isDoubleView && (
9191
<div
9292
className={cx('title-text', {
9393
preview: preview,
@@ -97,7 +97,7 @@ const MonitorTitlebar: FC<IProps> = ({
9797
{view.title[currentLang]}
9898
</div>
9999
)}
100-
{isMultiDisplay && (
100+
{isDoubleView && (
101101
<div className="multi-display-titles">
102102
<div className={cx('left-title', { preview: preview })}>
103103
{view.columns.left.title[currentLang]}

‎src/ui/StopCardListContainer.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,8 @@ const StopCardListContainer: FC<IProps> = ({
216216
const updateLayout = (cardId: number, value: number) => {
217217
const cardIndex = stopCardList.findIndex(card => card.id === cardId);
218218
if (
219-
getLayout(stopCardList[cardIndex].layout).isMultiDisplay &&
220-
!getLayout(+value).isMultiDisplay
219+
getLayout(stopCardList[cardIndex].layout).isDoubleView &&
220+
!getLayout(+value).isDoubleView
221221
) {
222222
stopCardList[cardIndex].columns.left.stops = stopCardList[
223223
cardIndex
@@ -346,8 +346,8 @@ const StopCardListContainer: FC<IProps> = ({
346346
if (ismap) {
347347
return false;
348348
}
349-
const isMultiDisplay = getLayout(stopCard.layout).isMultiDisplay;
350-
return !isMultiDisplay
349+
const isDoubleView = getLayout(stopCard.layout).isDoubleView;
350+
return !isDoubleView
351351
? stopCard.columns.left.stops.length === 0
352352
: stopCard.columns.left.stops.length === 0 ||
353353
stopCard.columns.right.stops.length === 0;

‎src/ui/StopListContainer.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ const StopListContainer: FC<Props> = ({
4646
setStops,
4747
}) => {
4848
const [t] = useTranslation();
49-
const showStopTitles = getLayout(card.layout).isMultiDisplay;
49+
const showStopTitles = getLayout(card.layout).isDoubleView;
5050
const leftItems = card.columns.left.stops;
5151
const rightItems = card.columns.right.stops;
5252
return (

‎src/ui/StopRow.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ const StopRow: FC<IProps> = ({
8989
const isDefaultSettings =
9090
isEqual(defaultSettings, stop.settings) || !stop.settings;
9191

92-
const moveBetweenColumns = getLayout(stop.layout).isMultiDisplay;
92+
const moveBetweenColumns = getLayout(stop.layout).isDoubleView;
9393
const alternateIcon = config.modeIcons.postfix;
9494
return (
9595
<div className="stop-row-container">
@@ -154,7 +154,7 @@ const StopRow: FC<IProps> = ({
154154
>
155155
<Icon img="delete" color={config.colors.primary} />
156156
</div>
157-
{getLayout(stop.layout).isMultiDisplay && (
157+
{getLayout(stop.layout).isDoubleView && (
158158
<div
159159
className="stop-row-move icon"
160160
tabIndex={0}

‎src/ui/StopViewTitleEditor.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const StopViewTitleEditor: FC<IProps> = ({
2929
}) => {
3030
const { index, layout, id, title } = card;
3131
const [t] = useTranslation();
32-
const { isMultiDisplay } = getLayout(layout);
32+
const { isDoubleView } = getLayout(layout);
3333

3434
const layoutTitle = t('layout-double');
3535
const onChange = title => {
@@ -41,10 +41,10 @@ const StopViewTitleEditor: FC<IProps> = ({
4141
return (
4242
<div className="stop-title">
4343
<p className="description">
44-
{isMultiDisplay ? t('layout') : titleDescription}
44+
{isDoubleView ? t('layout') : titleDescription}
4545
</p>
4646
<div className="stop-title-input-container">
47-
{!isMultiDisplay && (
47+
{!isDoubleView && (
4848
<InputWithEditIcon
4949
onChange={onChange}
5050
id={inputID}
@@ -58,7 +58,7 @@ const StopViewTitleEditor: FC<IProps> = ({
5858
})} ${t(`language-name-${lang}`)}`}
5959
/>
6060
)}
61-
{isMultiDisplay && (
61+
{isDoubleView && (
6262
<input
6363
className={cx('monitor-input', 'double')}
6464
id={inputID}

‎src/ui/Titlebar.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ $preview-container-height: 365px;
1212
height: 15vh;
1313
margin: 0 2%;
1414

15-
&.multiDisplay { /* stylelint-disable-line */
15+
&.doubleView { /* stylelint-disable-line */
1616
grid-template-columns: 14vw 1fr 14vw;
1717
}
1818

@@ -75,7 +75,7 @@ $preview-container-height: 365px;
7575
height: 55px;
7676
grid-template-columns: calc(0.14 * #{$preview-container-width}) auto calc(0.073 * #{$preview-container-width}) calc(0.14 * #{$preview-container-width});
7777

78-
&.multiDisplay { /* stylelint-disable-line */
78+
&.doubleView { /* stylelint-disable-line */
7979
grid-template-columns: calc(0.14 * #{$preview-container-width}) auto calc(0.14 * #{$preview-container-width});
8080
}
8181

‎src/ui/Titlebar.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@ import cx from 'classnames';
33
export interface ITitlebarProps {
44
readonly isPreview?: boolean;
55
readonly isLandscape?: boolean;
6-
readonly isMultiDisplay?: boolean;
6+
readonly isDoubleView?: boolean;
77
readonly children?: React.ReactNode;
88
}
99

1010
const Titlebar: FC<ITitlebarProps> = ({
1111
isPreview,
1212
isLandscape,
13-
isMultiDisplay,
13+
isDoubleView,
1414
children,
1515
}) => {
1616
return (
1717
<div
1818
className={cx('title-bar', {
1919
preview: isPreview,
2020
portrait: !isLandscape,
21-
multiDisplay: isMultiDisplay,
21+
doubleView: isDoubleView,
2222
})}
2323
>
2424
{children}

‎src/util/getResources.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
interface ILayout {
22
leftColumnCount: number;
33
rightColumnCount: number;
4-
isMultiDisplay?: boolean;
4+
isDoubleView?: boolean;
55
isPortrait?: boolean;
66
tighten?: Array<number>;
77
alertSpan?: number;
@@ -65,28 +65,28 @@ export const getLayout = (layout: number): ILayout => {
6565
return {
6666
leftColumnCount: 4,
6767
rightColumnCount: 4,
68-
isMultiDisplay: true,
68+
isDoubleView: true,
6969
alertSpan: 1,
7070
};
7171
case 10:
7272
return {
7373
leftColumnCount: 8,
7474
rightColumnCount: 8,
75-
isMultiDisplay: true,
75+
isDoubleView: true,
7676
alertSpan: 2,
7777
};
7878
case 11:
7979
return {
8080
leftColumnCount: 12,
8181
rightColumnCount: 12,
82-
isMultiDisplay: true,
82+
isDoubleView: true,
8383
alertSpan: 3,
8484
};
8585
case 12:
8686
return {
8787
leftColumnCount: 8,
8888
rightColumnCount: 0,
89-
isMultiDisplay: false,
89+
isDoubleView: false,
9090
isPortrait: true,
9191
alertSpan: 1,
9292
fontSizeDivider: 15,
@@ -96,7 +96,7 @@ export const getLayout = (layout: number): ILayout => {
9696
return {
9797
leftColumnCount: 12,
9898
rightColumnCount: 0,
99-
isMultiDisplay: false,
99+
isDoubleView: false,
100100
isPortrait: true,
101101
alertSpan: 1,
102102
fontSizeDivider: 18,
@@ -106,7 +106,7 @@ export const getLayout = (layout: number): ILayout => {
106106
return {
107107
leftColumnCount: 16,
108108
rightColumnCount: 0,
109-
isMultiDisplay: false,
109+
isDoubleView: false,
110110
isPortrait: true,
111111
alertSpan: 1,
112112
fontSizeDivider: 18,
@@ -116,7 +116,7 @@ export const getLayout = (layout: number): ILayout => {
116116
return {
117117
leftColumnCount: 24,
118118
rightColumnCount: 0,
119-
isMultiDisplay: false,
119+
isDoubleView: false,
120120
isPortrait: true,
121121
alertSpan: 1,
122122
fontSizeDivider: 26,
@@ -126,7 +126,7 @@ export const getLayout = (layout: number): ILayout => {
126126
return {
127127
leftColumnCount: 10,
128128
rightColumnCount: 0,
129-
isMultiDisplay: false,
129+
isDoubleView: false,
130130
isPortrait: true,
131131
tighten: [4, 6],
132132
alertSpan: 1,
@@ -138,7 +138,7 @@ export const getLayout = (layout: number): ILayout => {
138138
return {
139139
leftColumnCount: 18,
140140
rightColumnCount: 0,
141-
isMultiDisplay: false,
141+
isDoubleView: false,
142142
isPortrait: true,
143143
tighten: [6, 12],
144144
alertSpan: 1,

0 commit comments

Comments
 (0)