From 9a3b729bd23c536aa27de86f7c00065dc77c6787 Mon Sep 17 00:00:00 2001 From: courtneypattison Date: Thu, 11 Apr 2024 06:24:34 -0400 Subject: [PATCH 1/6] Refactor layer menu component and add translations --- app/[locale]/calibrate/page.tsx | 2 +- app/[locale]/globals.css | 22 ++++++++ app/_components/layer-menu.tsx | 96 +++++++++++++++++++-------------- messages/en.json | 5 ++ 4 files changed, 83 insertions(+), 42 deletions(-) diff --git a/app/[locale]/calibrate/page.tsx b/app/[locale]/calibrate/page.tsx index 920863e9..7834c29a 100644 --- a/app/[locale]/calibrate/page.tsx +++ b/app/[locale]/calibrate/page.tsx @@ -326,7 +326,7 @@ export default function Page() { } layers={layers} setLayers={setLayers} - className={`${menuStates.stitch ? "top-32" : "top-20"} overflow-scroll`} + className={`${menuStates.stitch ? "top-32" : "top-20"}`} /> {layers.size && !menuStates.layers ? ( void; }) { + const t = useTranslations("LayerMenu"); + function handleOnChange(key: string, layer: Layer) { layer.visible = !layer.visible; setLayers(new Map(layers.set(key, layer))); @@ -36,53 +40,63 @@ export default function LayerMenu({ } return ( - -
  • -
    -
    - handleGlobalChange(e.target.checked)} - /> -
    Layers
    -
    - setVisible(false)}> +
    + +
    {t("title")}
    + setVisible(false)} className="ml-auto">
    -
    • - {[...layers.entries()].map((e) => ( -
  • -
    - handleOnChange(e[0], e[1])} - > - -
    -
    • - ))} -     + +
    +
    + handleGlobalChange(e.target.checked)} + /> + +
    +
    + + {[...layers.entries()].map((e) => ( +
  • +
    + handleOnChange(e[0], e[1])} + > + +
    +
    • + ))} +     + ); } diff --git a/messages/en.json b/messages/en.json index e72cc957..01d4fb0e 100644 --- a/messages/en.json +++ b/messages/en.json @@ -183,6 +183,11 @@ "horizontal": "Horizontal", "vertical": "Vertical" }, + "LayerMenu": { + "title": "Layers", + "showAll": "Show all", + "hideAll": "Hide all" + }, "MovementPad": { "up": "Up", "down": "Down", From 6389464f009c936630db011dee8475ce539fb9be Mon Sep 17 00:00:00 2001 From: gallegonovato Date: Thu, 11 Apr 2024 11:05:48 +0000 Subject: [PATCH 2/6] Translated using Weblate (Spanish) Currently translated at 100.0% (128 of 128 strings) Translation: Pattern Projector/Pattern Projector Translate-URL: https://hosted.weblate.org/projects/pattern-projector/pattern-projector/es/ --- messages/es.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/messages/es.json b/messages/es.json index 8ab39cad..da5f40ea 100644 --- a/messages/es.json +++ b/messages/es.json @@ -182,7 +182,8 @@ "measureOn": "Empezar medición", "measureOff": "Terminar medición", "showMovement": "Mostrar herramienta mover", - "hideMovement": "Ocultar herramienta mover" + "hideMovement": "Ocultar herramienta mover", + "fullScreenChange": "Por favor, asegúrese de que la calibración es correcta. Debe calibrar en modo de pantalla completa si desea proyectar en pantalla completa." }, "StitchMenu": { "columnCount": "Columnas", From a1d8f58fcd971b55e4b3ad6419f251e87f87384b Mon Sep 17 00:00:00 2001 From: courtneypattison Date: Sat, 13 Apr 2024 07:57:04 -0400 Subject: [PATCH 3/6] Fix #171 --- app/[locale]/globals.css | 4 +-- app/_components/layer-menu.tsx | 50 ++++++++++++---------------------- 2 files changed, 20 insertions(+), 34 deletions(-) diff --git a/app/[locale]/globals.css b/app/[locale]/globals.css index 704ba504..d5b88999 100644 --- a/app/[locale]/globals.css +++ b/app/[locale]/globals.css @@ -10,7 +10,7 @@ .scrollbar::-webkit-scrollbar-track { border-radius: 100vh; - background: white; + background: rgb(220, 220, 220, 0.2); } .scrollbar::-webkit-scrollbar-thumb { @@ -22,4 +22,4 @@ .scrollbar::-webkit-scrollbar-thumb:hover { background: #6b7280; } -} \ No newline at end of file +} diff --git a/app/_components/layer-menu.tsx b/app/_components/layer-menu.tsx index 47750adf..fdbff3dd 100644 --- a/app/_components/layer-menu.tsx +++ b/app/_components/layer-menu.tsx @@ -1,9 +1,8 @@ import { Layer } from "@/_lib/interfaces/layer"; import { Dispatch, SetStateAction, useMemo } from "react"; import { IconButton } from "@/_components/buttons/icon-button"; -import CloseIcon from "@/_icons/close-icon"; import { useTranslations } from "next-intl"; -import LayersIcon from "@/_icons/layers-icon"; +import KeyboardArrowLeftIcon from "@/_icons/keyboard-arrow-left"; export default function LayerMenu({ className, @@ -41,49 +40,36 @@ export default function LayerMenu({ return (
    0 && layers.size * 40 < 200 ? "h-fit" : "h-[calc(100vh-9rem)]"} text-sm font-medium text-gray-900 dark:text-white bg-white dark:bg-black border border-gray-200 dark:border-gray-700 border-top-0 absolute z-50 transition-all duration-700`} >

    -
    - -
    {t("title")}
    - setVisible(false)} className="ml-auto"> - +
    + setVisible(false)}> + -
    -

    -
    -
    - handleGlobalChange(e.target.checked)} - /> -
    -
    - + + + 0 && layers.size * 40 > 200 ? "h-[calc(100vh-12rem)] overflow-y-auto scrollbar" : ""}`} + > {[...layers.entries()].map((e) => ( -
  • +
  • handleOnChange(e[0], e[1])} > From 4c8a35ad0e1cbb521ddd6ce200d604e173f2a556 Mon Sep 17 00:00:00 2001 From: courtneypattison Date: Sun, 14 Apr 2024 07:43:15 -0400 Subject: [PATCH 4/6] Merge branch 'beta' into layer-menu --- app/_components/layer-menu.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/_components/layer-menu.tsx b/app/_components/layer-menu.tsx index fdbff3dd..97ed691d 100644 --- a/app/_components/layer-menu.tsx +++ b/app/_components/layer-menu.tsx @@ -61,7 +61,7 @@ export default function LayerMenu({ 0 && layers.size * 40 > 200 ? "h-[calc(100vh-12rem)] overflow-y-auto scrollbar" : ""}`} + className={`w-full ${layers.size > 0 && layers.size * 40 > 200 ? "h-[calc(100vh-13rem)] overflow-y-auto scrollbar" : ""}`} > {[...layers.entries()].map((e) => (
  • From 34edb60459c1acf4b45e1c800a8912e91a12d877 Mon Sep 17 00:00:00 2001 From: courtneypattison Date: Sun, 14 Apr 2024 07:58:02 -0400 Subject: [PATCH 5/6] Adjust height calculation in layer-menu.tsx --- app/_components/layer-menu.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/_components/layer-menu.tsx b/app/_components/layer-menu.tsx index 97ed691d..e6e025d2 100644 --- a/app/_components/layer-menu.tsx +++ b/app/_components/layer-menu.tsx @@ -40,7 +40,7 @@ export default function LayerMenu({ return (
    0 && layers.size * 40 < 200 ? "h-fit" : "h-[calc(100vh-9rem)]"} text-sm font-medium text-gray-900 dark:text-white bg-white dark:bg-black border border-gray-200 dark:border-gray-700 border-top-0 absolute z-50 transition-all duration-700`} + className={`${className} ${visible ? "left-0" : "-left-60"} w-48 ${layers.size > 0 && layers.size * 40 < 200 ? "h-fit" : "h-[calc(100vh-12rem)]"} text-sm font-medium text-gray-900 dark:text-white bg-white dark:bg-black border border-gray-200 dark:border-gray-700 border-top-0 absolute z-50 transition-all duration-700`} >

    0 && layers.size * 40 > 200 ? "h-[calc(100vh-13rem)] overflow-y-auto scrollbar" : ""}`} + className={`w-full ${layers.size > 0 && layers.size * 40 > 200 ? "h-[calc(100vh-15rem)] overflow-y-auto scrollbar" : ""}`} > {[...layers.entries()].map((e) => (
  • From 34dc9bb65abf476bed81e8e5644eadc4b558065b Mon Sep 17 00:00:00 2001 From: courtneypattison Date: Mon, 15 Apr 2024 15:35:23 -0400 Subject: [PATCH 6/6] Update CHANGELOG.md for version 1.0.1 release --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8be2a82..9898e817 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.0.1] - 2024-04-15 + ### Added - Redirect to calibration page when full screen mode is changed or window is moved/resized when projecting @@ -49,4 +51,5 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Press and hold calibration corners to slow down movement [unreleased]: https://github.com/Pattern-Projector/pattern-projector/compare/main...beta +[1.0.1]: https://github.com/Pattern-Projector/pattern-projector/releases/tag/v1.0.1 [1.0.0]: https://github.com/Pattern-Projector/pattern-projector/releases/tag/v1.0.0