Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow flipping the board layout on mobile #184

Merged
merged 1 commit into from
Feb 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,22 @@ function App() {
"keyboardLayout",
"QWERTY",
);
const [layoutOrientation, setLayoutOrientation] = useStorage(
"layout",
"portrait",
);
const [cardOrientation, setCardOrientation] = useStorage(
"orientation",
"vertical",
);

const toggleLayoutOrientation = () => {
setLayoutOrientation((x) => (x === "portrait" ? "landscape" : "portrait"));
};
const toggleCardOrientation = () => {
setCardOrientation((x) => (x === "vertical" ? "horizontal" : "vertical"));
};

const [volume, setVolume] = useStorage("volume", "on");

useEffect(() => {
Expand Down Expand Up @@ -127,7 +143,16 @@ function App() {
) : (
<UserContext.Provider value={user}>
<SettingsContext.Provider
value={{ keyboardLayout, setKeyboardLayout, volume, setVolume }}
value={{
keyboardLayout,
setKeyboardLayout,
volume,
setVolume,
layoutOrientation,
toggleLayoutOrientation,
cardOrientation,
toggleCardOrientation,
}}
>
<ConnectionsTracker />
<WelcomeDialog />
Expand Down
22 changes: 10 additions & 12 deletions src/components/Game.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import ResponsiveSetCard from "../components/ResponsiveSetCard";
import { SettingsContext } from "../context";
import useDimensions from "../hooks/useDimensions";
import useKeydown from "../hooks/useKeydown";
import useStorage from "../hooks/useStorage";
import { generateCards, standardLayouts } from "../util";

const gamePadding = 8;
Expand All @@ -27,15 +26,14 @@ function Game({
answer,
lastSet,
}) {
const [layoutOrientation, setLayoutOrientation] = useStorage(
"layout",
"portrait",
);
const [cardOrientation, setCardOrientation] = useStorage(
"orientation",
"vertical",
);
const { keyboardLayout, volume } = useContext(SettingsContext);
const {
keyboardLayout,
volume,
layoutOrientation,
toggleLayoutOrientation,
cardOrientation,
toggleCardOrientation,
} = useContext(SettingsContext);
const keyboardLayoutDesc = standardLayouts[keyboardLayout];
const isHorizontal = cardOrientation === "horizontal";
const isLandscape = layoutOrientation === "landscape";
Expand Down Expand Up @@ -177,11 +175,11 @@ function Game({
) {
event.preventDefault();
if (volume === "on") playLayout();
setCardOrientation(isHorizontal ? "vertical" : "horizontal");
toggleCardOrientation();
} else if (key.toLowerCase() === keyboardLayoutDesc.layoutChangeKey) {
event.preventDefault();
if (volume === "on") playLayout();
setLayoutOrientation(isLandscape ? "portrait" : "landscape");
toggleLayoutOrientation();
}
}
});
Expand Down
13 changes: 13 additions & 0 deletions src/components/Navbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ import Toolbar from "@mui/material/Toolbar";
import Tooltip from "@mui/material/Tooltip";
import Typography from "@mui/material/Typography";
import { useContext, useState } from "react";
import useSound from "use-sound";

import layoutSfx from "../assets/layoutChangeSound.mp3";
import { version } from "../config";
import { SettingsContext, UserContext } from "../context";
import firebase from "../firebase";
Expand All @@ -33,6 +35,7 @@ function Navbar({
}) {
const user = useContext(UserContext);
const settings = useContext(SettingsContext);
const [playLayout] = useSound(layoutSfx);
const [anchorEl, setAnchorEl] = useState(null);
const [changeName, setChangeName] = useState(false);
const [changeUserColor, setChangeUserColor] = useState(false);
Expand Down Expand Up @@ -181,6 +184,16 @@ function Navbar({
>
Change keyboard layout
</MenuItem>
<MenuItem
onClick={() => {
if (settings.volume === "on") playLayout();
settings.toggleLayoutOrientation();
settings.toggleCardOrientation();
handleCloseMenu();
}}
>
Flip board layout
</MenuItem>
<MenuItem
onClick={() => {
setShowOptions(true);
Expand Down