Merge notification display filtering

This commit is contained in:
Blendman974 committed 2026-11-07 21:13:02 +01:00
commit 1eee926cbe
7 files changed
+86 -16

No files matched your search

+7 -2
View File
@@ -2,7 +2,7 @@ import type { GrayImage } from '../graphics/image'
import { pebbleIcon } from '../graphics/pebble-icons'
import { AncsClient, ANCS_CONNECT_MESSAGE, type AncsState } from '../g2/ancs-client'
import { notificationAppIcon, notificationCategoryIcon } from './notification-app-icons'
import { rememberNotificationSources } from './notification-sources'
import { rememberNotificationSources, shouldShowNotificationOnGlasses } from './notification-sources'
import type { AndroidNotification } from './notification-types'
export type { AndroidNotification, AndroidNotificationAction } from './notification-types'
export type { NotificationIconsResult, NotificationIconResult, NotificationImageResult } from './notification-icons'
@@ -24,6 +24,11 @@ export function onIosNotificationPopup(listener: (key: string) => void): () => v
export function iosNotificationMessage(): string { return active?.statusMessage ?? ANCS_CONNECT_MESSAGE }
export function iosNotificationState(): AncsState { return active?.state ?? 'disconnected' }
export function readActiveNotifications(maxNotifications = 50) { return active?.read(maxNotifications) ?? [] }
export function readVisibleNotifications(maxNotifications = 50) {
return readActiveNotifications(ALL_NOTIFICATIONS)
.filter(notification => shouldShowNotificationOnGlasses(notification.packageName))
.slice(0, Math.max(0, maxNotifications))
}
export function invokeNotificationAction(key: string, index: number): boolean { return active?.action(key,index) ?? false }
export function dismissNotification(key: string): boolean { return active?.dismiss(key) ?? false }
export function dismissAllNotifications(): boolean {
@@ -54,7 +59,7 @@ function notificationIcon(notification: AndroidNotification): GrayImage {
export function readActiveNotificationIcons(maxIcons: number, _allowStale: boolean) {
// One icon per source, standing for its first notification.
const sources = new Map<string, AndroidNotification>()
for (const n of readActiveNotifications(ALL_NOTIFICATIONS)) if (!sources.has(n.packageName)) sources.set(n.packageName, n)
for (const n of readVisibleNotifications(ALL_NOTIFICATIONS)) if (!sources.has(n.packageName)) sources.set(n.packageName, n)
const shown = Array.from(sources.values()).slice(0,Math.max(0,maxIcons))
return {icons: shown.map(notificationIcon),keys: shown.map(n => n.key),stale:false}
}
+16 -2
View File
@@ -1,7 +1,7 @@
import { GrayImage } from "../graphics/image";
import { logCurrent, spanCurrent } from "./frame-timings";
import { toUint8Array } from "../util/array-util";
import { rememberNotificationSources } from "./notification-sources";
import { rememberNotificationSources, shouldShowNotificationOnGlasses } from "./notification-sources";
import { PHOTO_TONE, grayImageFromPacket } from "./image-files";
import { NOTIFICATION_ICON_SIZE } from "./notification-types";
@@ -21,6 +21,7 @@ const ICON_CACHE_MS = 60_000;
let cachedIcons: GrayImage[] = [];
let cachedKeys: string[] = [];
let cachedPackages = new Map<string, string>();
let cachedAtMs = 0;
const keyedIconCache = new Map<string, { icon: GrayImage | null; atMs: number }>();
const KEYED_ICON_CACHE_MAX = 128;
@@ -95,6 +96,7 @@ export function readActiveNotificationIcons(maxIcons: number, allowStale: boolea
keys.push(index < keyList.size() ? String(keyList.get(index)) : "");
}
cachedPackages = new Map(readActiveNotifications(ALL_NOTIFICATIONS).map(n => [n.key, n.packageName]));
cachedIcons = icons;
cachedKeys = keys;
cachedAtMs = now;
@@ -103,7 +105,12 @@ export function readActiveNotificationIcons(maxIcons: number, allowStale: boolea
/** Copies of the first maxIcons cached icons, with their keys. */
function cachedIconsResult(maxIcons: number, stale: boolean): NotificationIconsResult {
return { icons: cachedIcons.slice(0, maxIcons).map(icon => icon.clone()), keys: cachedKeys.slice(0, maxIcons), stale };
// Reapply preferences even to a warm/stale cache: toggles take effect immediately.
const indices = cachedKeys.map((_, index) => index).filter(index => {
const packageName = cachedPackages.get(cachedKeys[index]!);
return packageName !== undefined && shouldShowNotificationOnGlasses(packageName);
}).slice(0, maxIcons);
return { icons: indices.map(index => cachedIcons[index]!.clone()), keys: indices.map(index => cachedKeys[index]!), stale };
}
export type NotificationIconResult = {
@@ -318,6 +325,13 @@ export function readActiveNotifications(maxNotifications = 50): AndroidNotificat
}
}
/** Glasses display only; discover all sources and filter before the display limit. */
export function readVisibleNotifications(maxNotifications = 50): AndroidNotification[] {
return readActiveNotifications(ALL_NOTIFICATIONS)
.filter(notification => shouldShowNotificationOnGlasses(notification.packageName))
.slice(0, Math.max(0, maxNotifications));
}
export function invokeNotificationAction(notificationKey: string, actionIndex: number): boolean {
if (!global.isAndroid || !notificationKey) return false;
invalidateIconCaches();
+1 -1
View File
@@ -50,7 +50,7 @@ export class NotificationFilterLayer implements Layer {
this.menu = new MenuLayer("Notification filter", items, {
x: 8, y: 8, width: width - 16,
opaque: true, showBorder: false,
footer: "On = show popups on glasses",
footer: "On = show notifications on glasses",
}).selectItem(Math.max(0, index));
} else {
this.menu.setItems(items, index >= 0 ? index : undefined);
+8 -8
View File
@@ -8,7 +8,7 @@ import {
ALL_NOTIFICATIONS,
dismissNotification,
invokeNotificationAction,
readActiveNotifications,
readVisibleNotifications,
readNotificationCustomView,
readNotificationIconByKey,
readNotificationLargeIcon,
@@ -141,7 +141,7 @@ export class NotificationsListLayer implements Layer {
const image = new GrayImage(width, height, 0);
const cardWidth = width - 2 * CARD_X;
const cardTextWidth = cardWidth - CARD_TEXT_X - 14;
const notifications = readActiveNotifications(MAX_NOTIFICATIONS);
const notifications = readVisibleNotifications(MAX_NOTIFICATIONS);
const selectedIndex = this.resolveSelectedIndex(notifications);
const layouts = notifications.map((notification, index) =>
buildNotificationCardLayout(font, notification, index === selectedIndex, cardTextWidth),
@@ -185,7 +185,7 @@ export class NotificationsListLayer implements Layer {
}
handleInput(event: InputEvent, ctx: LayerContext): void {
const notifications = readActiveNotifications(MAX_NOTIFICATIONS);
const notifications = readVisibleNotifications(MAX_NOTIFICATIONS);
const selectedIndex = this.resolveSelectedIndex(notifications);
if (event.type === "double-click") {
// At the app's root this is intercepted by the yield wrapper; reached
@@ -252,7 +252,7 @@ export class SingleNotificationLayer implements Layer {
const font = getDefaultSmallFont();
const { width, height } = ctx.stack.getBaseSize();
const image = new GrayImage(width, height, 0);
const notification = readActiveNotifications(ALL_NOTIFICATIONS).find((item) => item.key === this.notificationKey);
const notification = readVisibleNotifications(ALL_NOTIFICATIONS).find((item) => item.key === this.notificationKey);
if (!notification) {
return this.closeUnavailableNotification(ctx, paintBelow);
@@ -273,7 +273,7 @@ export class SingleNotificationLayer implements Layer {
else await menu.handleInput(event);
return;
}
const notification = readActiveNotifications(ALL_NOTIFICATIONS).find((item) => item.key === this.notificationKey);
const notification = readVisibleNotifications(ALL_NOTIFICATIONS).find((item) => item.key === this.notificationKey);
if (!notification) {
this.closeUnavailableNotification(ctx);
return;
@@ -297,7 +297,7 @@ export class SingleNotificationLayer implements Layer {
this.close(ctx);
} else if (item.kind === "action") {
invokeNotificationAction(this.notificationKey, item.action.index);
if (!readActiveNotifications(ALL_NOTIFICATIONS).some((active) => active.key === this.notificationKey)) {
if (!readVisibleNotifications(ALL_NOTIFICATIONS).some((active) => active.key === this.notificationKey)) {
this.closeUnavailableNotification(ctx);
}
} else if (item.kind === "dismiss") {
@@ -310,7 +310,7 @@ export class SingleNotificationLayer implements Layer {
menu: new Menu<ConfirmationItem>({
items: [
{ label: "Cancel", run: (runCtx) => this.close(runCtx) },
{ label: "Turn off popups", run: (runCtx) => {
{ label: "Hide on glasses", run: (runCtx) => {
setNotificationSourceEnabled(notification, false);
this.close(runCtx);
} },
@@ -341,7 +341,7 @@ export class SingleNotificationLayer implements Layer {
};
menu.paint(image, menuBox, ctx.stack.isFocused());
const top = menuBox.y + menuBox.height + CONFIRM_PROMPT_GAP;
const prompt = `Turn off notification popups from ${source.appName || source.packageName}? You can turn them back on in the Notifications app's Notification filter.`;
const prompt = `Hide notifications on glasses from ${source.appName || source.packageName}? You can turn them back on in the Notifications app's Notification filter.`;
const lines = wrapText(font, prompt, width - 2 * CONFIRM_X);
const maxLines = Math.max(1, Math.floor((height - top - 12) / lineStep(font)));
for (let index = 0; index < Math.min(lines.length, maxLines); index++) {