From 910fe5cf7132bf8dd05da91f2ea74c53e92ff46e Mon Sep 17 00:00:00 2001 From: loucass003 Date: Fri, 4 Sep 2026 20:12:46 +0200 Subject: [PATCH] Mobile QOL + Improve autimatic set detection --- .../components/onboarding/BodyAssignment.tsx | 11 +- .../trackers-assign/MobileTrackerAssign.tsx | 40 +++++- .../pages/components/TapDetectionSettings.tsx | 4 +- gui/app/src/hooks/config.ts | 8 -- gui/app/src/hooks/tracker-picker.ts | 120 +++++++++--------- gui/app/src/hooks/tracker.ts | 71 ++++++++--- 6 files changed, 155 insertions(+), 99 deletions(-) diff --git a/gui/app/src/components/onboarding/BodyAssignment.tsx b/gui/app/src/components/onboarding/BodyAssignment.tsx index e70cf1a4d..b93b7a80e 100644 --- a/gui/app/src/components/onboarding/BodyAssignment.tsx +++ b/gui/app/src/components/onboarding/BodyAssignment.tsx @@ -16,10 +16,9 @@ import { TogglePill, TogglePillOption } from '@/components/commons/TogglePill'; import { TrackerPartCard } from '@/components/tracker/TrackerPartCard'; import { PartCardRenderer } from './parts/PartCard'; import { - ASSIGNMENT_MODES, BodyPartError, COMMONS, - useAssignMode, + useSuggestedBodyParts, } from '@/hooks/tracker-picker'; import { PersonFrontIcon, SIDES } from '@/components/commons/PersonFrontIcon'; import { useAtomValue } from 'jotai'; @@ -121,7 +120,7 @@ export function BodyAssignment({ dotProps?: (part: BodyPart) => HTMLAttributes; activeParts?: BodyPart[]; }) { - const assignMode = useAssignMode(); + const suggestedBodyParts = useSuggestedBodyParts(); const assignedRoles = useAtomValue(assignedRolesAtom); const trackerByPart = useAtomValue(trackerByBodyPartAtom); @@ -148,8 +147,10 @@ export function BodyAssignment({ const hasBodyPart = useCallback( (part: BodyPart) => - COMMONS.includes(part) || ASSIGNMENT_MODES[assignMode].includes(part), - [assignMode] + COMMONS.includes(part) || + suggestedBodyParts.includes(part) || + assignedRoles.includes(part), + [suggestedBodyParts, assignedRoles] ); const card: PartCardRenderer = diff --git a/gui/app/src/components/onboarding/pages/trackers-assign/MobileTrackerAssign.tsx b/gui/app/src/components/onboarding/pages/trackers-assign/MobileTrackerAssign.tsx index 9a6730b74..58e3cdf64 100644 --- a/gui/app/src/components/onboarding/pages/trackers-assign/MobileTrackerAssign.tsx +++ b/gui/app/src/components/onboarding/pages/trackers-assign/MobileTrackerAssign.tsx @@ -1,7 +1,7 @@ import type { FluentVariable } from '@fluent/bundle'; import { useLocalization } from '@fluent/react'; import classNames from 'classnames'; -import { ReactNode, useMemo } from 'react'; +import { CSSProperties, ReactNode, useMemo } from 'react'; import { BodyPart } from 'solarxr-protocol'; import { Button } from '@/components/commons/Button'; import { ProgressBar } from '@/components/commons/ProgressBar'; @@ -10,9 +10,14 @@ import { ArrowDownIcon, ArrowUpIcon, } from '@/components/commons/icon/ArrowIcons'; +import { WarningIcon } from '@/components/commons/icon/WarningIcon'; import { ShowAllPartsToggle } from '@/components/onboarding/BodyAssignment'; import { useOnboarding } from '@/hooks/onboarding'; -import { getTrackerName } from '@/hooks/tracker'; +import { + getTrackerName, + useTrackersVelocity, + velocityGlowStyle, +} from '@/hooks/tracker'; import { FlatDeviceTracker, groupTrackersByConnection, @@ -33,9 +38,11 @@ function MobileAssignPanel({ onBackdropPress, title, description, + warning, headerAction, progress, footer, + style, children, }: { open: boolean; @@ -44,9 +51,11 @@ function MobileAssignPanel({ onBackdropPress: () => void; title: ReactNode; description: ReactNode; + warning?: ReactNode; headerAction?: ReactNode; progress: number; footer?: ReactNode; + style?: CSSProperties; children: ReactNode; }) { const headerRow = ( @@ -58,6 +67,16 @@ function MobileAssignPanel({ > {title} {description} + {warning && ( +
+
+ +
+ + {warning} + +
+ )} {headerAction}