Compare commits

..

12 Commits

Author SHA1 Message Date
Vixalie
0aba9bb15e adjust PulseCard operating style. 2025-03-21 17:23:31 +08:00
Vixalie
cc3b762880 adjust Pulse List layout. 2025-03-21 17:00:34 +08:00
Vixalie
346566b147 add PulseCard component. 2025-03-21 16:59:08 +08:00
Vixalie
4cdc73ca90 add extra adjust sequence logic. 2025-03-21 16:58:35 +08:00
Vixalie
9222e60b58 remove unused import. 2025-03-21 16:35:56 +08:00
Vixalie
770efe269a fix pulse frequency shifting serializing. 2025-03-21 16:35:27 +08:00
Vixalie
65d2e739ef fix atom chain. 2025-03-21 16:27:49 +08:00
Vixalie
3253b8b98e refactor Pattern and Pulse methods. 2025-03-21 14:25:03 +08:00
Vixalie
c6f0b2a8fc refactor StatusBar font size. 2025-03-20 11:29:13 +08:00
Vixalie
440caf4de0 refactor UI font size. 2025-03-20 11:20:14 +08:00
Vixalie
5b30d4c2bc move DndContext defination position. 2025-03-13 22:31:24 +08:00
Vixalie
fe62564f6e add @dnd-kit support. 2025-03-13 22:01:21 +08:00
27 changed files with 550 additions and 267 deletions

48
deno.lock generated
View File

