mirror of
https://git.undefined-dev.fr/Blendman974/faceclaw.git
synced 2026-11-19 21:03:09 +00:00
Add a phone preview Rotation setting; improve landscape layout
This commit is contained in:
1 parent
3d39d27456
commit
1154474754
9 files changed
+165
-74
No files matched your search
@@ -4,6 +4,7 @@
|
||||
* Navigate and terminal app: App-specific screen size/position setting
|
||||
* Transcribe app: Scrolling; automatic reconnection; insert newlines
|
||||
* Notifications: Add notification filters
|
||||
* Phone screen preview: Add rotation option; improve landscape layout
|
||||
|
||||
## 0.6.5 - 2026-09-04
|
||||
* Changed context menu gestures: — for system, ●— for app context menu.
|
||||
|
||||
+21
@@ -201,6 +201,27 @@ Button.-primary {
|
||||
height: 20;
|
||||
tint-color: #333333;
|
||||
}
|
||||
/* Landscape uses the full page height and a shared left edge for tabs/pad. */
|
||||
.landscape-layout .remote-controls {
|
||||
margin: 0;
|
||||
}
|
||||
.landscape-layout .controls-tab-bar {
|
||||
margin-bottom: 2;
|
||||
}
|
||||
.landscape-layout .tab-button {
|
||||
margin-left: 1;
|
||||
margin-right: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
.landscape-layout .tab-button[col="0"] {
|
||||
margin-left: 0;
|
||||
}
|
||||
.landscape-layout .tab-icon-button {
|
||||
width: 48;
|
||||
}
|
||||
.landscape-layout .tab-icon-button[col="4"] {
|
||||
margin-right: 0;
|
||||
}
|
||||
.ns-dark .tab-icon {
|
||||
tint-color: #cccccc;
|
||||
}
|
||||
|
||||
@@ -7,9 +7,11 @@ purpose of the file is to pass control to the app’s first module.
|
||||
import { Application } from '@nativescript/core'
|
||||
import { registerShareIntentHandler } from './native/share-intents'
|
||||
import { installNativeUserAgent } from './util/http'
|
||||
import { registerPhoneRotation } from './native/phone-rotation'
|
||||
|
||||
installNativeUserAgent()
|
||||
registerShareIntentHandler()
|
||||
registerPhoneRotation()
|
||||
|
||||
Application.run({ moduleName: 'app-root' })
|
||||
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
import { Application, isAndroid } from "@nativescript/core";
|
||||
import { getStringSetting, onSettingsStoreChanged } from "./settings-store";
|
||||
|
||||
// Shared with phoneRotationSetting; keep startup independent of the glasses UI.
|
||||
const ROTATION_KEY = "phone.rotation";
|
||||
|
||||
/** Installed once on the UI thread; also covers navigation and activity recreation. */
|
||||
export function registerPhoneRotation(): void {
|
||||
if (!isAndroid) return;
|
||||
|
||||
const apply = (activity = Application.android.foregroundActivity ?? Application.android.startActivity): void => {
|
||||
if (!activity) return;
|
||||
const orientations = android.content.pm.ActivityInfo;
|
||||
const requested = {
|
||||
auto: orientations.SCREEN_ORIENTATION_UNSPECIFIED,
|
||||
portrait: orientations.SCREEN_ORIENTATION_PORTRAIT,
|
||||
landscape: orientations.SCREEN_ORIENTATION_SENSOR_LANDSCAPE,
|
||||
}[getStringSetting(ROTATION_KEY, "auto")] ?? orientations.SCREEN_ORIENTATION_UNSPECIFIED;
|
||||
if (activity.getRequestedOrientation() !== requested) {
|
||||
activity.setRequestedOrientation(requested);
|
||||
}
|
||||
};
|
||||
|
||||
Application.android.on(Application.android.activityCreatedEvent, (args) => apply(args.activity));
|
||||
Application.android.on(Application.android.activityResumedEvent, (args) => apply(args.activity));
|
||||
onSettingsStoreChanged((key) => {
|
||||
if (key === ROTATION_KEY) apply();
|
||||
});
|
||||
apply();
|
||||
}
|
||||
+22
-21
@@ -38,30 +38,31 @@
|
||||
</GridLayout>
|
||||
</GridLayout>
|
||||
|
||||
<GridLayout class="p-20" visibility="{{ landscapeLayoutVisibility }}">
|
||||
<GridLayout rows="auto" columns="*,360">
|
||||
<StackLayout row="0" col="0" visibility="{{ displayPreviewVisibility }}" horizontalAlignment="left">
|
||||
<Image
|
||||
src="{{ displayPreview }}"
|
||||
stretch="fill"
|
||||
<GridLayout class="landscape-layout" visibility="{{ landscapeLayoutVisibility }}">
|
||||
<GridLayout rows="*" columns="*,345">
|
||||
<GridLayout col="0" layoutChanged="{{ onLandscapePreviewLayoutChanged }}">
|
||||
<StackLayout visibility="{{ displayPreviewVisibility }}" horizontalAlignment="left" verticalAlignment="center">
|
||||
<Image
|
||||
src="{{ displayPreview }}"
|
||||
stretch="fill"
|
||||
width="{{ landscapeDisplayPreviewWidth }}"
|
||||
height="{{ landscapeDisplayPreviewHeight }}"
|
||||
tap="{{ onMirrorTap }}" doubleTap="{{ onMirrorDoubleTap }}" longPress="{{ onMirrorLongPress }}" swipe="{{ onMirrorSwipe }}" />
|
||||
</StackLayout>
|
||||
<GridLayout
|
||||
class="display-preview-message"
|
||||
horizontalAlignment="left"
|
||||
verticalAlignment="center"
|
||||
width="{{ landscapeDisplayPreviewWidth }}"
|
||||
height="{{ landscapeDisplayPreviewHeight }}"
|
||||
tap="{{ onMirrorTap }}" doubleTap="{{ onMirrorDoubleTap }}" longPress="{{ onMirrorLongPress }}" swipe="{{ onMirrorSwipe }}" />
|
||||
</StackLayout>
|
||||
<GridLayout
|
||||
row="0"
|
||||
col="0"
|
||||
class="display-preview-message"
|
||||
horizontalAlignment="left"
|
||||
width="{{ landscapeDisplayPreviewWidth }}"
|
||||
height="{{ landscapeDisplayPreviewHeight }}"
|
||||
visibility="{{ displayPreviewMessageVisibility }}">
|
||||
<Label text="{{ displayPreviewMessage }}" textWrap="true" horizontalAlignment="center" verticalAlignment="center" />
|
||||
visibility="{{ displayPreviewMessageVisibility }}">
|
||||
<Label text="{{ displayPreviewMessage }}" textWrap="true" horizontalAlignment="center" verticalAlignment="center" />
|
||||
</GridLayout>
|
||||
</GridLayout>
|
||||
<GridLayout col="1" rows="*,auto">
|
||||
<rc:remote-controls row="0" visibility="{{ controlsVisibility }}" />
|
||||
<Button row="1" text="Stop recording" tap="{{ onStopRecordingTap }}" visibility="{{ stopRecordingButtonVisibility }}" />
|
||||
</GridLayout>
|
||||
<StackLayout row="0" col="1" class="m-l-16">
|
||||
<rc:remote-controls visibility="{{ controlsVisibility }}" />
|
||||
<Button text="Stop recording" tap="{{ onStopRecordingTap }}" visibility="{{ stopRecordingButtonVisibility }}" />
|
||||
</StackLayout>
|
||||
</GridLayout>
|
||||
</GridLayout>
|
||||
<!-- Developer BLE-bandwidth indicator: overlays the bottom edge of the
|
||||
|
||||
@@ -44,6 +44,9 @@ export class MainViewModel extends Observable {
|
||||
private _displayPreview: ImageSource | null = null;
|
||||
private _displayPreviewMessage = "";
|
||||
private _layoutOrientation: LayoutOrientation = this.readLayoutOrientation();
|
||||
private _landscapePreviewWidth = 0;
|
||||
private _landscapePreviewHeight = 0;
|
||||
private _controlsContentHeight = 250;
|
||||
private _activeTextSettingId: string | null = null;
|
||||
private _activeTextEditorTitle = "";
|
||||
private _activeTextSettingTitle = "";
|
||||
@@ -236,18 +239,25 @@ export class MainViewModel extends Observable {
|
||||
}
|
||||
|
||||
get landscapeDisplayPreviewWidth(): number {
|
||||
return Math.floor(this.landscapeDisplayPreviewHeight * LENS_ASPECT_RATIO);
|
||||
return this._landscapePreviewWidth;
|
||||
}
|
||||
|
||||
get landscapeDisplayPreviewHeight(): number {
|
||||
// Height keeps the vertical footprint the preview had at the old 2:1
|
||||
// aspect; the width is derived from it, so a wider lens aspect can't
|
||||
// grow the preview past the side panel.
|
||||
const screenWidth = Screen.mainScreen.widthDIPs;
|
||||
// Must match the landscape grid's fixed side-panel column in main-page.xml.
|
||||
const sidePanelWidth = 360;
|
||||
const availableWidth = Math.max(240, Math.floor(screenWidth - sidePanelWidth - 56));
|
||||
return Math.floor(availableWidth / 2);
|
||||
return this._landscapePreviewHeight;
|
||||
}
|
||||
|
||||
onLandscapePreviewLayoutChanged(args: { object: View }): void {
|
||||
// Measure the actual content cell: excludes the action bar, system bars,
|
||||
// and controls, and updates for rotation, split-screen, and the keyboard.
|
||||
const { width, height } = args.object.getActualSize();
|
||||
if (width <= 0 || height <= 0) return;
|
||||
const previewHeight = Math.min(height, width / LENS_ASPECT_RATIO);
|
||||
const previewWidth = previewHeight * LENS_ASPECT_RATIO;
|
||||
if (previewWidth === this._landscapePreviewWidth && previewHeight === this._landscapePreviewHeight) return;
|
||||
this._landscapePreviewWidth = previewWidth;
|
||||
this._landscapePreviewHeight = previewHeight;
|
||||
this.notifyPropertyChange("landscapeDisplayPreviewWidth", previewWidth);
|
||||
this.notifyPropertyChange("landscapeDisplayPreviewHeight", previewHeight);
|
||||
}
|
||||
|
||||
/** Near-full-width on phones, capped on tablets (the 32 clears the 16 margins). */
|
||||
@@ -264,13 +274,27 @@ export class MainViewModel extends Observable {
|
||||
const faceHeight = 230;
|
||||
const available =
|
||||
this._layoutOrientation === "landscape"
|
||||
? // The landscape side panel column (see main-page.xml) minus its
|
||||
// m-l-16 margin and the controls' own 8+8 margins.
|
||||
360 - 32
|
||||
? 345 // Matches the unpadded landscape controls column in main-page.xml.
|
||||
: Screen.mainScreen.widthDIPs - 56; // p-20 padding + controls margins
|
||||
return Math.min(available, Math.round(faceHeight * 1.5));
|
||||
}
|
||||
|
||||
get watchFaceHeight(): number {
|
||||
return Math.min(230, Math.max(0, this._controlsContentHeight - 2));
|
||||
}
|
||||
|
||||
get ringTouchpadHeight(): number {
|
||||
return Math.min(250, Math.max(0, this._controlsContentHeight - 2));
|
||||
}
|
||||
|
||||
onControlsContentLayoutChanged(args: { object: View }): void {
|
||||
const { height } = args.object.getActualSize();
|
||||
if (height <= 0 || height === this._controlsContentHeight) return;
|
||||
this._controlsContentHeight = height;
|
||||
this.notifyPropertyChange("watchFaceHeight", this.watchFaceHeight);
|
||||
this.notifyPropertyChange("ringTouchpadHeight", this.ringTouchpadHeight);
|
||||
}
|
||||
|
||||
get portraitLayoutVisibility(): "visible" | "collapse" {
|
||||
return this._layoutOrientation === "portrait" ? "visible" : "collapse";
|
||||
}
|
||||
|
||||
@@ -20,9 +20,9 @@
|
||||
acts as star, and this component sits in a bounded (star-row) parent,
|
||||
where that would balloon the first grid to fill all remaining height. -->
|
||||
<GridLayout row="0" rows="auto" columns="*,*,*,auto,auto" class="controls-tab-bar">
|
||||
<Button col="0" text="Settings" tap="{{ onSettingsTabTap }}" class="{{ settingsTabClass }}" />
|
||||
<Button col="1" text="Watch" tap="{{ onWatchTabTap }}" class="{{ watchTabClass }}" />
|
||||
<Button col="2" text="Ring" tap="{{ onRingTabTap }}" class="{{ ringTabClass }}" />
|
||||
<Button col="0" text="Settings" textWrap="false" tap="{{ onSettingsTabTap }}" class="{{ settingsTabClass }}" />
|
||||
<Button col="1" text="Watch" textWrap="false" tap="{{ onWatchTabTap }}" class="{{ watchTabClass }}" />
|
||||
<Button col="2" text="Ring" textWrap="false" tap="{{ onRingTabTap }}" class="{{ ringTabClass }}" />
|
||||
<!-- A Button can't hold an image, so these are button-styled tiles. The
|
||||
explicit star row makes the cell fill the tile's height so the icon's
|
||||
center alignment has room to work in. -->
|
||||
@@ -34,48 +34,47 @@
|
||||
</GridLayout>
|
||||
</GridLayout>
|
||||
|
||||
<!-- Settings tab -->
|
||||
<StackLayout row="1" visibility="{{ settingsTabVisibility }}">
|
||||
<GridLayout rows="auto" columns="auto,*" class="settings-row">
|
||||
<Label col="0" text="Screen size" class="settings-row-label" verticalAlignment="center" />
|
||||
<Button col="1" text="{{ displayModeLabel }}" tap="{{ onDisplayModeTap }}" class="mode-button" horizontalAlignment="left" />
|
||||
</GridLayout>
|
||||
<GridLayout rows="auto" columns="auto,*,auto" class="settings-row">
|
||||
<Label col="0" text="☀" class="brightness-icon" verticalAlignment="center" />
|
||||
<Slider col="1" width="100%" minValue="0" maxValue="100" value="{{ brightnessPercent }}" valueChange="{{ onBrightnessChange }}" isEnabled="{{ brightnessSliderEnabled }}" />
|
||||
<StackLayout col="2" orientation="horizontal" verticalAlignment="center" class="auto-toggle">
|
||||
<Label text="Auto" verticalAlignment="center" />
|
||||
<Switch checked="{{ brightnessAuto }}" checkedChange="{{ onBrightnessAutoChange }}" />
|
||||
</StackLayout>
|
||||
</GridLayout>
|
||||
</StackLayout>
|
||||
<GridLayout row="1" layoutChanged="{{ onControlsContentLayoutChanged }}">
|
||||
<!-- Settings tab -->
|
||||
<StackLayout visibility="{{ settingsTabVisibility }}">
|
||||
<GridLayout rows="auto" columns="auto,*" class="settings-row">
|
||||
<Label col="0" text="Screen size" class="settings-row-label" verticalAlignment="center" />
|
||||
<Button col="1" text="{{ displayModeLabel }}" tap="{{ onDisplayModeTap }}" class="mode-button" horizontalAlignment="left" />
|
||||
</GridLayout>
|
||||
<GridLayout rows="auto" columns="auto,*,auto" class="settings-row">
|
||||
<Label col="0" text="☀" class="brightness-icon" verticalAlignment="center" />
|
||||
<Slider col="1" width="100%" minValue="0" maxValue="100" value="{{ brightnessPercent }}" valueChange="{{ onBrightnessChange }}" isEnabled="{{ brightnessSliderEnabled }}" />
|
||||
<StackLayout col="2" orientation="horizontal" verticalAlignment="center" class="auto-toggle">
|
||||
<Label text="Auto" verticalAlignment="center" />
|
||||
<Switch checked="{{ brightnessAuto }}" checkedChange="{{ onBrightnessAutoChange }}" />
|
||||
</StackLayout>
|
||||
</GridLayout>
|
||||
</StackLayout>
|
||||
|
||||
<!-- Watch tab: centered in the leftover height, capped at the 1.5:1 face
|
||||
aspect (watchFaceWidth = min(available, 1.5 x face height). -->
|
||||
<StackLayout row="1" visibility="{{ watchTabVisibility }}" width="{{ watchFaceWidth }}" horizontalAlignment="center" verticalAlignment="center">
|
||||
<GridLayout class="touchpad" tap="{{ onPadTap }}" doubleTap="{{ onPadDoubleTap }}" longPress="{{ onPadLongPress }}" swipe="{{ onPadSwipe }}" touch="{{ onPadTouch }}">
|
||||
<!-- Watch tab: centered in the leftover height, capped at the 1.5:1 face
|
||||
aspect (watchFaceWidth = min(available, 1.5 x face height). -->
|
||||
<GridLayout visibility="{{ watchTabVisibility }}" width="{{ watchFaceWidth }}" height="{{ watchFaceHeight }}" horizontalAlignment="center" verticalAlignment="center" class="touchpad" tap="{{ onPadTap }}" doubleTap="{{ onPadDoubleTap }}" longPress="{{ onPadLongPress }}" swipe="{{ onPadSwipe }}" touch="{{ onPadTouch }}">
|
||||
<Label text="{{ padFocusLine }}" class="pad-focus" horizontalAlignment="center" verticalAlignment="center" />
|
||||
<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. 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 }}"
|
||||
touch="{{ onRingPadTouch }}">
|
||||
<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" />
|
||||
<!-- 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. 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 visibility="{{ ringTabVisibility }}" height="{{ ringTouchpadHeight }}" class="touchpad ring-touchpad"
|
||||
rows="*,auto,*,auto,*,auto,*,auto,*,auto,*,auto,*"
|
||||
horizontalAlignment="center" verticalAlignment="center"
|
||||
tap="{{ onRingPadTap }}" doubleTap="{{ onRingPadDoubleTap }}"
|
||||
longPress="{{ onRingPadLongPress }}" swipe="{{ onRingPadSwipe }}"
|
||||
touch="{{ onRingPadTouch }}">
|
||||
<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>
|
||||
|
||||
</GridLayout>
|
||||
@@ -285,6 +285,17 @@ export const lockScreenEnabledSetting = new ConfigSettingBoolean({
|
||||
// Phone display: the phone app's mirror of the glasses screen and the
|
||||
// controls around it on the main page.
|
||||
export type PreviewColor = "white" | "green";
|
||||
export type PhoneRotation = "auto" | "portrait" | "landscape";
|
||||
|
||||
export const phoneRotationSetting = new ConfigSettingEnum<PhoneRotation>({
|
||||
id: "phone-rotation",
|
||||
label: "Rotation",
|
||||
storageKey: "phone.rotation",
|
||||
defaultValue: "auto",
|
||||
values: ["auto", "portrait", "landscape"],
|
||||
formatValue: (value) => ({ auto: "Auto-Rotate", portrait: "Always Portrait", landscape: "Always Landscape" })[value],
|
||||
description: "Automatically rotate with the phone, or keep the phone app in portrait or landscape. Auto-Rotate follows the phone's system rotation preference.",
|
||||
});
|
||||
|
||||
export const previewColorSetting = new ConfigSettingEnum<PreviewColor>({
|
||||
id: "preview-color",
|
||||
|
||||
@@ -48,6 +48,7 @@ import {
|
||||
navigateWorkAddressSetting,
|
||||
openAiApiKeySetting,
|
||||
previewColorSetting,
|
||||
phoneRotationSetting,
|
||||
ringConnectionModeSetting,
|
||||
sonioxApiKeySetting,
|
||||
enumSettingMenuItem,
|
||||
@@ -177,6 +178,7 @@ function settingsSections(): SettingsSection[] {
|
||||
// The phone app's mirror of the glasses screen and its controls
|
||||
// (app/phone-ui/): all read live by the main page.
|
||||
items: [
|
||||
enumSettingMenuItem(phoneRotationSetting),
|
||||
enumSettingMenuItem(previewColorSetting),
|
||||
toggleSettingMenuItem(mirrorTouchSetting),
|
||||
],
|
||||
|
||||
Reference in new issue
Block a user