diff --git a/CHANGELOG b/CHANGELOG index 0613de86..ea7dd5e4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,7 +3,8 @@ ## 0.6.2 - Future * Preview Only mode works * Voice input uses phone mic in preview mode -* Ring input on phone screen is swipe-style rather than separate buttons +* Simulated ring input on phone screen is swipe-style rather than separate buttons +* Simulated watch input on phone screen is more minimalist * Fix an issue where you could be missing the EvenHub font after skipping onboarding * Terminal app has an activity indicator based on last-output-at tracking diff --git a/app/app.css b/app/app.css index 8296f537..72804c5e 100644 --- a/app/app.css +++ b/app/app.css @@ -239,19 +239,6 @@ Button.-primary { font-size: 20; color: #ffffff; } -.pad-dpad-button { - width: 46; - height: 46; - margin: 6; - padding: 0; - font-size: 16; - border-radius: 23; - background-color: #333333; - color: #e8e8e8; -} -.pad-dpad-down { - margin-bottom: 30; -} .pad-legend { font-size: 11; color: #8a8a8a; @@ -269,6 +256,16 @@ Button.-primary { width: 150; height: 250; } +/* Cosmetic marks mirroring the six rectangles on the physical ring's touch + strip; barely lighter than the pad so they read as texture, not buttons. */ +.ring-pad-marking { + width: 18; + height: 5; + border-radius: 2; + background-color: #2a2a2a; + horizontal-align: center; + vertical-align: center; +} /* * 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 diff --git a/app/phone-ui/main-view-model.ts b/app/phone-ui/main-view-model.ts index c7d2f846..a854727f 100644 --- a/app/phone-ui/main-view-model.ts +++ b/app/phone-ui/main-view-model.ts @@ -846,14 +846,6 @@ export class MainViewModel extends Observable { dashboardController.openEvenAppSettings(); } - async onSyntheticUpTap(): Promise { - await dashboardController.injectSyntheticRingInput("scroll-up"); - } - - async onSyntheticDownTap(): Promise { - await dashboardController.injectSyntheticRingInput("scroll-down"); - } - async onRingPadTap(): Promise { await dashboardController.injectSyntheticRingInput("click"); } @@ -939,41 +931,6 @@ export class MainViewModel extends Observable { } } - async onDpadUp(): Promise { - await dashboardController.injectSyntheticRingInput("swipe-up", "watch"); - this.refreshPadFocusLine(); - } - - async onDpadDown(): Promise { - await dashboardController.injectSyntheticRingInput("swipe-down", "watch"); - this.refreshPadFocusLine(); - } - - async onDpadLeft(): Promise { - await dashboardController.injectSyntheticRingInput("swipe-left", "watch"); - this.refreshPadFocusLine(); - } - - async onDpadRight(): Promise { - await dashboardController.injectSyntheticRingInput("swipe-right", "watch"); - this.refreshPadFocusLine(); - } - - async onDpadSelect(): Promise { - await dashboardController.injectSyntheticRingInput("click", "watch"); - this.refreshPadFocusLine(); - } - - async onBackTap(): Promise { - await dashboardController.injectSyntheticRingInput("double-click", "watch"); - this.refreshPadFocusLine(); - } - - async onMenuTap(): Promise { - await dashboardController.injectSyntheticRingInput("long-press", "watch"); - this.refreshPadFocusLine(); - } - // ---- touching the mirror itself ---- // Toggled from Settings > Phone display > Touch mirror; read per gesture, diff --git a/app/phone-ui/remote-controls.xml b/app/phone-ui/remote-controls.xml index 0213682e..276df11a 100644 --- a/app/phone-ui/remote-controls.xml +++ b/app/phone-ui/remote-controls.xml @@ -50,27 +50,26 @@