@@ -1,6 +1,9 @@
{ {
"version": "4", "version": "4",
"specifiers": { "specifiers": {
"npm:@dnd-kit/core@^6.3.1": "6.3.1_react@19.0.0_react-dom@19.0.0__react@19.0.0",
"npm:@dnd-kit/modifiers@9": "9.0.0_@dnd-kit+core@6.3.1__react@19.0.0__react-dom@19.0.0___react@19.0.0_react@19.0.0_react-dom@19.0.0__react@19.0.0",
"npm:@dnd-kit/sortable@10": "10.0.0_@dnd-kit+core@6.3.1__react@19.0.0__react-dom@19.0.0___react@19.0.0_react@19.0.0_react-dom@19.0.0__react@19.0.0",
"npm:@eslint/js@^9.19.0": "9.21.0", "npm:@eslint/js@^9.19.0": "9.21.0",
"npm:@iconify/react@^5.2.0": "5.2.0_react@19.0.0", "npm:@iconify/react@^5.2.0": "5.2.0_react@19.0.0",
"npm:@tauri-apps/api@2": "2.2.0", "npm:@tauri-apps/api@2": "2.2.0",
@@ -182,6 +185,48 @@
"@babel/helper-validator-identifier" "@babel/helper-validator-identifier"
] ]
}, },
"@dnd-kit/accessibility@3.1.1_react@19.0.0": {
"integrity": "sha512-2P+YgaXF+gRsIihwwY1gCsQSYnu9Zyj2py8kY5fFvUM1qm2WA2u639R6YNVfU4GWr+ZM5mqEsfHZZLoRONbemw==",
"dependencies": [
"react",
"tslib"
]
},
"@dnd-kit/core@6.3.1_react@19.0.0_react-dom@19.0.0__react@19.0.0": {
"integrity": "sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ==",
"dependencies": [
"@dnd-kit/accessibility",
"@dnd-kit/utilities",
"react",
"react-dom",
"tslib"
]
},
"@dnd-kit/modifiers@9.0.0_@dnd-kit+core@6.3.1__react@19.0.0__react-dom@19.0.0___react@19.0.0_react@19.0.0_react-dom@19.0.0__react@19.0.0": {
"integrity": "sha512-ybiLc66qRGuZoC20wdSSG6pDXFikui/dCNGthxv4Ndy8ylErY0N3KVxY2bgo7AWwIbxDmXDg3ylAFmnrjcbVvw==",
"dependencies": [
"@dnd-kit/core",
"@dnd-kit/utilities",
"react",
"tslib"
]
},
"@dnd-kit/sortable@10.0.0_@dnd-kit+core@6.3.1__react@19.0.0__react-dom@19.0.0___react@19.0.0_react@19.0.0_react-dom@19.0.0__react@19.0.0": {
"integrity": "sha512-+xqhmIIzvAYMGfBYYnbKuNicfSsk4RksY2XdmJhT+HAC01nix6fHCztU68jooFiMUB01Ky3F0FyOvhG/BZrWkg==",
"dependencies": [
"@dnd-kit/core",
"@dnd-kit/utilities",
"react",
"tslib"
]
},
"@dnd-kit/utilities@3.2.2_react@19.0.0": {
"integrity": "sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==",
"dependencies": [
"react",
"tslib"
]
},
"@esbuild/aix-ppc64@0.25.0": { "@esbuild/aix-ppc64@0.25.0": {
"integrity": "sha512-O7vun9Sf8DFjH2UtqK8Ku3LkquL9SZL8OLY1T5NZkA34+wG3OQF7cl4Ql8vdNzM6fzBbYfLaiRLIOZ+2FOCgBQ==" "integrity": "sha512-O7vun9Sf8DFjH2UtqK8Ku3LkquL9SZL8OLY1T5NZkA34+wG3OQF7cl4Ql8vdNzM6fzBbYfLaiRLIOZ+2FOCgBQ=="
}, },
@@ -1612,6 +1657,9 @@
"workspace": { "workspace": {
"packageJson": { "packageJson": {
"dependencies": [ "dependencies": [
"npm:@dnd-kit/core@^6.3.1",
"npm:@dnd-kit/modifiers@9",
"npm:@dnd-kit/sortable@10",
"npm:@eslint/js@^9.19.0", "npm:@eslint/js@^9.19.0",
"npm:@iconify/react@^5.2.0", "npm:@iconify/react@^5.2.0",
"npm:@tauri-apps/api@2", "npm:@tauri-apps/api@2",

View File

@@ -11,6 +11,9 @@
"tauri:dev": "tauri dev" "tauri:dev": "tauri dev"
}, },
"dependencies": { "dependencies": {
"@dnd-kit/core": "^6.3.1",
"@dnd-kit/modifiers": "^9.0.0",
"@dnd-kit/sortable": "^10.0.0",
"@iconify/react": "^5.2.0", "@iconify/react": "^5.2.0",
"@tauri-apps/plugin-dialog": "~2.2.0", "@tauri-apps/plugin-dialog": "~2.2.0",
"@tauri-apps/plugin-notification": "~2.2.1", "@tauri-apps/plugin-notification": "~2.2.1",

View File

@@ -1,9 +1,11 @@
use rand::Rng; use rand::Rng;
use serde::{Deserialize, Serialize}; use serde::Deserialize;
use serde_repr::{Deserialize_repr, Serialize_repr};
use crate::fraction::Fraction; use crate::fraction::Fraction;
#[derive(Debug, Copy, Clone, Serialize, Deserialize)] #[derive(Debug, Copy, Clone, Serialize_repr, Deserialize_repr)]
#[repr(u32)]
pub enum FrequencyShifting { pub enum FrequencyShifting {
Linear, Linear,
Quadratic, Quadratic,

View File

@@ -69,6 +69,11 @@
border-radius: calc(var(--border-radius) * 2); border-radius: calc(var(--border-radius) * 2);
padding-block: calc(var(--spacing)); padding-block: calc(var(--spacing));
} }
&.name {
font-size: var(--label-small-font-size);
line-height: var(--label-small-line-height);
font-weight: var(--label-small-font-weight);
}
} }
&.inactive { &.inactive {
color: var(--color-on-surface-variant); color: var(--color-on-surface-variant);

View File

@@ -24,7 +24,7 @@ const FunctionLink: FC<FunctionLinkProps> = ({ name, url, end, children }) => {
} }
end={end}> end={end}>
<div className={styles.filled}>{children}</div> <div className={styles.filled}>{children}</div>
<div>{name}</div> <div className={styles.name}>{name}</div>
</NavLink> </NavLink>
); );
}; };

View File

@@ -23,33 +23,40 @@
} }
} }
:is(h1, h2, h3, h4, h5, h6) {
font-weight: bold;
line-height: 1.2em;
}
h1 { h1 {
font-size: 2.6em; font-size: 2rem;
line-height: 2.5rem;
font-weight: 400;
} }
h2 { h2 {
font-size: 2em; font-size: 1.75rem;
line-height: 2.25rem;
font-weight: 400;
} }
h3 { h3 {
font-size: 1.8em; font-size: 1.5rem;
line-height: 2rem;
font-weight: 400;
} }
h4 { h4 {
font-size: 1.5em; font-size: 1.375rem;
line-height: 1.75rem;
font-weight: 500;
} }
h5 { h5 {
font-size: 1.2em; font-size: 1rem;
line-height: 1.5rem;
font-weight: 500;
} }
h6 { h6 {
font-size: 1em; font-size: 0.875rem;
line-height: 1.25rem;
font-weight: 500;
} }
.center { .center {
@@ -112,23 +119,22 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
gap: calc(var(--spacing) * 2); gap: calc(var(--spacing) * 2);
font-size: calc(var(--font-size) * 1.2); font-size: var(--label-medium-font-size);
line-height: 1.3em; line-height: var(--label-medium-line-height);
font-weight: var(--label-medium-font-weight);
color: var(--button-text); color: var(--button-text);
background-color: var(--button-surface); background-color: var(--button-surface);
box-shadow: var(--elevation-0); box-shadow: var(--elevation-0);
cursor: pointer; cursor: pointer;
&.smaller {
font-size: calc(var(--font-size) * 0.8);
}
&.small { &.small {
font-size: calc(var(--font-size) * 1); font-size: var(--label-small-font-size);
line-height: var(--label-small-line-height);
font-weight: var(--label-small-font-weight);
} }
&.large { &.large {
font-size: calc(var(--font-size) * 1.4); font-size: var(--label-large-font-size);
} line-height: var(--label-large-line-height);
&.larger { font-weight: var(--label-large-font-weight);
font-size: calc(var(--font-size) * 1.6);
} }
&:hover:not(:disabled) { &:hover:not(:disabled) {
color: var(--button-surface); color: var(--button-surface);
@@ -456,7 +462,9 @@
border-top-left-radius: calc(var(--border-radius) * 2); border-top-left-radius: calc(var(--border-radius) * 2);
border-top-right-radius: calc(var(--border-radius) * 2); border-top-right-radius: calc(var(--border-radius) * 2);
padding: calc(var(--spacing)) calc(var(--spacing) * 2); padding: calc(var(--spacing)) calc(var(--spacing) * 2);
line-height: 1.5em; font-size: var(--body-small-font-size);
line-height: var(--body-small-line-height);
font-weight: var(--body-small-font-weight);
color: var(--color-on-surface); color: var(--color-on-surface);
background-color: var(--color-surface-container-highest); background-color: var(--color-surface-container-highest);
&.error { &.error {

View File

@@ -64,7 +64,7 @@ const PatternPreview: FC = () => {
return ( return (
<div className={styles.pattern_preview}> <div className={styles.pattern_preview}>
<h4>Pattern Preview</h4> <h5>Pattern Preview</h5>
<div className={styles.canvas_wrapper} ref={conatienrRef}> <div className={styles.canvas_wrapper} ref={conatienrRef}>
<canvas ref={canvasRef} /> <canvas ref={canvasRef} />
</div> </div>

View File

@@ -1,180 +1,9 @@
import { invoke } from '@tauri-apps/api/core'; import { invoke } from '@tauri-apps/api/core';
import dayjs from 'dayjs';
import { atom, useAtomValue, useSetAtom } from 'jotai'; import { atom, useAtomValue, useSetAtom } from 'jotai';
import { atomWithRefresh } from 'jotai/utils'; import { atomWithRefresh } from 'jotai/utils';
import { get, reduce } from 'lodash-es';
import { useCallback } from 'react'; import { useCallback } from 'react';
import { v4 } from 'uuid';
import { NotificationType, ToastDuration, useNotification } from '../components/Notifications'; import { NotificationType, ToastDuration, useNotification } from '../components/Notifications';
import { Pattern, Pulse, totalDuration } from './pattern-model';
export enum FrequencyShifting {
/**
* Change frequency undergoes a linear transformation from previous pulse to current one.
*/
Linear,
/**
* Change frequency undergoes a quadratic transformation from previous pulse to current one.
*/
Quadratic,
/**
* Change frequency undergoes a cubic transformation from previous pulse to current one.
*/
Cubic,
/**
* Change frequency with quick fade in and fade out.
*/
Ease,
/**
* Change frequency with spiking within range from previous pulse and current one.
*/
Pulsating,
/**
* Based on frequency of previous pulse, take the twice of frequency of current pulse as the peak frequency. Follow the maximum frequency limitation.
*/
Spiking,
/**
* Randomize frequency within range from previous frequency and current one.
*/
Randomize,
/**
* Randomize frequency within minium and maximum frequency.
*/
Maniac,
/**
* Synchronize changes of frequency with pulse width changes.
*/
Synchronized,
}
export interface ControlPoint {
x: number;
y: number;
}
export class Pulse {
order: number;
id: number;
offset: number;
width: number;
maniac: boolean;
frequency: number;
frequencyShifting: FrequencyShifting;
controlPoint1: ControlPoint;
controlPoint2: ControlPoint;
constructor(order: number, width: number, frequency: number) {
this.id = v4();
this.order = order;
this.offset = 0;
this.width = width;
this.maniac = false;
this.frequency = frequency;
this.frequencyShifting = FrequencyShifting.Linear;
this.controlPoint1 = { x: 0, y: 0 };
this.controlPoint2 = { x: 0, y: 0 };
}
equals(other: Pulse): boolean {
return this.id === other.id;
}
}
export class Pattern {
id: string;
name: string;
createdAt: number;
lastModifiedAt: number | null;
smoothRepeat: boolean;
pulses: Pulse[];
constructor() {
this.id = v4();
this.name = '';
this.createdAt = dayjs().valueOf();
this.lastModifiedAt = null;
this.smoothRepeat = true;
this.pulses = [];
}
movePulseUp(pulseId: string, step: number) {
const index = this.pulses.findIndex((pulse) => pulse.id === pulseId);
if (index === -1 || index - step < 0) return;
const targetIndex = index - step;
const targetPulse = this.pulses[targetIndex];
const currentPulse = this.pulses[index];
// Swap the pulses
this.pulses[targetIndex] = currentPulse;
this.pulses[index] = targetPulse;
// Swap their order
const tempOrder = currentPulse.order;
currentPulse.order = targetPulse.order;
targetPulse.order = tempOrder;
// Sort pulses by order
this.pulses.sort((a, b) => a.order - b.order);
}
movePulseDown(pulseId: string, step: number) {
const index = this.pulses.findIndex((pulse) => pulse.id === pulseId);
if (index === -1 || index + step >= this.pulses.length) return;
const targetIndex = index + step;
const targetPulse = this.pulses[targetIndex];
const currentPulse = this.pulses[index];
// Swap the pulses
this.pulses[targetIndex] = currentPulse;
this.pulses[index] = targetPulse;
// Swap their order
const tempOrder = currentPulse.order;
currentPulse.order = targetPulse.order;
targetPulse.order = tempOrder;
// Sort pulses by order
this.pulses.sort((a, b) => a.order - b.order);
}
addPulse(): Pulse {
const maxOrder = reduce(this.pulses, (former, pulse) => Math.max(former, pulse.order), 0);
const newPulse = new Pulse(
maxOrder + 1,
this.smoothRepeat ? get(this.pulses, '[0].width', 0) : get(this.pulses, '[-1].width', 0),
this.smoothRepeat
? get(this.pulses, '[0].frequency', 1)
: get(this.pulses, '[-1].frequency', 1),
);
this.pulses.push(newPulse);
return newPulse;
}
updatePulse(pulseId: string, pulse: Pulse) {
const index = this.pulses.findIndex((p) => p.id === pulseId);
if (index !== -1) {
const { id, order, ...rest } = pulse;
this.pulses[index] = { ...this.pulses[index], ...rest };
}
}
deletePulse(pulseId: string) {
this.pulses = this.pulses.filter((pulse) => pulse.id !== pulseId);
this.pulses.sort((a, b) => a.order - b.order);
this.pulses.forEach((pulse, index) => {
pulse.order = index + 1;
});
}
}
export function totalDuration(pattern: Pattern): number {
return reduce(
pattern.pulses,
(former, pulse) => former + pulse.offset,
pattern.smoothRepeat && pattern.pulses.length > 1 ? 100 : 0,
);
}
export const SearchKeywordAtom = atom<string | null>(null); export const SearchKeywordAtom = atom<string | null>(null);
export const PatternsAtom = atomWithRefresh(async (get) => { export const PatternsAtom = atomWithRefresh(async (get) => {
@@ -201,25 +30,22 @@ export const CurrentPatternAtom = atomWithRefresh<Pattern | null>(async (get) =>
} }
return null; return null;
}); });
export const PulsesInCurrentPatternAtom = atomWithRefresh(
(get) => get(CurrentPatternAtom)?.pulses ?? [],
);
export const CurrentPatternDuration = atom((get) => { export const CurrentPatternDuration = atom((get) => {
const currentPattern = get(CurrentPatternAtom); const currentPattern = get(CurrentPatternAtom);
if (!currentPattern) return 0; if (!currentPattern) return 0;
return totalDuration(currentPattern); return totalDuration(currentPattern);
}); });
export const SelectedPulseIdAtom = atom<string | null>(null); export const SelectedPulseIdAtom = atom<string | null>(null);
export const SelectedPulseAtom = atom<Pulse | null>((get) => { export const SelectedPulseAtom = atom<Pulse | null>(async (get) => {
const pulses = get(PulsesInCurrentPatternAtom); const pattern = await get(CurrentPatternAtom);
const selectedPulseId = get(SelectedPulseIdAtom); const selectedPulseId = get(SelectedPulseIdAtom);
return pulses.find((pulse) => pulse.id === selectedPulseId) ?? null; console.debug('[refresh selected pulse]', selectedPulseId, pattern);
return pattern?.pulses?.find((pulse) => pulse.id === selectedPulseId) ?? null;
}); });
export function useSavePattern() { export function useSavePattern() {
const refreshPatterns = useSetAtom(PatternsAtom); const refreshPatterns = useSetAtom(PatternsAtom);
const selectedPatternId = useAtomValue(SelectedPatternIdAtom); const selectedPatternId = useAtomValue(SelectedPatternIdAtom);
const refreshSelectedPattern = useSetAtom(CurrentPatternAtom);
const { showToast } = useNotification(); const { showToast } = useNotification();
const savePattern = useCallback( const savePattern = useCallback(
@@ -227,9 +53,6 @@ export function useSavePattern() {
try { try {
await invoke('save_pattern', { pattern }); await invoke('save_pattern', { pattern });
refreshPatterns(); refreshPatterns();
if (pattern.id === selectedPatternId) {
refreshSelectedPattern();
}
return true; return true;
} catch (error) { } catch (error) {
console.error('[save pattern]', error); console.error('[save pattern]', error);

View File

@@ -0,0 +1,190 @@
import dayjs from 'dayjs';
import { get, reduce } from 'lodash-es';
import { v4 } from 'uuid';
export enum FrequencyShifting {
/**
* Change frequency undergoes a linear transformation from previous pulse to current one.
*/
Linear = 0,
/**
* Change frequency undergoes a quadratic transformation from previous pulse to current one.
*/
Quadratic = 1,
/**
* Change frequency undergoes a cubic transformation from previous pulse to current one.
*/
Cubic = 2,
/**
* Change frequency with quick fade in and fade out.
*/
Ease = 3,
/**
* Change frequency with spiking within range from previous pulse and current one.
*/
Pulsating = 4,
/**
* Based on frequency of previous pulse, take the twice of frequency of current pulse as the peak frequency. Follow the maximum frequency limitation.
*/
Spiking = 5,
/**
* Randomize frequency within range from previous frequency and current one.
*/
Randomize = 6,
/**
* Randomize frequency within minium and maximum frequency.
*/
Maniac = 7,
/**
* Synchronize changes of frequency with pulse width changes.
*/
Synchronized = 8,
}
export interface ControlPoint {
x: number;
y: number;
}
export interface Pulse {
order: number;
id: number;
offset: number;
width: number;
maniac: boolean;
frequency: number;
frequencyShifting: FrequencyShifting;
controlPoint1: ControlPoint;
controlPoint2: ControlPoint;
}
export function createPulse(order: number, width: number, frequency: number) {
return {
id: v4(),
order,
offset: 0,
width,
maniac: false,
frequency,
frequencyShifting: FrequencyShifting.Linear,
controlPoint1: { x: 0, y: 0 },
controlPoint2: { x: 0, y: 0 },
} as Pulse;
}
export interface Pattern {
id: string;
name: string;
createdAt: number;
lastModifiedAt: number | null;
smoothRepeat: boolean;
pulses: Pulse[];
}
export function createPattern() {
return {
id: v4(),
name: '',
createdAt: dayjs().valueOf(),
lastModifiedAt: null,
smoothRepeat: true,
pulses: [],
} as Pattern;
}
export function movePulseUp(pattern: Pattern, pulseId: string, step: number) {
const index = pattern.pulses.findIndex((pulse) => pulse.id === pulseId);
if (index === -1 || index - step < 0) return;
const targetIndex = index - step;
const targetPulse = pattern.pulses[targetIndex];
const currentPulse = pattern.pulses[index];
// Swap the pulses
pattern.pulses[targetIndex] = currentPulse;
pattern.pulses[index] = targetPulse;
// If the target pulse's order is 1, swap their offsets
if (targetPulse.order === 1) {
const tempOffset = currentPulse.offset;
currentPulse.offset = targetPulse.offset;
targetPulse.offset = tempOffset;
}
// Swap their order
const tempOrder = currentPulse.order;
currentPulse.order = targetPulse.order;
targetPulse.order = tempOrder;
// Sort pulses by order
pattern.pulses.sort((a, b) => a.order - b.order);
}
export function movePulseDown(pattern: Pattern, pulseId: string, step: number) {
const index = pattern.pulses.findIndex((pulse) => pulse.id === pulseId);
if (index === -1 || index + step >= pattern.pulses.length) return;
const targetIndex = index + step;
const targetPulse = pattern.pulses[targetIndex];
const currentPulse = pattern.pulses[index];
// Swap the pulses
pattern.pulses[targetIndex] = currentPulse;
pattern.pulses[index] = targetPulse;
// If the current pulse's order is 1, swap their offsets
if (currentPulse.order === 1) {
const tempOffset = currentPulse.offset;
currentPulse.offset = targetPulse.offset;
targetPulse.offset = tempOffset;
}
// Swap their order
const tempOrder = currentPulse.order;
currentPulse.order = targetPulse.order;
targetPulse.order = tempOrder;
// Sort pulses by order
pattern.pulses.sort((a, b) => a.order - b.order);
}
export function addPulse(pattern: Pattern): Pulse {
const maxOrder = reduce(pattern.pulses, (former, pulse) => Math.max(former, pulse.order), 0);
const newPulse = createPulse(
maxOrder + 1,
pattern.smoothRepeat
? get(pattern.pulses, '[0].width', 0)
: get(pattern.pulses, '[-1].width', 0),
pattern.smoothRepeat
? get(pattern.pulses, '[0].frequency', 1)
: get(pattern.pulses, '[-1].frequency', 1),
);
pattern.pulses.push(newPulse);
return newPulse;
}
export function updatePulse(pattern: Pattern, pulseId: string, pulse: Pulse) {
const index = pattern.pulses.findIndex((p) => p.id === pulseId);
if (index !== -1) {
const { id, order, ...rest } = pulse;
pattern.pulses[index] = { ...pattern.pulses[index], ...rest };
}
}
export function deletePulse(pattern: Pattern, pulseId: string) {
pattern.pulses = pattern.pulses.filter((pulse) => pulse.id !== pulseId);
pattern.pulses.sort((a, b) => a.order - b.order);
pattern.pulses.forEach((pulse, index) => {
pulse.order = index + 1;
});
}
export function durationRemains(pattern: Pattern): number {
return 20 * 1000 - totalDuration(pattern) - (pattern.smoothRepeat ? 100 : 0);
}
export function totalDuration(pattern: Pattern): number {
return reduce(
pattern.pulses,
(former, pulse) => former + pulse.offset,
pattern.smoothRepeat && pattern.pulses.length > 1 ? 100 : 0,
);
}

View File

@@ -12,6 +12,6 @@ export const defaultIconProps: Partial<IconProps> = {
}; };
export const smallIconProps: Partial<IconProps> = { export const smallIconProps: Partial<IconProps> = {
height: 16, height: 14,
stroke: 0.5, stroke: 0.5,
}; };

View File

@@ -31,9 +31,11 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
gap: calc(var(--spacing) * 1); gap: calc(var(--spacing) * 1);
font-size: var(--body-medium-font-size);
line-height: var(--body-medium-line-height);
font-weight: var(--body-medium-font-weight);
.device_name { .device_name {
flex: 1; flex: 1;
font-size: calc(var(--font-size) * 1.3);
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }

View File

@@ -18,7 +18,7 @@ const PatternHeader: FC = () => {
return ( return (
<div className={styles.pattern_header}> <div className={styles.pattern_header}>
<EditableContent <EditableContent
as="h3" as="h4"
placeholder="Pattern Name" placeholder="Pattern Name"
value={currentPattern?.name ?? null} value={currentPattern?.name ?? null}
additionalClassName={styles.content} additionalClassName={styles.content}

View File

@@ -5,7 +5,7 @@
flex-direction: column; flex-direction: column;
align-items: stretch; align-items: stretch;
gap: calc(var(--spacing)); gap: calc(var(--spacing));
padding: calc(var(--spacing) * 2) calc(var(--spacing)); padding: calc(var(--spacing) * 2) calc(var(--spacing) * 2);
border-radius: calc(var(--border-radius) * 2); border-radius: calc(var(--border-radius) * 2);
color: var(--color-on-surface); color: var(--color-on-surface);
background-color: var(--color-surface-container); background-color: var(--color-surface-container);
@@ -15,5 +15,8 @@
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
gap: calc(var(--spacing) * 2); gap: calc(var(--spacing) * 2);
font-size: var(--body-small-font-size);
line-height: var(--body-small-line-height);
font-weight: var(--body-small-font-weight);
} }
} }

View File

@@ -0,0 +1,53 @@
@layer pages {
.pulse_card {
display: flex;
flex-direction: row;
align-items: center;
gap: calc(var(--spacing) * 2);
color: var(--color-on-surface);
background-color: var(--color-surface);
border-radius: calc(var(--border-radius) * 2);
padding: 0;
.order {
padding: calc(var(--spacing) * 2) calc(var(--spacing) * 3);
background-color: var(--color-secondary-container);
color: var(--color-on-secondary-container);
border-top-left-radius: calc(var(--border-radius) * 2);
border-bottom-left-radius: calc(var(--border-radius) * 2);
}
.offset {
padding: calc(var(--spacing) * 2) calc(var(--spacing) * 3);
}
&.selected {
background-color: color-mix(in oklch, var(--color-on-surface) 18%, transparent);
.order {
background-color: color-mix(
in oklch,
var(--color-secondary-container) 88%,
var(--color-white)
);
}
}
&:hover {
background-color: color-mix(in oklch, var(--color-on-surface) 8%, transparent);
box-shadow: var(--elevation-2-ambient), var(--elevation-2-umbra);
.order {
background-color: color-mix(
in oklch,
var(--color-secondary-container) 60%,
var(--color-white)
);
}
}
&:active {
background-color: color-mix(in oklch, var(--color-on-surface) 18%, transparent);
.order {
background-color: color-mix(
in oklch,
var(--color-secondary-container) 68%,
var(--color-white)
);
}
}
}
}

View File

@@ -0,0 +1,34 @@
import cx from 'clsx';
import { useAtom } from 'jotai';
import { FC, useCallback } from 'react';
import { Pulse } from '../../context/pattern-model';
import { SelectedPulseIdAtom } from '../../context/Patterns';
import styles from './PulseCard.module.css';
type PulseCardProps = {
pulse: Pulse;
};
const PulseCard: FC<PulseCardProps> = ({ pulse }) => {
const [selected, setSelected] = useAtom(SelectedPulseIdAtom);
const handleSelect = useCallback(() => {
if (selected === pulse.id) {
setSelected(null);
} else {
setSelected(pulse.id);
}
}, [pulse, selected]);
return (
<div
className={cx(styles.pulse_card, selected === pulse.id && styles.selected)}
onClick={handleSelect}>
<div className={styles.order}>{pulse.order.toString().padStart(3, '0')}</div>
<div className="spacer" />
<div className={styles.offset}>+ {pulse.offset} ms</div>
</div>
);
};
export default PulseCard;

View File

@@ -5,14 +5,17 @@
justify-content: flex-end; justify-content: flex-end;
align-items: center; align-items: center;
gap: calc(var(--spacing) * 2); gap: calc(var(--spacing) * 2);
} .attribute_unit {
.attribute_unit { display: flex;
display: flex; flex-direction: row;
flex-direction: row; align-items: center;
align-items: center; gap: calc(var(--spacing));
gap: calc(var(--spacing)); font-size: var(--body-small-font-size);
label { line-height: var(--body-small-line-height);
font-weight: bold; font-weight: var(--body-small-font-weight);
label {
font-weight: 500;
}
} }
} }
.pulses { .pulses {

View File

@@ -1,38 +1,46 @@
import { Icon } from '@iconify/react/dist/iconify.js'; import { Icon } from '@iconify/react/dist/iconify.js';
import { useAtomValue } from 'jotai'; import { useAtom, useAtomValue } from 'jotai';
import { FC } from 'react'; import { max } from 'lodash-es';
import { FC, useCallback, useMemo } from 'react';
import { ScrollArea } from '../../components/ScrollArea'; import { ScrollArea } from '../../components/ScrollArea';
import { addPulse, deletePulse } from '../../context/pattern-model';
import { import {
CurrentPatternAtom, CurrentPatternAtom,
CurrentPatternDuration, CurrentPatternDuration,
PulsesInCurrentPatternAtom, SelectedPulseAtom,
useSavePattern,
} from '../../context/Patterns'; } from '../../context/Patterns';
import PulseCard from './PulseCard';
import styles from './PulseList.module.css'; import styles from './PulseList.module.css';
const PulseList: FC = () => { const PulseList: FC = () => {
const pattern = useAtomValue(CurrentPatternAtom); const [pattern, refreshPattern] = useAtom(CurrentPatternAtom);
const pulses = useAtomValue(PulsesInCurrentPatternAtom);
const duration = useAtomValue(CurrentPatternDuration); const duration = useAtomValue(CurrentPatternDuration);
const selectedPulse = useAtomValue(SelectedPulseAtom);
const maxPulseOrder = useMemo(
() => max(pattern?.pulses.map((pulse) => pulse.order) ?? []),
[pattern],
);
const savePattern = useSavePattern();
const handleAddPulseAction = useCallback(async () => {
if (!pattern) return;
addPulse(pattern);
await savePattern(pattern);
refreshPattern();
}, [pattern]);
const handleDeletePulseAction = useCallback(async () => {
if (!pattern || !selectedPulse) return;
deletePulse(pattern, selectedPulse.id);
await savePattern(pattern);
refreshPattern();
}, [pattern, selectedPulse]);
return ( return (
<> <>
<div className={styles.pulse_tools}>
<button className="text">
<Icon icon="material-symbols-light:play-arrow-outline" />
<span>Test Run</span>
</button>
<button className="text">
<Icon icon="material-symbols-light:add" />
<span>Add Pulse</span>
</button>
<button className="text">
<Icon icon="material-symbols-light:delete-forever-outline" />
<span>Delete Selected</span>
</button>
</div>
<div className={styles.pulse_tools}> <div className={styles.pulse_tools}>
<div className={styles.attribute_unit}> <div className={styles.attribute_unit}>
<span>{pulses.length ?? 0}</span> <span>{pattern?.pulses.length ?? 0}</span>
<label>Key Pulses</label> <label>Key Pulses</label>
</div> </div>
<div className={styles.attribute_unit}> <div className={styles.attribute_unit}>
@@ -40,10 +48,42 @@ const PulseList: FC = () => {
<span>{duration.toFixed(2)} s</span> <span>{duration.toFixed(2)} s</span>
</div> </div>
</div> </div>
<div className={styles.pulse_tools}>
<button className="text" disabled>
<Icon icon="material-symbols-light:play-arrow-outline" />
<span>Test Run</span>
</button>
<button className="text" onClick={handleAddPulseAction}>
<Icon icon="material-symbols-light:add" />
<span>Add Pulse</span>
</button>
<button className="text" onClick={handleDeletePulseAction} disabled={!selectedPulse}>
<Icon icon="material-symbols-light:delete-forever-outline" />
<span>Delete Selected</span>
</button>
</div>
<div className={styles.pulse_tools}>
<button className="text" disabled={!selectedPulse || selectedPulse.order === 1}>
<Icon icon="material-symbols-light:arrow-upward" />
<span>Move Up</span>
</button>
<button className="text" disabled={!selectedPulse || selectedPulse.order === maxPulseOrder}>
<Icon icon="material-symbols-light:arrow-downward" />
<span>Move Down</span>
</button>
</div>
<div className={styles.pulses}> <div className={styles.pulses}>
<ScrollArea enableY> <ScrollArea enableY>
<div className={styles.pulse_cards}> <div className={styles.pulse_cards}>
{pulses.length === 0 && <div className="empty_prompt">No key pulses.</div>} {pattern?.pulses.length === 0 ? (
<div className="empty_prompt">No key pulses.</div>
) : (
<>
{pattern?.pulses.map((pulse) => (
<PulseCard key={pulse.id} pulse={pulse} />
))}
</>
)}
</div> </div>
</ScrollArea> </ScrollArea>
</div> </div>

View File

@@ -6,13 +6,8 @@ import { FC, useCallback, useMemo } from 'react';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { NotificationType, useNotification } from '../../components/Notifications'; import { NotificationType, useNotification } from '../../components/Notifications';
import PatternPreview from '../../components/PatternPreview'; import PatternPreview from '../../components/PatternPreview';
import { import { CurrentPatternAtom, PatternsAtom, SelectedPatternIdAtom } from '../../context/Patterns';
CurrentPatternAtom, import { Pattern, totalDuration } from '../../context/pattern-model';
Pattern,
PatternsAtom,
SelectedPatternIdAtom,
totalDuration,
} from '../../context/Patterns';
import styles from './PatternDetail.module.css'; import styles from './PatternDetail.module.css';
const EmptyPromption: FC = () => { const EmptyPromption: FC = () => {

View File

@@ -5,13 +5,8 @@ import { FC, useCallback, useMemo, useState } from 'react';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { useDebounce } from 'react-use'; import { useDebounce } from 'react-use';
import { ScrollArea } from '../../components/ScrollArea'; import { ScrollArea } from '../../components/ScrollArea';
import { import { PatternsAtom, SearchKeywordAtom, SelectedPatternIdAtom } from '../../context/Patterns';
Pattern, import { Pattern, totalDuration } from '../../context/pattern-model';
PatternsAtom,
SearchKeywordAtom,
SelectedPatternIdAtom,
totalDuration,
} from '../../context/Patterns';
import styles from './Patterns.module.css'; import styles from './Patterns.module.css';
const PatternCard: FC<{ pattern: Pattern }> = ({ pattern }) => { const PatternCard: FC<{ pattern: Pattern }> = ({ pattern }) => {

View File

@@ -2,6 +2,7 @@ import { useAtomValue } from 'jotai';
import { FC, useMemo } from 'react'; import { FC, useMemo } from 'react';
import { BleState } from '../../context/EstimContext'; import { BleState } from '../../context/EstimContext';
import IconBluetooth from '../../icons/IconBluetooth'; import IconBluetooth from '../../icons/IconBluetooth';
import { smallIconProps } from '../../icons/shared-props';
const BleStates: FC = () => { const BleStates: FC = () => {
const ble = useAtomValue(BleState); const ble = useAtomValue(BleState);
@@ -19,7 +20,7 @@ const BleStates: FC = () => {
return ( return (
<IconBluetooth <IconBluetooth
height={16} {...smallIconProps}
ready={ble.ready} ready={ble.ready}
searching={ble.searching} searching={ble.searching}
connected={ble.connected?.length > 0} connected={ble.connected?.length > 0}

View File

@@ -5,6 +5,8 @@
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
gap: calc(var(--spacing)); gap: calc(var(--spacing));
font-size: calc(var(--font-size) * 1.4); font-size: var(--label-medium-font-size);
line-height: var(--label-medium-line-height);
font-weight: var(--label-medium-font-weight);
} }
} }

View File

@@ -3,14 +3,15 @@ import { FC } from 'react';
import { DeviceState } from '../../context/EstimContext'; import { DeviceState } from '../../context/EstimContext';
import IconBattery from '../../icons/IconBattery'; import IconBattery from '../../icons/IconBattery';
import IconRssi from '../../icons/IconRssi'; import IconRssi from '../../icons/IconRssi';
import { smallIconProps } from '../../icons/shared-props';
const DeviceStates: FC = () => { const DeviceStates: FC = () => {
const deviceState = useAtomValue(DeviceState); const deviceState = useAtomValue(DeviceState);
return ( return (
<> <>
<IconRssi height={16} level={deviceState?.rssi} /> <IconRssi {...smallIconProps} level={deviceState?.rssi} />
<IconBattery height={16} level={deviceState?.battery} /> <IconBattery {...smallIconProps} level={deviceState?.battery} />
</> </>
); );
}; };

View File

@@ -8,6 +8,8 @@
justify-content: flex-end; justify-content: flex-end;
align-items: center; align-items: center;
gap: calc(var(--spacing) * 4); gap: calc(var(--spacing) * 4);
font-size: calc(var(--font-size) * 1.6); font-size: var(--label-small-font-size);
line-height: var(--label-small-line-height);
font-weight: var(--label-small-font-weight);
} }
} }

View File

@@ -3,7 +3,7 @@ import { useSetAtom } from 'jotai';
import { FC, useActionState } from 'react'; import { FC, useActionState } from 'react';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
import { NotificationType, ToastDuration, useNotification } from '../components/Notifications'; import { NotificationType, ToastDuration, useNotification } from '../components/Notifications';
import { Pattern, SelectedPatternIdAtom, useSavePattern } from '../context/Patterns'; import { SelectedPatternIdAtom, useSavePattern } from '../context/Patterns';
import styles from './CreatePattern.module.css'; import styles from './CreatePattern.module.css';
const CreatePattern: FC = () => { const CreatePattern: FC = () => {

View File

@@ -3,9 +3,9 @@
@layer base { @layer base {
:root { :root {
font-family: var(--font-family); font-family: var(--font-family);
font-size: var(--font-size); font-size: var(--root-font-size);
line-height: var(--line-height); line-height: var(--root-line-height);
font-weight: 400; font-weight: var(--root-font-weight);
width: 100vw; width: 100vw;
height: 100vh; height: 100vh;

View File

@@ -14,7 +14,9 @@
.empty_prompt { .empty_prompt {
padding-block: calc(var(--spacing) * 1); padding-block: calc(var(--spacing) * 1);
text-align: center; text-align: center;
font-size: calc(var(--font-size) * 0.8); font-size: var(--body-extra-small-font-size);
line-height: var(--body-extra-small-line-height);
font-weight: var(--body-extra-small-font-weight);
color: var(--color-on-surface-variant); color: var(--color-on-surface-variant);
} }
} }

View File

@@ -1,7 +1,5 @@
@layer theme { @layer theme {
:root { :root {
--font-family: 'Inter', system-ui, Avenir, Helvetica, Arial, sans-serif;
--color-white: #ffffff; --color-white: #ffffff;
--color-black: #000000; --color-black: #000000;
--color-primary: light-dark(#744c1f, #ffe6b1); --color-primary: light-dark(#744c1f, #ffe6b1);
@@ -333,6 +331,79 @@
--font-size: 10px; --font-size: 10px;
--line-height: 1.2em; --line-height: 1.2em;
--font-family: 'Inter', system-ui, Avenir, Helvetica, Arial, sans-serif;
--root-font-size: 16px;
--root-line-height: 1.2;
--root-font-weight: 400;
--display-large-font-size: 3.5625rem;
--display-large-line-height: 1.1228;
--display-large-font-weight: 400;
--display-medium-font-size: 2.8125rem;
--display-medium-line-height: 1.1556;
--display-medium-font-weight: 400;
--display-small-font-size: 2.25rem;
--display-small-line-height: 1.2222;
--display-small-font-weight: 400;
--headline-large-font-size: 2rem;
--headline-large-line-height: 1.25;
--headline-large-font-weight: 400;
--headline-medium-font-size: 1.75rem;
--headline-medium-line-height: 1.2857;
--headline-medium-font-weight: 400;
--headline-small-font-size: 1.5rem;
--headline-small-line-height: 1.3333;
--headline-small-font-weight: 400;
--title-large-font-size: 1.375rem;
--title-large-line-height: 1.2727;
--title-large-font-weight: 400;
--title-medium-font-size: 1rem;
--title-medium-line-height: 1.5;
--title-medium-font-weight: 400;
--title-small-font-size: 0.875rem;
--title-small-line-height: 1.4286;
--title-small-font-weight: 500;
--body-large-font-size: 1rem;
--body-large-line-height: 1.5;
--body-large-font-weight: 400;
--body-medium-font-size: 0.875rem;
--body-medium-line-height: 1.4286;
--body-medium-font-weight: 400;
--body-small-font-size: 0.75rem;
--body-small-line-height: 1.3333;
--body-small-font-weight: 400;
--body-extra-small-font-size: 0.625rem;
--body-extra-small-line-height: 1.2;
--body-extra-small-font-weight: 400;
--body-extrime-small-font-size: 0.5rem;
--body-extrime-small-line-height: 1;
--body-extrime-small-font-weight: 400;
--label-large-font-size: 0.875rem;
--label-large-line-height: 1.4286;
--label-large-font-weight: 500;
--label-medium-font-size: 0.75rem;
--label-medium-line-height: 1.3333;
--label-medium-font-weight: 500;
--label-small-font-size: 0.6875rem;
--label-small-line-height: 1.4545;
--label-small-font-weight: 400;
--elevation-0: none; --elevation-0: none;
--elevation-1-ambient: 0 1px 3px 1px color-mix(in oklch, var(--color-shadow) 15%, transparent); --elevation-1-ambient: 0 1px 3px 1px color-mix(in oklch, var(--color-shadow) 15%, transparent);
--elevation-1-umbra: 0 1px 2px 0px color-mix(in oklch, var(--color-shadow) 30%, transparent); --elevation-1-umbra: 0 1px 2px 0px color-mix(in oklch, var(--color-shadow) 30%, transparent);