Merge pull request #10 from izawartka/light-mode

Light mode

src/components/App.css

@@ -1,6 +1,6 @@
 body {
-    background-color: #141414;
+    background-color: var(--background-color);
-    color: #eee;
+    color: var(--text-color);
     font-family: monospace;
 }
 
@@ -29,10 +29,10 @@ button,
 select {
     font-size: inherit;
     font-family: inherit;
-    background: #fff2;
+    background: var(--layer-color);
     border-radius: 8px;
     border: none;
-    color: #eee;
+    color: var(--text-color);
     padding-inline: 8px;
     padding-block: 4px;
     outline: none;
@@ -43,27 +43,27 @@ input[type="file"].non-transparent::file-selector-button,
 input[type="text"].non-transparent,
 button.non-transparent,
 select.non-transparent {
-    background: #222;
+    background: var(--layer-color-non-transparent);
-    border: 2px solid #444;
+    border: 2px solid var(--border-color);
 }
 
 input[type="file"]::file-selector-button:hover,
 button:hover,
 select:hover {
-    background: #fff3;
+    background: var(--layer-color-hover);
 }
 
 input[type="file"].non-transparent::file-selector-button:hover,
 button.non-transparent:hover,
 select.non-transparent:hover {
-    background: #444;
+    background: var(--layer-color-non-transparent-hover);
 }
 
 input[type="file"]:disabled::file-selector-button,
 button:disabled,
 select:disabled {
-    background: #fff1;
+    background: var(--layer-color-disabled);
-    color: #666;
+    color: var(--text-color-disabled);
     cursor: not-allowed;
 }
 
@@ -71,8 +71,8 @@ select:disabled {
 input[type="file"].non-transparent:disabled::file-selector-button,
 button.non-transparent:disabled,
 select.non-transparent:disabled {
-    background: #222;
+    background: var(--layer-color-non-transparent-disabled);
-    color: #666;
+    color: var(--text-color-disabled);
     cursor: not-allowed;
 }
 
@@ -83,17 +83,17 @@ button {
 }
 
 select > option {
-    background: #141414;
+    background: var(--background-color);
-    color: #eee;
+    color: var(--text-color);
 }
 
 input[type="text"] {
     background-color: unset;
-    border: 2px solid #fff2;
+    border: 2px solid var(--layer-color);
 }
 
 input[type="text"]:focus {
-    border: 2px solid #fff3;
+    border: 2px solid var(--layer-color-hover);
 }
 
 .invis-button {
@@ -111,17 +111,17 @@ input[type="text"]:focus {
 }
 
 ::-webkit-scrollbar-track {
-    background-color: #141414;
+    background-color: var(--background-color);
     border-radius: 5px;
 }
 
 ::-webkit-scrollbar-thumb {
-    background-color: #fff2;
+    background-color: var(--layer-color);
     border-radius: 5px;
 }
 
 ::-webkit-scrollbar-thumb:hover {
-    background-color: #fff3;
+    background-color: var(--layer-color-hover);
 }
 
 ::-webkit-scrollbar {

src/components/App.js

@@ -1,7 +1,6 @@
 import { useState } from 'react';
 import Map from './map/Map';
 import Toolbar from './toolbar/Toolbar';
-import './App.css';
 import SideMenu from './sidemenu/SideMenu';
 import SettingsManager from './SettingsManager';
 import LocList from './loclist/LocList';
@@ -10,23 +9,28 @@ import DistanceMeterContext from '../contexts/DistanceMeterContext';
 import {GradientsManager} from "./GradientsManager";
 import SideMenuContext from '../contexts/SideMenuContext';
 import SceneryManager from './SceneryManager';
+import ThemeManager from './ThemeManager';
+import './Themes.css';
+import './App.css';
 
 function App() {
     const [sideMenuOpen, setSideMenuOpen] = useState(false);
     const [distancePoints, setDistancePoints] = useState(null);
 
     return (
-        <SettingsManager>
+        <ThemeManager>
-            <SceneryManager>
+            <SettingsManager>
-                <GradientsManager>
+                <SceneryManager>
-                    <DistanceMeterContext.Provider value={{distancePoints, setDistancePoints}}>
+                    <GradientsManager>
-                        <SideMenuContext.Provider value={{sideMenuOpen, setSideMenuOpen}}>
+                        <DistanceMeterContext.Provider value={{distancePoints, setDistancePoints}}>
-                            <AppContent />
+                            <SideMenuContext.Provider value={{sideMenuOpen, setSideMenuOpen}}>
-                        </SideMenuContext.Provider>
+                                <AppContent />
-                    </DistanceMeterContext.Provider>
+                            </SideMenuContext.Provider>
-                </GradientsManager>
+                        </DistanceMeterContext.Provider>
-            </SceneryManager>
+                    </GradientsManager>
-        </SettingsManager>
+                </SceneryManager>
+            </SettingsManager>
+        </ThemeManager>
     );
 }
 

src/components/ThemeManager.js

@@ -0,0 +1,20 @@
+import { useState } from "react";
+import ThemeContext from "../contexts/ThemeContext";
+
+export default function ThemeManager(props) {
+    const [ lightMode, setLightMode ] = useState(false);
+
+    if(lightMode === true) {
+        document.body.classList.add('light-mode');
+    } else {
+        document.body.classList.remove('light-mode');
+    }
+
+    return (
+        <ThemeContext.Provider value={{
+            lightMode, setLightMode
+        }}>
+            { props.children }
+        </ThemeContext.Provider>
+    );
+}

src/components/Themes.css

@@ -0,0 +1,57 @@
+:root {
+    --background-color: #141414;
+    --text-color: #eee;
+    --half-layer-color: #fff1;
+    --layer-color: #fff2;
+    --layer-color-hover: #fff3;
+    --layer-color-disabled: #fff1;
+    --layer-color-non-transparent: #222;
+    --layer-color-non-transparent-hover: #444;
+    --layer-color-non-transparent-disabled: #222;
+    --text-color-disabled: #888;
+    --border-color: #444;
+    --text-color-inverted: #141414;
+    --icon-color: #aaa;
+    --icon-color-active: #fff;
+    --map-background-color: #111;
+    --map-shadow-color: #000;
+    --map-icon-color: #eee;
+    --map-text-color: #eee;
+    --map-platform-color: #444;
+    --map-track-color: #aaa;
+    --map-track-color-invisible: #555;
+    --map-track-color-electrified: #aaf;
+    --dialog-background-color: #222;
+    --parser-log-background-color: #0004;
+    --parser-log-warn-color: #aa4;
+    --parser-log-error-color: #f44;
+}
+
+.light-mode {
+    --background-color: #f8f8f8;
+    --text-color: #222;
+    --layer-color: #0002;
+    --half-layer-color: #0001;
+    --layer-color-hover: #0003;
+    --layer-color-disabled: #0001;
+    --layer-color-non-transparent: #ddd;
+    --layer-color-non-transparent-hover: #ccc;
+    --layer-color-non-transparent-disabled: #888;
+    --text-color-disabled: #666;
+    --border-color: #888;
+    --text-color-inverted: #eee;
+    --icon-color: #222;
+    --icon-color-active: #888;
+    --map-background-color: #fff;
+    --map-shadow-color: #fff8;
+    --map-icon-color: #111;
+    --map-text-color: #111;
+    --map-platform-color: #aaa;
+    --map-track-color: #555;
+    --map-track-color-invisible: #999;
+    --map-track-color-electrified: #33b;
+    --dialog-background-color: #ddd;
+    --parser-log-background-color: #0001;
+    --parser-log-warn-color: #774;
+    --parser-log-error-color: #f44;
+}

src/components/dialog/Dialog.css

@@ -8,13 +8,13 @@
     width: 100vw;
     height: 100vh;
     z-index: 100;
-    background-color: rgba(0, 0, 0, 0.25);
+    background-color: rgba(0, 0, 0, 0.33);
 }
 
 .dialog {
     display: block;
-    background-color: #222;
+    background-color: var(--background-color);
-    border: 2px solid #444;
+    border: 2px solid var(--border-color);
     border-radius: 8px;
     margin: 0 auto;
     padding: 1em;
@@ -34,7 +34,7 @@
 
 .dialog-title {
     margin-bottom: 2em;
-    color: #888;
+    color: var(--text-color-disabled);
     font-weight: bold;
 }
 

src/components/map/Map.css

@@ -3,7 +3,7 @@
     display: flex;
     flex-wrap: wrap;
     flex-direction: column;
-    background-color: #111;
+    background-color: var(--map-background-color);
 }
 
 .map svg path.track {
@@ -19,9 +19,13 @@
 
 .map text {
     font-size: 2px;
-    fill: #eee;
+    fill: var(--map-text-color);
     stroke: none;
-    text-shadow: 0 0 16px #000;
+    text-shadow: 0 0 16px var(--map-shadow-color);
+}
+
+.map .sign-text {
+    text-shadow: none;
 }
 
 .map .switch-name-text {
@@ -46,11 +50,11 @@
 }
 
 .map g.track-object circle {
-    fill: #eee;
+    fill: var(--map-icon-color);
 }
 
 .map g.track-object text {
-    fill: #eee;
+    fill: var(--map-text-color);
     display: none;
 }
 
@@ -59,7 +63,7 @@
 }
 
 .map g.platform rect {
-    fill: #444;
+    fill: var(--map-platform-color);
 }
 
 .map g.map-icon-stroked path,
@@ -67,25 +71,25 @@
 .map g.map-icon-stroked line,
 .map g.map-icon-stroked rect {
     fill: none;
-    stroke: #eee;
+    stroke: var(--map-icon-color);
 }
 
 .map g.map-icon path,
 .map g.map-icon circle,
 .map g.map-icon line,
 .map g.map-icon rect {
-    fill: #eee;
+    fill: var(--map-icon-color);
     stroke: none;
 }
 
 .map g.map-icon-stroked .background,
 .map g.map-icon .background {
-    fill: #111;
+    fill: var(--map-background-color);
     stroke: none;
 }
 
 .map g.map-icon-stroked .with-background,
 .map g.map-icon .with-background {
-    fill: #111;
+    fill: var(--map-background-color);
-    stroke: #eee;
+    stroke: var(--map-icon-color);
 }

src/components/map/object-renderers/SignRenderer.js

@@ -40,7 +40,7 @@ function SignTextRenderer(props) {
 
     return (
         <text
-            className="sign-data-text"
+            className="sign-text"
             transform={`translate(${x}, ${y})`}
             style={{ fontSize: `${object.def.textSize}mm` }}
             textAnchor="middle"

src/components/map/object-renderers/SignalExtendedRenderer.js

@@ -262,7 +262,7 @@ function SignalSignText(id, text, y) {
 
     return <text
         key={`${id}-text`}
-        className="signal-sign-text"
+        className="sign-text"
         transform={`translate(${def.textOffsetX || 0}, ${y + (def.textOffsetY || 0)})`}
         style={{ fontSize: `${def.textSize || C.SIGN_DEFAULT_FONT_SIZE}mm` }}
         textAnchor="middle"

src/components/map/track-hover-info/TrackHoverInfo.css

@@ -6,8 +6,8 @@
 }
 
 .track-hover-info-popup {
-    background-color: #222;
+    background-color: var(--background-color);
-    border: 2px solid #444;
+    border: 2px solid var(--border-color);
     border-radius: 8px;
     padding: 1em;
 }
@@ -24,13 +24,13 @@
 .track-hover-info-popup th {
     text-align: start;
     padding-right: 2em;
-    color: #888;
+    color: var(--text-color-disabled);
 }
 
 .track-hover-info-popup__align {
     margin-top: 1.5em;
     padding: 2px;
-    color: #888;
+    color: var(--text-color-disabled);
 }
 
 .track-hover-info-popup .track-hover-info-popup-label {

src/components/scenery-info-dialog/SceneryInfoDialog.css

@@ -1,12 +1,12 @@
 .scenery-info-view td.label {
     font-weight: bold;
-    color: #aaa;
+    color: var(--text-color-disabled);
     vertical-align: baseline;
     padding-right: 1em;
 }
 
 .scenery-info-view td.value a {
-    color: #eee;
+    color: var(--text-color);
     text-decoration: none;
 }
 

src/components/scenery-loaded-dialog/SceneryParserLogView.css

@@ -1,8 +1,8 @@
 .scenery-parser-log-view {
     padding: 1em;
     border-radius: 8px;
-    border: 2px solid #444;
+    background-color: var(--half-layer-color);
-    background-color: #0004;
+    border: 2px solid var(--border-color);
 }
 
 .scenery-parser-log-view ul {
@@ -14,9 +14,9 @@
 }
 
 .scenery-parser-log-view .log-entry.warn {
-    color: #aa4;
+    color: var(--parser-log-warn-color);
 }
 
 .scenery-parser-log-view .log-entry.error {
-    color: #f44;
+    color: var(--parser-log-error-color);
 }

src/components/sidemenu/SideMenu.css

@@ -3,14 +3,14 @@
 }
 
 .side-menu {
-    border-left: 2px solid #444;
+    border-left: 2px solid var(--border-color);
     padding: 1em;
     position: absolute;
     right: 0;
     top: 0;
     bottom: 0;
-    background-color: #141414;
+    background-color: var(--background-color);
-    z-index: 2000;
+    z-index: 50;
     width: max-content;
     transition: transform 0.2s ease-in-out;
     display: flex;
@@ -71,7 +71,7 @@
 }
 
 .info-footer {
-    color: #888;
+    color: var(--text-color-disabled);
     display: flex;
     flex-direction: column;
     flex-wrap: nowrap;

src/components/sidemenu/track-color-mode/TrackColorMode.css

@@ -28,7 +28,7 @@
     flex-direction: column;
     gap: 1em;
     padding: 1em;
-    background-color: #fff1;
+    background-color: var(--half-layer-color);
     border-radius: 8px;
 }
 

src/components/toolbar/ThemeToggle.js

@@ -0,0 +1,19 @@
+import { useContext } from 'react';
+import { LightModeIcon, DarkModeIcon } from '../../icons';
+import ThemeContext from '../../contexts/ThemeContext';
+
+export default function ThemeToggle() {
+    const { setLightMode, lightMode } = useContext(ThemeContext);
+
+    const toggleLightMode = () => {
+        setLightMode((prev) => !prev);
+    }
+
+    return (
+        <div className='theme-toggle'>
+            <button onClick={toggleLightMode} className='invis-button'>
+                {lightMode ? <LightModeIcon /> : <DarkModeIcon />}
+            </button>
+        </div>
+    );
+}

src/components/toolbar/Toolbar.css

@@ -5,7 +5,7 @@
     align-items: center;
     gap: 10px;
     padding: 10px;
-    border-bottom: 2px solid #444;
+    border-bottom: 2px solid var(--border-color);
 }
 
 .toolbar-spacer {
@@ -29,11 +29,11 @@
 .loading-indicator {
     height: fit-content;
     padding: 4px 8px;
-    color: #141414;
+    color: var(--text-color-inverted);
     text-align: center;
     opacity: 0;
     transition: opacity 1s ease-in-out;
-    z-index: 1000;
+    z-index: 49;
     position: relative;
 }
 
@@ -48,16 +48,19 @@
     animation: fadeOut 1s ease-in-out 2s forwards; /* Start fading out after 2 seconds */
 }
 
+.theme-toggle svg,
 .side-menu-toggle svg {
     display: block;
     height: 2rem;
     width: 2rem;
 }
 
+.theme-toggle g,
 .side-menu-toggle g {
-    stroke: #aaa;
+    stroke: var(--icon-color);
 }
 
+.theme-toggle:hover g,
 .side-menu-toggle:hover g {
-    stroke: #fff;
+    stroke: var(--icon-color-active);
 }

src/components/toolbar/Toolbar.js

@@ -4,6 +4,7 @@ import CustomFileSelect from './CustomFileSelect';
 import SideMenuToggle from './SideMenuToggle';
 import SceneryList from './SceneryList';
 import ElectrificationStepMode from './ElectrificationStepMode';
+import ThemeToggle from './ThemeToggle';
 
 export default function Toolbar() {
     return (
@@ -14,6 +15,7 @@ export default function Toolbar() {
                 <CustomFileSelect />
                 <ElectrificationStepMode />
                 <div className='toolbar-spacer'></div>
+                <ThemeToggle />
                 <SideMenuToggle />
             </div>
             <div className='loading-indicator-cont'>

src/contexts/ThemeContext.js

@@ -0,0 +1,4 @@
+import { createContext } from 'react';
+
+const ThemeContext = createContext();
+export default ThemeContext;

src/helpers/constants.js

@@ -138,16 +138,16 @@ const Constants = {
             name: 'Standard',
             optionDefault: 'default',
             options: {
-                'default': ['#aaa', 'Standard track'],
+                'default': ['var(--map-track-color)', 'Standard track'],
-                'invisible': ['#444', 'Invisible track'],
+                'invisible': ['var(--map-track-color-invisible)', 'Invisible track'],
             }
         },
         'electrification': {
             name: 'Electrification',
             optionDefault: 'conflict',
             options: {
-                'electrified': ['#aaf', 'Electrified'],
+                'electrified': ['var(--map-track-color-electrified)', 'Electrified'],
-                'non-electrified': ['#aaa', 'Non-electrified'],
+                'non-electrified': ['var(--map-track-color)', 'Non-electrified'],
                 'not-checked': ['#aa4', 'Unknown'],
                 'conflict': ['#f44', 'Error / Conflict'],
             }

src/icons/index.js

@@ -1,4 +1,6 @@
 /* Toolbar Icons */
+export { DarkModeIcon } from "./toolbar/dark-mode";
+export { LightModeIcon } from "./toolbar/light-mode";
 export { SideMenuIcon } from "./toolbar/side-menu";
 
 /* TrackHoverInfo Icons */

src/icons/toolbar/dark-mode.js

@@ -0,0 +1,7 @@
+export const DarkModeIcon = ({color = '#aaa', strokeWidth = 9}) => (
+    <svg version="1.1" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+        <g fill="none" stroke={color} strokeLinecap="round" strokeLinejoin="round" strokeWidth={strokeWidth}>
+            <path d="m52.52 19c-17.021 0.12272-30.775 13.978-30.775 31 1.6e-4 17.109 13.891 31 31 31 10.113 3.5e-5 19.594-4.936 25.394-13.221 0.46456-0.66594-0.01618-1.5787-0.82812-1.5723-0.06911 5.69e-4 -0.13791-7.4e-5 -0.20703 0h-2e-3c-16.027-0.0012-28.998-12.973-28.998-29-5.3e-5 -5.951 1.831-11.758 5.2441-16.633 0.41109-0.63002-0.01926-1.5353-0.82807-1.5742z" />
+        </g>
+    </svg>
+);

src/icons/toolbar/light-mode.js

@@ -0,0 +1,18 @@
+export const LightModeIcon = ({color = '#aaa', strokeWidth = 10}) => (
+    <svg version="1.1" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+        <g stroke={color} fill="none">
+            <circle cx="50" cy="50" r="14" strokeWidth={strokeWidth * 0.8} />
+            <g strokeLinecap="round" strokeWidth={strokeWidth} >
+                <path d="m14 50h7"/>
+                <path d="m79 50h7"/>
+                <path d="m24.544 75.456 4.9497-4.9497"/>
+                <path d="m70.506 29.494 4.9497-4.9497"/>
+                <path d="m50 86v-7"/>
+                <path d="m50 21v-7"/>
+                <path d="m75.456 75.456-4.9497-4.9497"/>
+                <path d="m29.494 29.494-4.9497-4.9497"/>
+            </g>
+        </g>
+    </svg>
+    
+);