Battery indicators and other places no longer say "G2" when a G1 or iO is paired

This commit is contained in:
James Babcock committed 2026-11-07 22:56:31 -08:00
1 parent ac68ba5991
commit e103b89510
21 files changed
+101 -46

No files matched your search

+8 -1
View File
@@ -313,7 +313,7 @@ export const phoneBatteryVisibilitySetting = batteryVisibilitySetting(
"phoneBatteryVisibility", "Phone", "display.battery.phoneVisibility",
);
export const glassesBatteryVisibilitySetting = batteryVisibilitySetting(
"glassesBatteryVisibility", "G2", "display.battery.glassesVisibility",
"glassesBatteryVisibility", "Glasses", "display.battery.glassesVisibility",
);
export const ringBatteryVisibilitySetting = batteryVisibilitySetting(
"ringBatteryVisibility", "R1", "display.battery.ringVisibility",
@@ -408,6 +408,13 @@ export function glassesHaveCompass(): boolean {
return glassesTypeSetting.get() === "g2";
}
const GLASSES_MODEL_NAMES: Record<GlassesType, string> = { g2: "G2", g1: "G1", "rayneo-io": "iO" };
/** The paired glasses' model without the brand, short enough for battery labels and a watch's one-line charging status. */
export function glassesModelName(): string {
return GLASSES_MODEL_NAMES[glassesTypeSetting.get()];
}
const APP_SWITCHER_POSITION_LABELS: Record<AppSwitcherPosition, string> = {
left: "Left",
right: "Right",
+3 -1
View File
@@ -54,6 +54,7 @@ import {
dataCollectionSetting,
distanceUnitSetting,
glassesBatteryVisibilitySetting,
glassesModelName,
phoneBatteryVisibilitySetting,
ringBatteryVisibilitySetting,
watchBatteryVisibilitySetting,
@@ -387,7 +388,8 @@ function batteryIndicatorsMenuItem(): MenuItem {
enumSettingMenuItem(batteryDisplayModeSetting),
enumSettingMenuItem(phoneBatteryVisibilitySetting),
enumSettingMenuItem(watchBatteryVisibilitySetting),
enumSettingMenuItem(glassesBatteryVisibilitySetting),
// Named as the top bar names this indicator.
enumSettingMenuItem(glassesBatteryVisibilitySetting, { label: glassesModelName() }),
enumSettingMenuItem(ringBatteryVisibilitySetting),
]);
},
+2 -1
View File
@@ -15,6 +15,7 @@ import {
batteryDisplayModeSetting,
batteryIndicatorVisible,
glassesBatteryVisibilitySetting,
glassesModelName,
phoneBatteryVisibilitySetting,
ringBatteryVisibilitySetting,
watchBatteryVisibilitySetting,
@@ -1089,7 +1090,7 @@ function batteryItems(state: ShellChromeState): BatteryItem[] {
Boolean(state.battery.watchCharging));
}
if (state.battery.headset !== null && Number.isFinite(state.battery.headset)) {
pushBatteryItem(items, glassesBatteryVisibilitySetting.get(), "G2", "glasses", state.battery.headset,
pushBatteryItem(items, glassesBatteryVisibilitySetting.get(), glassesModelName(), "glasses", state.battery.headset,
Boolean(state.battery.headsetCharging));
}
if (state.battery.ring !== null && Number.isInteger(state.battery.ring)