forked from Blendman974/faceclaw
Simulated watch and ring touchpads don't have arrow-buttons; simulated ring has decorative markings
This commit is contained in:
1 parent
d9baf678fc
commit
b0238df174
4 files changed
+24
-70
No files matched your search
@@ -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
|
||||
|
||||
|
||||
+10
-13
@@ -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
|
||||
|
||||
@@ -846,14 +846,6 @@ export class MainViewModel extends Observable {
|
||||
dashboardController.openEvenAppSettings();
|
||||
}
|
||||
|
||||
async onSyntheticUpTap(): Promise<void> {
|
||||
await dashboardController.injectSyntheticRingInput("scroll-up");
|
||||
}
|
||||
|
||||
async onSyntheticDownTap(): Promise<void> {
|
||||
await dashboardController.injectSyntheticRingInput("scroll-down");
|
||||
}
|
||||
|
||||
async onRingPadTap(): Promise<void> {
|
||||
await dashboardController.injectSyntheticRingInput("click");
|
||||
}
|
||||
@@ -939,41 +931,6 @@ export class MainViewModel extends Observable {
|
||||
}
|
||||
}
|
||||
|
||||
async onDpadUp(): Promise<void> {
|
||||
await dashboardController.injectSyntheticRingInput("swipe-up", "watch");
|
||||
this.refreshPadFocusLine();
|
||||
}
|
||||
|
||||
async onDpadDown(): Promise<void> {
|
||||
await dashboardController.injectSyntheticRingInput("swipe-down", "watch");
|
||||
this.refreshPadFocusLine();
|
||||
}
|
||||
|
||||
async onDpadLeft(): Promise<void> {
|
||||
await dashboardController.injectSyntheticRingInput("swipe-left", "watch");
|
||||
this.refreshPadFocusLine();
|
||||
}
|
||||
|
||||
async onDpadRight(): Promise<void> {
|
||||
await dashboardController.injectSyntheticRingInput("swipe-right", "watch");
|
||||
this.refreshPadFocusLine();
|
||||
}
|
||||
|
||||
async onDpadSelect(): Promise<void> {
|
||||
await dashboardController.injectSyntheticRingInput("click", "watch");
|
||||
this.refreshPadFocusLine();
|
||||
}
|
||||
|
||||
async onBackTap(): Promise<void> {
|
||||
await dashboardController.injectSyntheticRingInput("double-click", "watch");
|
||||
this.refreshPadFocusLine();
|
||||
}
|
||||
|
||||
async onMenuTap(): Promise<void> {
|
||||
await dashboardController.injectSyntheticRingInput("long-press", "watch");
|
||||
this.refreshPadFocusLine();
|
||||
}
|
||||
|
||||
// ---- touching the mirror itself ----
|
||||
|
||||
// Toggled from Settings > Phone display > Touch mirror; read per gesture,
|
||||
|
||||
@@ -50,27 +50,26 @@
|
||||
<StackLayout row="1" visibility="{{ watchTabVisibility }}" width="{{ watchFaceWidth }}" horizontalAlignment="center" verticalAlignment="center">
|
||||
<GridLayout class="touchpad" tap="{{ onPadTap }}" doubleTap="{{ onPadDoubleTap }}" longPress="{{ onPadLongPress }}" swipe="{{ onPadSwipe }}" touch="{{ onPadTouch }}">
|
||||
<Label text="{{ padFocusLine }}" class="pad-focus" horizontalAlignment="center" verticalAlignment="center" />
|
||||
<Label text="● select ●● back ‒ menu" class="pad-legend" horizontalAlignment="center" verticalAlignment="bottom" />
|
||||
<Button text="▲" tap="{{ onDpadUp }}" class="pad-dpad-button" horizontalAlignment="center" verticalAlignment="top" />
|
||||
<Button text="▼" tap="{{ onDpadDown }}" class="pad-dpad-button pad-dpad-down" horizontalAlignment="center" verticalAlignment="bottom" />
|
||||
<Button text="◀" tap="{{ onDpadLeft }}" class="pad-dpad-button" horizontalAlignment="left" verticalAlignment="center" />
|
||||
<Button text="▶" tap="{{ onDpadRight }}" class="pad-dpad-button" horizontalAlignment="right" verticalAlignment="center" />
|
||||
</GridLayout>
|
||||
<GridLayout rows="auto" columns="*,*" class="action-row">
|
||||
<Button col="0" text="Back" tap="{{ onBackTap }}" class="action-button" />
|
||||
<Button col="1" text="Menu" tap="{{ onMenuTap }}" class="action-button" />
|
||||
<Label text="▲▼ swipe ● select ●● back ‒ menu" class="pad-legend" horizontalAlignment="center" verticalAlignment="bottom" />
|
||||
</GridLayout>
|
||||
</StackLayout>
|
||||
|
||||
<!-- Ring tab: a touchpad on the ring's own scheme. Vertical swipes only
|
||||
(the ring has no horizontal axis) and no focus/status line; portrait
|
||||
like the ring's pad itself, so the legend sits in the middle where the
|
||||
watch pad keeps its focus line. -->
|
||||
like the ring's pad itself. The auto rows hold the cosmetic markings the
|
||||
physical ring has on its touch strip (they don't take touches); the star
|
||||
rows are the seven equal gaps around them, edges included. -->
|
||||
<GridLayout row="1" visibility="{{ ringTabVisibility }}" class="touchpad ring-touchpad"
|
||||
rows="*,auto,*,auto,*,auto,*,auto,*,auto,*,auto,*"
|
||||
horizontalAlignment="center" verticalAlignment="center"
|
||||
tap="{{ onRingPadTap }}" doubleTap="{{ onRingPadDoubleTap }}"
|
||||
longPress="{{ onRingPadLongPress }}" swipe="{{ onRingPadSwipe }}">
|
||||
<Button text="▲" tap="{{ onSyntheticUpTap }}" class="pad-dpad-button" horizontalAlignment="center" verticalAlignment="top" />
|
||||
<Button text="▼" tap="{{ onSyntheticDownTap }}" class="pad-dpad-button" horizontalAlignment="center" verticalAlignment="bottom" />
|
||||
<Label row="1" class="ring-pad-marking" isUserInteractionEnabled="false" />
|
||||
<Label row="3" class="ring-pad-marking" isUserInteractionEnabled="false" />
|
||||
<Label row="5" class="ring-pad-marking" isUserInteractionEnabled="false" />
|
||||
<Label row="7" class="ring-pad-marking" isUserInteractionEnabled="false" />
|
||||
<Label row="9" class="ring-pad-marking" isUserInteractionEnabled="false" />
|
||||
<Label row="11" class="ring-pad-marking" isUserInteractionEnabled="false" />
|
||||
</GridLayout>
|
||||
|
||||
</GridLayout>
|
||||
Reference in new issue
Block a user