From 58990d9617a0069eb0822f710e86b1f02015e063 Mon Sep 17 00:00:00 2001 From: James Babcock Date: Sat, 10 Oct 2026 17:34:06 -0700 Subject: [PATCH] Fix iOS styling issues on pairing screen --- app/app.css | 237 +-------------------------------- app/app.ios.css | 142 +------------------- app/phone-ui/pairing-page.xml | 4 +- app/phone-ui/pairing.css | 238 ++++++++++++++++++++++++++++++++++ 4 files changed, 242 insertions(+), 379 deletions(-) create mode 100644 app/phone-ui/pairing.css diff --git a/app/app.css b/app/app.css index d1f86d93..9c8460c5 100644 --- a/app/app.css +++ b/app/app.css @@ -1,6 +1,7 @@ @import '@nativescript/theme/css/core.css'; @import '@nativescript/theme/css/default.css'; @import './phone-ui/remote-controls.css'; +@import './phone-ui/pairing.css'; Page { background-color: #ffffff; @@ -183,242 +184,6 @@ Button.-primary { margin-bottom: 12; } -/* - * 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; -} - -Button.pairing-link { - background-color: transparent; - color: #2a5bc4; - font-size: 14; - border-width: 0; - /* Buttons keep their Material elevation shadow even with a transparent - * background, which shows up as a stray, downward-offset outline. */ - android-elevation: 0; - android-dynamic-elevation-offset: 0; -} - -/* - * Permissions screen (phone-ui/permissions-page). Cards reuse the pairing-row - * / pairing-title / pairing-badge look above; these add the explanation body - * and the already-granted checkmark. - */ -.permissions-description { - font-size: 13; - color: #555555; - margin-top: 2; -} - -.permissions-check { - font-size: 24; - color: #2e7d32; - margin-left: 10; -} - -/* Continue with required permissions still missing: looks disabled but stays - * tappable (the tap raises an are-you-sure prompt instead of being ignored). */ -Button.permissions-primary-dimmed { - opacity: 0.45; -} - -/* - * 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; -} - -.ns-dark .permissions-description { - color: #b0b0b0; -} - -.ns-dark .permissions-check { - color: #7bc47f; -} - /* * Conversation review (phone-ui/conversations-page, conversation-page, * speakers-page). Cards follow the pairing-row look; speaker/emotion chips diff --git a/app/app.ios.css b/app/app.ios.css index 17bcf99b..3f433cc5 100644 --- a/app/app.ios.css +++ b/app/app.ios.css @@ -1,146 +1,6 @@ @import '@nativescript/theme/css/core.css'; @import './phone-ui/remote-controls.css'; - -.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; -} - -Button.pairing-link { - background-color: transparent; - color: #2a5bc4; - font-size: 14; - border-width: 0; -} - -/* - * Permissions screen (phone-ui/permissions-page). Cards reuse the pairing-row - * / pairing-title / pairing-badge look above; these add the explanation body - * and the already-granted checkmark. - */ -.permissions-description { - font-size: 13; - color: #555555; - margin-top: 2; -} - -.permissions-check { - font-size: 24; - color: #2e7d32; - margin-left: 10; -} - -/* Continue with required permissions still missing: looks disabled but stays - * tappable (the tap raises an are-you-sure prompt instead of being ignored). */ -Button.permissions-primary-dimmed { - opacity: 0.45; -} - +@import './phone-ui/pairing.css'; .body-text { font-size: 18; } .h1 { font-size: 28; font-weight: bold; } diff --git a/app/phone-ui/pairing-page.xml b/app/phone-ui/pairing-page.xml index b1704d29..60af9a44 100644 --- a/app/phone-ui/pairing-page.xml +++ b/app/phone-ui/pairing-page.xml @@ -82,8 +82,8 @@