From 63f515b8a61d2029825a8e9365a3ccda33a562c7 Mon Sep 17 00:00:00 2001 From: James Babcock Date: Mon, 3 Aug 2026 02:06:01 -0700 Subject: [PATCH] Minor refactoring --- app/g2/dashboard-controller.ts | 46 +++------------------------------ app/phone-ui/main-view-model.ts | 4 --- app/ui/dashboard-settings.ts | 12 --------- 3 files changed, 3 insertions(+), 59 deletions(-) diff --git a/app/g2/dashboard-controller.ts b/app/g2/dashboard-controller.ts index 806db6d6..e3976a99 100644 --- a/app/g2/dashboard-controller.ts +++ b/app/g2/dashboard-controller.ts @@ -1,12 +1,5 @@ import { ImageSource } from "@nativescript/core"; -import { - EvenAIStatus, - EvenAIStatusName, - EventSourceType, - EventSourceTypeName, - OsEventTypeList, - OsEventTypeName, -} from "./events"; +import { EvenAIStatus, EvenAIStatusName, EventSourceType, EventSourceTypeName, OsEventTypeList, OsEventTypeName } from "./events"; import { loadDeviceAddresses } from "./device-addresses"; import { ensureBlePermissions, ensureVoicePermissions } from "./android-permissions"; import { FaceclawCommunicatorBridge, type RawInputEvent } from "../native/faceclaw-communicator"; @@ -32,41 +25,12 @@ import { assistantBridge } from "../assistant/bridge-client"; import { registerWindowTools } from "../assistant/window-tools"; import { WorkerAppHost } from "../ui/shell/worker-window"; import { ALL_APPS } from "../apps/all-apps"; -import { - type AppContext, - type AppDefinition, - type AppLaunchParams, - type TextEditorHost, -} from "../apps/app-definition"; +import { type AppContext, type AppDefinition, type AppLaunchParams, type TextEditorHost } from "../apps/app-definition"; import { type InProcessAppOptions, type InProcessWindow } from "../ui/shell/in-process-window"; import { loadPersistedOpenApps, savePersistedOpenApps } from "../ui/shell/open-apps-persistence"; import { appViewportRect, type WindowHeightMode } from "../ui/shell/geometry"; import { type LayerActions } from "../ui/layers"; -import { - assistantAllowProactiveSetting, - assistantBackendSetting, - assistantBridgeHostSetting, - assistantBridgePortSetting, - assistantBridgeTokenSetting, - brightnessSetting, - brightnessSettingToLevel, - elevenLabsApiKeySetting, - openAiApiKeySetting, - nightscoutApiTokenSetting, - firmwareDebugFlagsSetting, - lockScreenEnabledSetting, - nightscoutSiteUrlSetting, - onAnySettingChanged, - saveVoiceRecordingsSetting, - screenTimeoutSetting, - screenTimeoutSettingToMs, - suspendEvenHubWhenScreenOffSetting, - systemCardNameSetting, - verticalPositionSetting, - voiceProviderSetting, - wakeWordActionSetting, - type ConfigSettingString, -} from "../ui/dashboard-settings"; +import { assistantAllowProactiveSetting, assistantBackendSetting, assistantBridgeHostSetting, assistantBridgePortSetting, assistantBridgeTokenSetting, brightnessSetting, brightnessSettingToLevel, elevenLabsApiKeySetting, openAiApiKeySetting, nightscoutApiTokenSetting, firmwareDebugFlagsSetting, lockScreenEnabledSetting, nightscoutSiteUrlSetting, onAnySettingChanged, saveVoiceRecordingsSetting, screenTimeoutSetting, screenTimeoutSettingToMs, suspendEvenHubWhenScreenOffSetting, verticalPositionSetting, voiceProviderSetting, wakeWordActionSetting, type ConfigSettingString } from "../ui/dashboard-settings"; import { isIgnoringBatteryOptimizations, requestIgnoreBatteryOptimizations } from "../native/battery-optimization"; type ConnectionPhase = "disconnected" | "connecting" | "connected" | "charging" | "disconnecting"; @@ -793,10 +757,6 @@ class DashboardController { openEvenAppSettings(); } - setSystemCardName(name: string): void { - this.updateTextSetting(systemCardNameSetting, name); - } - setActiveTextSettingValue(value: string): void { shell.noteUserActivity(); const setting = this.activeTextSetting; diff --git a/app/phone-ui/main-view-model.ts b/app/phone-ui/main-view-model.ts index b5844f95..065ab523 100644 --- a/app/phone-ui/main-view-model.ts +++ b/app/phone-ui/main-view-model.ts @@ -422,10 +422,6 @@ export class MainViewModel extends Observable { this.showLog = !this.showLog; } - onSystemCardNameTextChange(args: { value?: string; object?: { text?: string } }): void { - dashboardController.setSystemCardName(args.object?.text ?? args.value ?? ""); - } - onTextSettingTextChange(args: { value?: string; object?: { text?: string } }): void { dashboardController.setActiveTextSettingValue(args.object?.text ?? args.value ?? ""); } diff --git a/app/ui/dashboard-settings.ts b/app/ui/dashboard-settings.ts index 97f85978..ba08470e 100644 --- a/app/ui/dashboard-settings.ts +++ b/app/ui/dashboard-settings.ts @@ -193,18 +193,6 @@ export class ConfigSettingString extends ConfigSett } -export const systemCardNameSetting = new ConfigSettingString({ - id: "dashboard-name", - label: "Dashboard name", - storageKey: "dashboard.systemCardName", - defaultValue: "Faceclaw", - editorTitle: "Dashboard name", - glassesEditTitle: "Edit dashboard name", - normalize: normalizeSystemCardName, - formatValue: (value) => value || "Faceclaw", - description: "Title text shown on the dashboard's system card.", -}); - export const batteryDisplayModeSetting = new ConfigSettingEnum({ id: "batteryDisplayMode", label: "Battery display",