From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Tue, 26 Mar 2024 14:44:39 +0000 (+0100)
Subject: simple tracker config dialog
X-Git-Url: https://git.localhorst.tv/?a=commitdiff_plain;h=249e06be11d0f7778d99956c87d4f0a8ac7e69f7;p=alttp.git

simple tracker config dialog
---

diff --git a/resources/js/components/tracker/ConfigDialog.js b/resources/js/components/tracker/ConfigDialog.js
new file mode 100644
index 0000000..88c6d73
--- /dev/null
+++ b/resources/js/components/tracker/ConfigDialog.js
@@ -0,0 +1,180 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import { Col, Form, Modal, Row } from 'react-bootstrap';
+import { useTranslation } from 'react-i18next';
+
+import LargeCheck from '../common/LargeCheck';
+import { useTracker } from '../../hooks/tracker';
+
+const ConfigDialog = ({
+	onHide,
+	show,
+}) => {
+	const { config, saveConfig } = useTracker();
+	const { t } = useTranslation();
+
+	const handleChange = React.useCallback(({ target: { name, value } }) => {
+		saveConfig({ [name]: value });
+	}, [saveConfig]);
+
+	return <Modal className="tracker-config-dialog" onHide={onHide} show={show} size="lg">
+		<Modal.Header closeButton>
+			<Modal.Title>
+				{t('tracker.config.title')}
+			</Modal.Title>
+		</Modal.Header>
+		<Modal.Body>
+			<Row>
+				<Col sm={6}>
+					<h3>{t('tracker.config.wildItems')}</h3>
+					<Form.Group
+						className="d-flex justify-content-between my-2"
+						controlId="tracker.wildMap"
+					>
+						<Form.Label>{t('tracker.config.wildMap')}</Form.Label>
+						<Form.Control
+							as={LargeCheck}
+							name="wildMap"
+							onChange={handleChange}
+							value={!!config.wildMap}
+						/>
+					</Form.Group>
+					<Form.Group
+						className="d-flex justify-content-between my-2"
+						controlId="tracker.wildCompass"
+					>
+						<Form.Label>{t('tracker.config.wildCompass')}</Form.Label>
+						<Form.Control
+							as={LargeCheck}
+							name="wildCompass"
+							onChange={handleChange}
+							value={!!config.wildCompass}
+						/>
+					</Form.Group>
+					<Form.Group
+						className="d-flex justify-content-between my-2"
+						controlId="tracker.wildSmall"
+					>
+						<Form.Label>{t('tracker.config.wildSmall')}</Form.Label>
+						<Form.Control
+							as={LargeCheck}
+							name="wildSmall"
+							onChange={handleChange}
+							value={!!config.wildSmall}
+						/>
+					</Form.Group>
+					<Form.Group
+						className="d-flex justify-content-between my-2"
+						controlId="tracker.wildBig"
+					>
+						<Form.Label>{t('tracker.config.wildBig')}</Form.Label>
+						<Form.Control
+							as={LargeCheck}
+							name="wildBig"
+							onChange={handleChange}
+							value={!!config.wildBig}
+						/>
+					</Form.Group>
+				</Col>
+				<Col sm={6}>
+					<h3>{t('tracker.config.showItems')}</h3>
+					<Form.Group
+						className="d-flex justify-content-between my-2"
+						controlId="tracker.showMap"
+					>
+						<Form.Label>{t('tracker.config.showMap')}</Form.Label>
+						<Form.Select
+							className="w-auto"
+							name="showMap"
+							onChange={handleChange}
+							value={config.showMap || 'always'}
+						>
+							<option value="never">
+								{t('tracker.config.showItemOptions.never')}
+							</option>
+							<option value="situational">
+								{t('tracker.config.showItemOptions.situational')}
+							</option>
+							<option value="always">
+								{t('tracker.config.showItemOptions.always')}
+							</option>
+						</Form.Select>
+					</Form.Group>
+					<Form.Group
+						className="d-flex justify-content-between my-2"
+						controlId="tracker.showCompass"
+					>
+						<Form.Label>{t('tracker.config.showCompass')}</Form.Label>
+						<Form.Select
+							className="w-auto"
+							name="showCompass"
+							onChange={handleChange}
+							value={config.showCompass || 'always'}
+						>
+							<option value="never">
+								{t('tracker.config.showItemOptions.never')}
+							</option>
+							<option value="situational">
+								{t('tracker.config.showItemOptions.situational')}
+							</option>
+							<option value="always">
+								{t('tracker.config.showItemOptions.always')}
+							</option>
+						</Form.Select>
+					</Form.Group>
+					<Form.Group
+						className="d-flex justify-content-between my-2"
+						controlId="tracker.showSmall"
+					>
+						<Form.Label>{t('tracker.config.showSmall')}</Form.Label>
+						<Form.Select
+							className="w-auto"
+							name="showSmall"
+							onChange={handleChange}
+							value={config.showSmall || 'always'}
+						>
+							<option value="never">
+								{t('tracker.config.showItemOptions.never')}
+							</option>
+							<option value="situational">
+								{t('tracker.config.showItemOptions.situational')}
+							</option>
+							<option value="always">
+								{t('tracker.config.showItemOptions.always')}
+							</option>
+						</Form.Select>
+					</Form.Group>
+					<Form.Group
+						className="d-flex justify-content-between my-2"
+						controlId="tracker.showBig"
+					>
+						<Form.Label>{t('tracker.config.showBig')}</Form.Label>
+						<Form.Select
+							className="w-auto"
+							name="showBig"
+							onChange={handleChange}
+							value={config.showBig || 'always'}
+						>
+							<option value="never">
+								{t('tracker.config.showItemOptions.never')}
+							</option>
+							<option value="situational">
+								{t('tracker.config.showItemOptions.situational')}
+							</option>
+							<option value="always">
+								{t('tracker.config.showItemOptions.always')}
+							</option>
+						</Form.Select>
+					</Form.Group>
+				</Col>
+			</Row>
+		</Modal.Body>
+	</Modal>;
+};
+
+ConfigDialog.propTypes = {
+	onHide: PropTypes.func,
+	show: PropTypes.bool,
+};
+
+export default ConfigDialog;
diff --git a/resources/js/components/tracker/CountDisplay.js b/resources/js/components/tracker/CountDisplay.js
index ed9b91f..8282422 100644
--- a/resources/js/components/tracker/CountDisplay.js
+++ b/resources/js/components/tracker/CountDisplay.js
@@ -1,7 +1,7 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 
-const CountDisplay = ({ className, count }) => {
+const CountDisplay = ({ className, count, full }) => {
 	const classNames = ['count-display'];
 	if (className) {
 		classNames.push(className);
@@ -9,6 +9,9 @@ const CountDisplay = ({ className, count }) => {
 	if (!count) {
 		classNames.push('is-zero');
 	}
+	if (full && count >= full) {
+		classNames.push('is-full');
+	}
 	return <span className={classNames.join(' ')}>
 		{count}
 	</span>;
@@ -17,6 +20,7 @@ const CountDisplay = ({ className, count }) => {
 CountDisplay.propTypes = {
 	className: PropTypes.string,
 	count: PropTypes.number,
+	full: PropTypes.number,
 };
 
 export default CountDisplay;
diff --git a/resources/js/components/tracker/Dungeons.js b/resources/js/components/tracker/Dungeons.js
index 08a581f..b997e75 100644
--- a/resources/js/components/tracker/Dungeons.js
+++ b/resources/js/components/tracker/Dungeons.js
@@ -5,35 +5,47 @@ import ToggleIcon from './ToggleIcon';
 import {
 	getDungeonAcquiredSKs,
 	getDungeonRemainingItems,
+	shouldShowDungeonItem,
 } from '../../helpers/tracker';
 import { useTracker } from '../../hooks/tracker';
 
 const Dungeons = () => {
-	const { dungeons, state } = useTracker();
+	const { config, dungeons, state } = useTracker();
 
 	return <div className="dungeons">
 		{dungeons.map(dungeon =>
 			<div className={`dungeon dungeon-${dungeon.id}`} key={dungeon.id}>
 				<span className="dungeon-tag">{dungeon.id.toUpperCase()}</span>
-				<ToggleIcon
-					controller={ToggleIcon.dungeonController(dungeon)}
-					icons={['map']}
-				/>
-				<ToggleIcon
-					controller={ToggleIcon.dungeonController(dungeon)}
-					icons={['compass']}
-				/>
-				<span className="dungeon-smalls">
+				{shouldShowDungeonItem(config, 'Map') ?
 					<ToggleIcon
-						controller={ToggleIcon.dungeonCountController(dungeon, dungeon.sk)}
-						icons={['small-key']}
+						controller={ToggleIcon.dungeonController(dungeon)}
+						icons={['map']}
 					/>
-					<CountDisplay count={getDungeonAcquiredSKs(state, dungeon)} />
-				</span>
-				<ToggleIcon
-					controller={ToggleIcon.dungeonController(dungeon)}
-					icons={['big-key']}
-				/>
+				: null}
+				{shouldShowDungeonItem(config, 'Compass') ?
+					<ToggleIcon
+						controller={ToggleIcon.dungeonController(dungeon)}
+						icons={['compass']}
+					/>
+				: null}
+				{shouldShowDungeonItem(config, 'Small') ?
+					<span className="dungeon-smalls">
+						<ToggleIcon
+							controller={ToggleIcon.dungeonCountController(dungeon, dungeon.sk)}
+							icons={['small-key']}
+						/>
+						<CountDisplay
+							count={getDungeonAcquiredSKs(state, dungeon)}
+							full={dungeon.sk}
+						/>
+					</span>
+				: null}
+				{shouldShowDungeonItem(config, 'Big') ?
+					<ToggleIcon
+						controller={ToggleIcon.dungeonController(dungeon)}
+						icons={['big-key']}
+					/>
+				: null}
 				<span className="dungeon-checks">
 					<ToggleIcon
 						controller={ToggleIcon.dungeonCheckController(dungeon)}
diff --git a/resources/js/components/tracker/Toolbar.js b/resources/js/components/tracker/Toolbar.js
index c7545b3..0208266 100644
--- a/resources/js/components/tracker/Toolbar.js
+++ b/resources/js/components/tracker/Toolbar.js
@@ -1,8 +1,10 @@
 import React from 'react';
-import { Container, Navbar } from 'react-bootstrap';
+import { Button, Container, Navbar } from 'react-bootstrap';
 
 import AutoTracking from './AutoTracking';
+import ConfigDialog from './ConfigDialog';
 import ToggleIcon from './ToggleIcon';
+import Icon from '../common/Icon';
 import { useTracker } from '../../hooks/tracker';
 
 const mapWild = {
@@ -13,6 +15,7 @@ const mapWild = {
 };
 
 const Toolbar = () => {
+	const [showConfigDialog, setShowConfigDialog] = React.useState(false);
 	const { config, saveConfig } = useTracker();
 
 	const controller = React.useMemo(() => ({
@@ -28,6 +31,13 @@ const Toolbar = () => {
 	return <Navbar bg="dark" className="tracker-toolbar" variant="dark">
 		<Container fluid>
 			<div className="button-bar">
+				<Button
+					className="me-3"
+					onClick={() => setShowConfigDialog(true)}
+					variant="outline-secondary"
+				>
+					<Icon.SETTINGS />
+				</Button>
 				<ToggleIcon controller={controller} icons={['map']} />
 				<ToggleIcon controller={controller} icons={['compass']} />
 				<ToggleIcon controller={controller} icons={['small-key']} />
@@ -35,6 +45,7 @@ const Toolbar = () => {
 			</div>
 			<AutoTracking />
 		</Container>
+		<ConfigDialog onHide={() => setShowConfigDialog(false)} show={showConfigDialog} />
 	</Navbar>;
 };
 
diff --git a/resources/js/helpers/tracker.js b/resources/js/helpers/tracker.js
index 2bc477b..e4b0ebe 100644
--- a/resources/js/helpers/tracker.js
+++ b/resources/js/helpers/tracker.js
@@ -68,6 +68,10 @@ export const BOSSES = [
 ];
 
 export const CONFIG = {
+	showMap: 'situational',
+	showCompass: 'situational',
+	showSmall: 'always',
+	showBig: 'always',
 	wildMap: false,
 	wildCompass: false,
 	wildSmall: false,
@@ -1552,6 +1556,20 @@ export const UNDERWORLD_LOCATIONS = [
 	},
 ];
 
+export const shouldShowDungeonItem = (config, which) => {
+	const show = config[`show${which}`] || 'always';
+	const wild = config[`wild${which}`] || false;
+	switch (show) {
+		default:
+		case 'always':
+			return true;
+		case 'situational':
+			return wild;
+		case 'never':
+			return false;
+	}
+};
+
 export const toggleBoolean = name => state => ({
 	...state,
 	[name]: !state[name],
diff --git a/resources/js/i18n/de.js b/resources/js/i18n/de.js
index 7232e2d..87b6198 100644
--- a/resources/js/i18n/de.js
+++ b/resources/js/i18n/de.js
@@ -501,6 +501,24 @@ export default {
 			seeAlso: 'Siehe auch',
 		},
 		tracker: {
+			config: {
+				showBig: 'Big Keys',
+				showCompass: 'Kompanden',
+				showItemOptions: {
+					always: 'Immer',
+					never: 'Nie',
+					situational: 'Situationsbedingt',
+				},
+				showItems: 'Zeige Dungeon Items',
+				showMap: 'Maps',
+				showSmall: 'Small Keys',
+				title: 'Konfiguration',
+				wildBig: 'Big Keys',
+				wildCompass: 'Kompanden',
+				wildItems: 'Wild Dungeon Items',
+				wildMap: 'Maps',
+				wildSmall: 'Small Keys',
+			},
 			location: {
 				aginah: 'Aginah',
 				blacksmith: 'Blacksmith',
diff --git a/resources/js/i18n/en.js b/resources/js/i18n/en.js
index a76dd6c..9ca7a6b 100644
--- a/resources/js/i18n/en.js
+++ b/resources/js/i18n/en.js
@@ -501,6 +501,24 @@ export default {
 			seeAlso: 'See also',
 		},
 		tracker: {
+			config: {
+				showBig: 'Big Keys',
+				showCompass: 'Compasses',
+				showItemOptions: {
+					always: 'Always',
+					never: 'Never',
+					situational: 'Situational',
+				},
+				showItems: 'Show Dungeon Items',
+				showMap: 'Maps',
+				showSmall: 'Small Keys',
+				title: 'Configuration',
+				wildBig: 'Big Keys',
+				wildCompass: 'Compasses',
+				wildItems: 'Wild Dungeon Items',
+				wildMap: 'Maps',
+				wildSmall: 'Small Keys',
+			},
 			location: {
 				aginah: 'Aginah',
 				blacksmith: 'Blacksmith',
diff --git a/resources/sass/tracker.scss b/resources/sass/tracker.scss
index eae60c3..4857557 100644
--- a/resources/sass/tracker.scss
+++ b/resources/sass/tracker.scss
@@ -41,6 +41,9 @@
 				&.is-zero {
 					display: none;
 				}
+				&.is-full {
+					color: green;
+				}
 			}
 		}
 	}