forked from Blendman974/faceclaw
Correctness: - Pair-glasses flows no longer strand the app in the manual-disconnected state: the pre-scan disconnect is followed by resumeAutoReconnect(), and the config page's scan hand-off drops the live link too. - The mixed-arms serial warning is reachable now: pairs() groups by the canonical serial key, and a lone left + lone right with different serials get the mismatch warning on both rows (it previously required two different serials inside one serial-keyed group, which cannot happen). - A selected pair that degrades to one arm (prune while the page is open) is deselected, and Save never pads a missing arm from stored addresses. - DiscoveryAggregator.ingest no longer lets a bonded re-emit or split advertisement overwrite the note/name/flag learned from a full advertisement, and reclassifies split reports using remembered fields so a nameless half doesn't drop the arm. - estimateProximity ignores the advertised TX Power Level (radiated power, not measured-power-at-1m); the calibration table is the only reference. - Saving a ring without a glasses pair updates the stored identity's ring name/address instead of leaving the previous ring on record. - Ring detection requires the stock "EVEN R1" name prefix in both the TS classifier and the Java pre-filter; a bare "R1" substring matched unrelated devices, and ring rows are always selectable. - One-shot scans keep every sample (buildAddressSet merges them through DiscoveryAggregator), and flash-flow address resolution takes left/right from one serial-joined complete pair instead of latest-per-role. Lifecycle: - The pairing scan and its refresh timer pause on app suspend and resume with the app, and the model's app-event hooks are detached when the page is left for good. Cleanup: - One MAC normalizer (even-advertisement.normalizeMacAddress, re-exported by device-addresses), used for the ring "Yours" comparison too. - One serial-equality definition (serialKey/serialsMatch); the containment fallback in isPreviouslyPaired is gone. - Shared formatErrorMessage replaces five per-view-model copies; shared hex-util replaces the duplicate TS hex codecs; one Java bytesToHex in FaceclawFirmwareUtil replaces three hand-rolled encoders. - glassesRow/ringRow share a presentation-base helper; dead row address fields, the constant glassesSectionVisibility, the identical-branch status ternary, and zoneRank/ZONE_ORDER are removed. - .gitignore now actually covers .test-build/ as tests/README claims. UI: - Dark-mode styles for the pairing page: readable instructions, dark-gray cards with consistent light text; light mode keeps its current look. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_016ZqzwmRQ3HQxasBz5rYyZV
265 lines
4.2 KiB
CSS
265 lines
4.2 KiB
CSS
@import '@nativescript/theme/css/core.css';
|
|
@import '@nativescript/theme/css/default.css';
|
|
|
|
Page {
|
|
background-color: #ffffff;
|
|
color: #222222;
|
|
}
|
|
|
|
ActionBar {
|
|
background-color: #424242;
|
|
color: #ffffff;
|
|
}
|
|
|
|
ActionItem {
|
|
color: #ffffff;
|
|
}
|
|
|
|
TextField {
|
|
background-color: #ffffff;
|
|
color: #222222;
|
|
}
|
|
|
|
.system-name-modal TextField {
|
|
background-color: #ffffff;
|
|
color: #222222;
|
|
}
|
|
|
|
Button.-primary {
|
|
font-size: 18;
|
|
}
|
|
|
|
/*
|
|
* Stands in for the lens preview when showing it would be misleading (silent
|
|
* mode, or a disconnect explained by a flat battery). Sized by the view model
|
|
* to the preview's own box so the form doesn't reflow, and kept dark so it
|
|
* reads as "where the preview goes" rather than as a page-level banner.
|
|
*/
|
|
.display-preview-message {
|
|
background-color: #222222;
|
|
color: #ffffff;
|
|
padding: 16;
|
|
}
|
|
|
|
.display-preview-message Label {
|
|
font-size: 18;
|
|
text-align: center;
|
|
}
|
|
|
|
.system-name-modal {
|
|
margin: 16;
|
|
padding: 16;
|
|
background-color: #f6f6f6;
|
|
color: #222222;
|
|
border-color: #222222;
|
|
border-width: 1;
|
|
border-radius: 8;
|
|
}
|
|
|
|
/*
|
|
* Pairing scan list (phone-ui/pairing-page). Rows are Repeater items: product
|
|
* art (or a colourway swatch) on the left, decoded SKU + proximity + serial in
|
|
* the middle, a chevron/check on the right.
|
|
*/
|
|
.pairing-instructions {
|
|
color: #555555;
|
|
font-size: 14;
|
|
}
|
|
|
|
.pairing-status {
|
|
font-size: 14;
|
|
margin-left: 8;
|
|
}
|
|
|
|
.pairing-section {
|
|
font-size: 16;
|
|
font-weight: bold;
|
|
margin-bottom: 4;
|
|
}
|
|
|
|
.pairing-empty {
|
|
color: #777777;
|
|
font-size: 14;
|
|
padding: 8 0;
|
|
}
|
|
|
|
.pairing-row {
|
|
background-color: #f4f4f4;
|
|
border-color: #dddddd;
|
|
border-width: 1;
|
|
border-radius: 10;
|
|
padding: 10;
|
|
margin-bottom: 8;
|
|
}
|
|
|
|
.pairing-row-selected {
|
|
background-color: #e6f0ff;
|
|
border-color: #3b6fd6;
|
|
}
|
|
|
|
.pairing-row-incomplete {
|
|
background-color: #fafafa;
|
|
border-color: #e6e6e6;
|
|
}
|
|
|
|
.pairing-art {
|
|
vertical-align: center;
|
|
}
|
|
|
|
.pairing-title {
|
|
font-size: 16;
|
|
font-weight: bold;
|
|
color: #222222;
|
|
}
|
|
|
|
.pairing-badge {
|
|
font-size: 11;
|
|
font-weight: bold;
|
|
color: #2a5bc4;
|
|
background-color: #dbe6fb;
|
|
border-radius: 9;
|
|
padding: 1 7;
|
|
}
|
|
|
|
.pairing-variant {
|
|
font-size: 13;
|
|
font-weight: bold;
|
|
color: #333333;
|
|
}
|
|
|
|
.pairing-proximity {
|
|
font-size: 12;
|
|
color: #666666;
|
|
}
|
|
|
|
.pairing-proximity-immediate {
|
|
color: #2a5bc4;
|
|
font-weight: bold;
|
|
}
|
|
|
|
.pairing-serial {
|
|
font-size: 12;
|
|
color: #666666;
|
|
font-family: monospace;
|
|
}
|
|
|
|
.pairing-arms {
|
|
font-size: 12;
|
|
color: #444444;
|
|
}
|
|
|
|
.pairing-warning {
|
|
font-size: 12;
|
|
color: #a33a1f;
|
|
margin-top: 4;
|
|
}
|
|
|
|
.pairing-swatch-label {
|
|
font-size: 11;
|
|
color: #555555;
|
|
}
|
|
|
|
.pairing-chevron {
|
|
font-size: 22;
|
|
color: #444444;
|
|
margin-left: 6;
|
|
}
|
|
|
|
.pairing-selection {
|
|
background-color: #eef4ff;
|
|
border-radius: 10;
|
|
padding: 10;
|
|
}
|
|
|
|
.pairing-diagnostics {
|
|
font-size: 11;
|
|
color: #888888;
|
|
font-family: monospace;
|
|
}
|
|
|
|
Button.pairing-link {
|
|
background-color: transparent;
|
|
color: #2a5bc4;
|
|
font-size: 14;
|
|
border-width: 0;
|
|
}
|
|
|
|
/*
|
|
* Dark-mode pairing page. The cards keep their light-mode look above; here
|
|
* they go dark-gray, and every text colour set above gets a light counterpart
|
|
* so nothing renders dark-on-dark (the instructions) or dark-on-a-dark-card.
|
|
* Order matters: the -selected/-incomplete rules must follow .pairing-row so
|
|
* they win at equal specificity.
|
|
*/
|
|
.ns-dark .pairing-instructions {
|
|
color: #b0b0b0;
|
|
}
|
|
|
|
.ns-dark .pairing-empty {
|
|
color: #999999;
|
|
}
|
|
|
|
.ns-dark .pairing-row {
|
|
background-color: #2e2e2e;
|
|
border-color: #4a4a4a;
|
|
}
|
|
|
|
.ns-dark .pairing-row-selected {
|
|
background-color: #333c4c;
|
|
border-color: #5b8def;
|
|
}
|
|
|
|
.ns-dark .pairing-row-incomplete {
|
|
background-color: #282828;
|
|
border-color: #3c3c3c;
|
|
}
|
|
|
|
.ns-dark .pairing-title {
|
|
color: #f0f0f0;
|
|
}
|
|
|
|
.ns-dark .pairing-badge {
|
|
color: #a8c4f5;
|
|
background-color: #2a3b5e;
|
|
}
|
|
|
|
.ns-dark .pairing-variant {
|
|
color: #cccccc;
|
|
}
|
|
|
|
.ns-dark .pairing-proximity {
|
|
color: #a0a0a0;
|
|
}
|
|
|
|
.ns-dark .pairing-proximity-immediate {
|
|
color: #7da7f5;
|
|
}
|
|
|
|
.ns-dark .pairing-serial {
|
|
color: #a0a0a0;
|
|
}
|
|
|
|
.ns-dark .pairing-arms {
|
|
color: #c0c0c0;
|
|
}
|
|
|
|
.ns-dark .pairing-warning {
|
|
color: #e08a66;
|
|
}
|
|
|
|
.ns-dark .pairing-swatch-label {
|
|
color: #aaaaaa;
|
|
}
|
|
|
|
.ns-dark .pairing-chevron {
|
|
color: #bbbbbb;
|
|
}
|
|
|
|
.ns-dark .pairing-selection {
|
|
background-color: #2e2e2e;
|
|
}
|
|
|
|
.ns-dark Button.pairing-link {
|
|
color: #7da7f5;
|
|
}
|