forked from Blendman974/faceclaw
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0f62573b1c
|
||
|
|
1959e57d02
|
No files matched your search
@@ -54,8 +54,7 @@ class FaceclawCalendarProvider private constructor() {
|
|||||||
* boundaries the provider stores them as.
|
* boundaries the provider stores them as.
|
||||||
*/
|
*/
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
@JvmOverloads
|
fun getUpcomingEventsJson(context: Context?, maxEvents: Int, windowMs: Long): String {
|
||||||
fun getUpcomingEventsJson(context: Context?, maxEvents: Int, windowMs: Long, selectedCalendarIdsJson: String = "null"): String {
|
|
||||||
if (context == null || maxEvents <= 0) {
|
if (context == null || maxEvents <= 0) {
|
||||||
return "[]"
|
return "[]"
|
||||||
}
|
}
|
||||||
@@ -74,21 +73,11 @@ class FaceclawCalendarProvider private constructor() {
|
|||||||
val events = ArrayList<Event>()
|
val events = ArrayList<Event>()
|
||||||
var cursor: Cursor? = null
|
var cursor: Cursor? = null
|
||||||
try {
|
try {
|
||||||
// Filter instances before the cutoff/limit so excluded calendars
|
|
||||||
// cannot crowd out selected calendars, including recurrences.
|
|
||||||
val ids = if (selectedCalendarIdsJson == "null") null else JSONArray(selectedCalendarIdsJson)
|
|
||||||
if (ids != null && ids.length() == 0) return "[]"
|
|
||||||
val args = ids?.let { values -> Array(values.length()) { index ->
|
|
||||||
values.getString(index).also { require(it.matches(Regex("[0-9]+"))) }
|
|
||||||
} }
|
|
||||||
val selection = args?.let {
|
|
||||||
CalendarContract.Instances.CALENDAR_ID + " IN (" + it.joinToString(",") { "?" } + ")"
|
|
||||||
}
|
|
||||||
cursor = context.contentResolver.query(
|
cursor = context.contentResolver.query(
|
||||||
uri,
|
uri,
|
||||||
PROJECTION,
|
PROJECTION,
|
||||||
selection,
|
null,
|
||||||
args,
|
null,
|
||||||
CalendarContract.Instances.BEGIN + " ASC")
|
CalendarContract.Instances.BEGIN + " ASC")
|
||||||
if (cursor != null) {
|
if (cursor != null) {
|
||||||
val utc = Calendar.getInstance(TimeZone.getTimeZone("UTC"))
|
val utc = Calendar.getInstance(TimeZone.getTimeZone("UTC"))
|
||||||
@@ -129,33 +118,6 @@ class FaceclawCalendarProvider private constructor() {
|
|||||||
return out.toString()
|
return out.toString()
|
||||||
}
|
}
|
||||||
|
|
||||||
@JvmStatic
|
|
||||||
fun getCalendarsJson(context: Context?): String {
|
|
||||||
if (context == null) return "[]"
|
|
||||||
val out = JSONArray()
|
|
||||||
try {
|
|
||||||
context.contentResolver.query(
|
|
||||||
CalendarContract.Calendars.CONTENT_URI,
|
|
||||||
arrayOf(CalendarContract.Calendars._ID, CalendarContract.Calendars.CALENDAR_DISPLAY_NAME,
|
|
||||||
CalendarContract.Calendars.ACCOUNT_NAME, CalendarContract.Calendars.ACCOUNT_TYPE),
|
|
||||||
null, null, CalendarContract.Calendars.CALENDAR_DISPLAY_NAME + " ASC",
|
|
||||||
)?.use { cursor ->
|
|
||||||
while (cursor.moveToNext()) {
|
|
||||||
out.put(JSONObject().apply {
|
|
||||||
put("id", cursor.getLong(0).toString())
|
|
||||||
put("name", cursor.getString(1) ?: "")
|
|
||||||
put("accountName", cursor.getString(2) ?: "")
|
|
||||||
put("accountType", cursor.getString(3) ?: "")
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (t: Throwable) {
|
|
||||||
Log.w(TAG, "failed to read calendars", t)
|
|
||||||
return "[]"
|
|
||||||
}
|
|
||||||
return out.toString()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun readEvent(cursor: Cursor, utc: Calendar, local: Calendar): Event {
|
private fun readEvent(cursor: Cursor, utc: Calendar, local: Calendar): Event {
|
||||||
val allDay = cursor.getInt(4) != 0
|
val allDay = cursor.getInt(4) != 0
|
||||||
var startMs = cursor.getLong(2)
|
var startMs = cursor.getLong(2)
|
||||||
|
|||||||
+12
@@ -504,6 +504,18 @@ class FaceclawMediaNotificationListenerService : NotificationListenerService() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@JvmStatic
|
||||||
|
fun dismissAllNotifications(): Boolean {
|
||||||
|
val service = activeService ?: return false
|
||||||
|
return try {
|
||||||
|
service.cancelAllNotifications()
|
||||||
|
true
|
||||||
|
} catch (t: Throwable) {
|
||||||
|
Log.w(TAG, "failed to dismiss all notifications", t)
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private fun emitNotificationPosted(key: String?) {
|
private fun emitNotificationPosted(key: String?) {
|
||||||
emitNotificationEvent(key) { listener, eventKey -> listener.onNotificationPosted(eventKey) }
|
emitNotificationEvent(key) { listener, eventKey -> listener.onNotificationPosted(eventKey) }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import { invalidateCalendarCache, onCalendarChanged } from "../../native/calenda
|
|||||||
import { makeImageWindowIcon, windowIcon } from "../../ui/shell/chrome-layer";
|
import { makeImageWindowIcon, windowIcon } from "../../ui/shell/chrome-layer";
|
||||||
import { CalendarLayer } from "./calendar";
|
import { CalendarLayer } from "./calendar";
|
||||||
import { renderCalendarDateIcon } from "./calendar-icon";
|
import { renderCalendarDateIcon } from "./calendar-icon";
|
||||||
import { calendarSelectionMenuItems } from "./calendar-filter";
|
|
||||||
import {
|
import {
|
||||||
createInProcessWindow,
|
createInProcessWindow,
|
||||||
YieldAtRootLayer,
|
YieldAtRootLayer,
|
||||||
@@ -45,10 +44,6 @@ export function createCalendarAppWindow(options: InProcessAppOptions): InProcess
|
|||||||
icon: "calendar",
|
icon: "calendar",
|
||||||
drawIcon: makeImageWindowIcon(renderCalendarDateIcon, windowIcon("calendar", "Ca")),
|
drawIcon: makeImageWindowIcon(renderCalendarDateIcon, windowIcon("calendar", "Ca")),
|
||||||
closeable: true,
|
closeable: true,
|
||||||
menuItems: () => calendarSelectionMenuItems().map(item => ({ ...item, onSelect: (ctx, menu) => {
|
|
||||||
ctx.stack.pop();
|
|
||||||
return item.onSelect(ctx, menu);
|
|
||||||
} })),
|
|
||||||
actions: options.actions,
|
actions: options.actions,
|
||||||
baseLayer: new YieldAtRootLayer(new CalendarLayer(requestPermission)),
|
baseLayer: new YieldAtRootLayer(new CalendarLayer(requestPermission)),
|
||||||
submitFrame: options.submitFrame,
|
submitFrame: options.submitFrame,
|
||||||
|
|||||||
@@ -1,94 +0,0 @@
|
|||||||
import { getDefaultSmallFont } from "../../graphics/ui-fonts";
|
|
||||||
import { type GrayImage } from "../../graphics/image";
|
|
||||||
import { truncateText } from "../../graphics/textwrap";
|
|
||||||
import { readCalendarSelection, setCalendarSelection } from "../../native/calendar-selection";
|
|
||||||
import { readAvailableCalendars } from "../../native/calendar-sources";
|
|
||||||
import { hasCalendarPermission } from "../../native/calendar-permissions";
|
|
||||||
import { type InputEvent } from "../../ui/gestures";
|
|
||||||
import { type Layer, type LayerContext, type PaintBelow } from "../../ui/layers";
|
|
||||||
import { drawToggleMenuItem, MenuLayer, type MenuItem } from "../../ui/menu";
|
|
||||||
|
|
||||||
/** Shared preference for every Android calendar reader. */
|
|
||||||
export class CalendarFilterLayer implements Layer {
|
|
||||||
private menu: MenuLayer | null = null;
|
|
||||||
private width = 0;
|
|
||||||
private keys: string[] = [];
|
|
||||||
|
|
||||||
private currentMenu(ctx: LayerContext): MenuLayer {
|
|
||||||
const calendars = readAvailableCalendars().sort((a, b) =>
|
|
||||||
a.name.localeCompare(b.name) || a.accountName.localeCompare(b.accountName) || a.id.localeCompare(b.id));
|
|
||||||
const selection = readCalendarSelection();
|
|
||||||
const known = new Set(calendars.map(calendar => calendar.id));
|
|
||||||
const keys = ["all", "none"];
|
|
||||||
const toggle = (id: string) => {
|
|
||||||
// Leaving all mode snapshots the current calendars. Newly added calendars
|
|
||||||
// then stay excluded until selected individually or all mode is restored.
|
|
||||||
const ids = new Set(readCalendarSelection() ?? calendars.map(calendar => calendar.id));
|
|
||||||
if (ids.has(id)) ids.delete(id); else ids.add(id);
|
|
||||||
setCalendarSelection(Array.from(ids));
|
|
||||||
};
|
|
||||||
const items: MenuItem[] = [{
|
|
||||||
label: "All calendars",
|
|
||||||
description: "Include all calendars, including calendars added later.",
|
|
||||||
onSelect: () => setCalendarSelection(null),
|
|
||||||
render: ({ image, x, y, width, selected }) => drawToggleMenuItem(image, getDefaultSmallFont(), x, y, width,
|
|
||||||
"All calendars", readCalendarSelection() === null, selected),
|
|
||||||
}, {
|
|
||||||
label: "No calendars",
|
|
||||||
onSelect: () => setCalendarSelection([]),
|
|
||||||
render: ({ image, x, y, width, selected }) => drawToggleMenuItem(image, getDefaultSmallFont(), x, y, width,
|
|
||||||
"No calendars", readCalendarSelection()?.length === 0, selected),
|
|
||||||
}];
|
|
||||||
const rows = [
|
|
||||||
...calendars.map(calendar => ({ id: calendar.id,
|
|
||||||
label: `${calendar.name || "(unnamed)"} / ${calendar.accountName || "Local"} (${calendar.accountType || "local"}) #${calendar.id}` })),
|
|
||||||
...(selection ?? []).filter(id => !known.has(id)).map(id => ({ id, label: `Unavailable calendar #${id}` })),
|
|
||||||
];
|
|
||||||
for (const row of rows) {
|
|
||||||
keys.push(`calendar:${row.id}`);
|
|
||||||
items.push({
|
|
||||||
label: row.label,
|
|
||||||
description: row.label,
|
|
||||||
onSelect: () => toggle(row.id),
|
|
||||||
render: ({ image, x, y, width, selected }) => {
|
|
||||||
const font = getDefaultSmallFont();
|
|
||||||
const ids = readCalendarSelection();
|
|
||||||
drawToggleMenuItem(image, font, x, y, width, truncateText(font, row.label, width - 48),
|
|
||||||
ids === null || ids.includes(row.id), selected);
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
if (!calendars.length) items.push({
|
|
||||||
label: hasCalendarPermission() ? "No calendars available" : "Grant calendar permission on your phone",
|
|
||||||
disabled: true, onSelect: () => {},
|
|
||||||
});
|
|
||||||
const key = this.menu?.selectedIndex != null ? this.keys[this.menu.selectedIndex] : "all";
|
|
||||||
const index = Math.max(0, keys.indexOf(key ?? "all"));
|
|
||||||
this.keys = keys;
|
|
||||||
const width = ctx.stack.getBaseSize().width;
|
|
||||||
if (!this.menu || this.width !== width) {
|
|
||||||
this.width = width;
|
|
||||||
this.menu = new MenuLayer("Calendars displayed", items, {
|
|
||||||
x: 8, y: 8, width: width - 16, opaque: true, showBorder: false,
|
|
||||||
footer: "Shared by Calendar and Glanceboard",
|
|
||||||
}).selectItem(index);
|
|
||||||
} else this.menu.setItems(items, index);
|
|
||||||
return this.menu;
|
|
||||||
}
|
|
||||||
|
|
||||||
paint(ctx: LayerContext, paintBelow: PaintBelow): GrayImage {
|
|
||||||
return this.currentMenu(ctx).paint(ctx, paintBelow);
|
|
||||||
}
|
|
||||||
|
|
||||||
async handleInput(event: InputEvent, ctx: LayerContext): Promise<void> {
|
|
||||||
await this.currentMenu(ctx).handleInput(event, ctx);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function calendarSelectionMenuItems(): MenuItem[] {
|
|
||||||
return global.isAndroid ? [{
|
|
||||||
label: "Calendars displayed",
|
|
||||||
description: "Choose the calendars used by Calendar, Glanceboard and other calendar views.",
|
|
||||||
onSelect: ctx => ctx.stack.push(new CalendarFilterLayer()),
|
|
||||||
}] : [];
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
import { type GlanceWidgetDefinition, type GlanceWidgetId } from "../widget";
|
import { type GlanceWidgetDefinition, type GlanceWidgetId } from "../widget";
|
||||||
import { CalendarWidget } from "./calendar-widget";
|
import { CalendarWidget } from "./calendar-widget";
|
||||||
import { calendarSelectionMenuItems } from "../../calendar/calendar-filter";
|
|
||||||
import { CompassWidget } from "./compass-widget";
|
import { CompassWidget } from "./compass-widget";
|
||||||
import { MusicWidget, musicSettingsMenuItems } from "./music-widget";
|
import { MusicWidget, musicSettingsMenuItems } from "./music-widget";
|
||||||
import { NightscoutWidget } from "./nightscout-widget";
|
import { NightscoutWidget } from "./nightscout-widget";
|
||||||
@@ -12,7 +11,7 @@ import { HealthWidget } from "./health-widget";
|
|||||||
/** Every widget a board slot can hold. */
|
/** Every widget a board slot can hold. */
|
||||||
export const GLANCE_WIDGETS: readonly GlanceWidgetDefinition[] = [
|
export const GLANCE_WIDGETS: readonly GlanceWidgetDefinition[] = [
|
||||||
{ id: "system-card", label: "System card", settingsMenuItems: systemCardSettingsMenuItems, create: () => new SystemCardWidget() },
|
{ id: "system-card", label: "System card", settingsMenuItems: systemCardSettingsMenuItems, create: () => new SystemCardWidget() },
|
||||||
{ id: "calendar", label: "Calendar", tall: true, settingsMenuItems: calendarSelectionMenuItems, create: () => new CalendarWidget() },
|
{ id: "calendar", label: "Calendar", tall: true, create: () => new CalendarWidget() },
|
||||||
{ id: "terminal", label: "Terminal", tall: true, create: () => new TerminalWidget() },
|
{ id: "terminal", label: "Terminal", tall: true, create: () => new TerminalWidget() },
|
||||||
{ id: "t3code", label: "T3 Code", tall: true, create: () => new T3CodeWidget() },
|
{ id: "t3code", label: "T3 Code", tall: true, create: () => new T3CodeWidget() },
|
||||||
{ id: "nightscout", label: "Nightscout", create: () => new NightscoutWidget() },
|
{ id: "nightscout", label: "Nightscout", create: () => new NightscoutWidget() },
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { NotificationsListLayer } from "../../ui/notifications";
|
import { NotificationsListLayer } from "../../ui/notifications";
|
||||||
import { NotificationFilterLayer } from "../../ui/notification-filter";
|
import { NotificationFilterLayer } from "../../ui/notification-filter";
|
||||||
import { onAndroidNotificationsChanged } from "../../native/notification-icons";
|
import { ALL_NOTIFICATIONS, dismissAllNotifications, onAndroidNotificationsChanged, readActiveNotifications } from "../../native/notification-icons";
|
||||||
import {
|
import {
|
||||||
createInProcessWindow,
|
createInProcessWindow,
|
||||||
YieldAtRootLayer,
|
YieldAtRootLayer,
|
||||||
@@ -32,6 +32,15 @@ export function createNotificationsAppWindow(options: InProcessAppOptions): InPr
|
|||||||
ctx.stack.pop();
|
ctx.stack.pop();
|
||||||
ctx.stack.push(new NotificationFilterLayer());
|
ctx.stack.push(new NotificationFilterLayer());
|
||||||
},
|
},
|
||||||
|
}, {
|
||||||
|
label: "Dismiss all notifications",
|
||||||
|
description: "Dismiss notifications on the phone and glasses. System-protected notifications may remain.",
|
||||||
|
disabled: () => readActiveNotifications(ALL_NOTIFICATIONS).length === 0,
|
||||||
|
onSelect: (ctx) => {
|
||||||
|
ctx.stack.pop();
|
||||||
|
dismissAllNotifications();
|
||||||
|
created.requestRender();
|
||||||
|
},
|
||||||
}],
|
}],
|
||||||
actions: options.actions,
|
actions: options.actions,
|
||||||
baseLayer: new YieldAtRootLayer(new NotificationsListLayer()),
|
baseLayer: new YieldAtRootLayer(new NotificationsListLayer()),
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
import { getStringSetting, setStringSetting } from "./settings-store";
|
|
||||||
|
|
||||||
export const CALENDAR_SELECTION_KEY = "calendar.selectedIds";
|
|
||||||
/** null means all calendars (including future ones); [] explicitly means none. */
|
|
||||||
export function readCalendarSelection(): string[] | null {
|
|
||||||
try {
|
|
||||||
const value = JSON.parse(getStringSetting(CALENDAR_SELECTION_KEY, "null"));
|
|
||||||
if (value === null) return null;
|
|
||||||
if (!Array.isArray(value) || !value.every(id => typeof id === "string" && /^\d+$/.test(id))) return null;
|
|
||||||
return Array.from(new Set<string>(value));
|
|
||||||
} catch {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function setCalendarSelection(ids: readonly string[] | null): void {
|
|
||||||
if (ids !== null && !ids.every(id => /^\d+$/.test(id))) throw new Error("Invalid calendar ID");
|
|
||||||
setStringSetting(CALENDAR_SELECTION_KEY, JSON.stringify(ids === null ? null : Array.from(new Set(ids))));
|
|
||||||
}
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
import { Utils } from "@nativescript/core";
|
|
||||||
import { hasCalendarPermission } from "./calendar-permissions";
|
|
||||||
|
|
||||||
declare const com: any;
|
|
||||||
|
|
||||||
export type CalendarSource = { id: string; name: string; accountName: string; accountType: string };
|
|
||||||
|
|
||||||
/** Android calendar IDs survive renames and distinguish equal display names. */
|
|
||||||
export function readAvailableCalendars(): CalendarSource[] {
|
|
||||||
if (!global.isAndroid || !hasCalendarPermission()) return [];
|
|
||||||
try {
|
|
||||||
const context = Utils.android.getApplicationContext();
|
|
||||||
if (!context) return [];
|
|
||||||
const parsed = JSON.parse(String(com.faceclaw.app.FaceclawCalendarProvider.getCalendarsJson(context)));
|
|
||||||
if (!Array.isArray(parsed)) return [];
|
|
||||||
return parsed.filter(row => row && typeof row.id === "string" && /^\d+$/.test(row.id))
|
|
||||||
.map(row => ({ id: row.id, name: String(row.name ?? ""),
|
|
||||||
accountName: String(row.accountName ?? ""), accountType: String(row.accountType ?? "") }));
|
|
||||||
} catch {
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+3
-15
@@ -2,8 +2,6 @@ import { Utils } from "@nativescript/core";
|
|||||||
import { hasCalendarPermission } from "../g2/android-permissions";
|
import { hasCalendarPermission } from "../g2/android-permissions";
|
||||||
import { spanCurrent } from "./frame-timings";
|
import { spanCurrent } from "./frame-timings";
|
||||||
import { type CalendarEvent, type CalendarReadState } from "./calendar-types";
|
import { type CalendarEvent, type CalendarReadState } from "./calendar-types";
|
||||||
import { CALENDAR_SELECTION_KEY, readCalendarSelection } from "./calendar-selection";
|
|
||||||
import { onSettingsStoreChanged } from "./settings-store";
|
|
||||||
export type { CalendarEvent } from "./calendar-types";
|
export type { CalendarEvent } from "./calendar-types";
|
||||||
|
|
||||||
declare const com: any;
|
declare const com: any;
|
||||||
@@ -15,21 +13,14 @@ declare const com: any;
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
// Android reads synchronously; iOS notifies subscribers after background reads.
|
// Android reads synchronously; iOS notifies subscribers after background reads.
|
||||||
export function onCalendarChanged(listener: () => void): () => void {
|
export function onCalendarChanged(_listener: () => void): () => void { return () => {}; }
|
||||||
return onSettingsStoreChanged(key => {
|
|
||||||
if (key === CALENDAR_SELECTION_KEY || key == null) {
|
|
||||||
invalidateCalendarCache();
|
|
||||||
listener();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
export function getCalendarReadState(): CalendarReadState { return "ready"; }
|
export function getCalendarReadState(): CalendarReadState { return "ready"; }
|
||||||
|
|
||||||
const DEFAULT_MAX_EVENTS = 50;
|
const DEFAULT_MAX_EVENTS = 50;
|
||||||
const DEFAULT_WINDOW_MS = 14 * 24 * 60 * 60 * 1000;
|
const DEFAULT_WINDOW_MS = 14 * 24 * 60 * 60 * 1000;
|
||||||
const CACHE_MS = 30_000;
|
const CACHE_MS = 30_000;
|
||||||
|
|
||||||
let cache: { events: CalendarEvent[]; atMs: number; maxEvents: number; windowMs: number; selection: string } | null = null;
|
let cache: { events: CalendarEvent[]; atMs: number; maxEvents: number; windowMs: number } | null = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Upcoming events from now through the given window, ordered by start time.
|
* Upcoming events from now through the given window, ordered by start time.
|
||||||
@@ -44,11 +35,9 @@ export function readUpcomingEvents(
|
|||||||
if (!global.isAndroid || !hasCalendarPermission()) return [];
|
if (!global.isAndroid || !hasCalendarPermission()) return [];
|
||||||
|
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
const selection = JSON.stringify(readCalendarSelection());
|
|
||||||
if (
|
if (
|
||||||
!forceRefresh &&
|
!forceRefresh &&
|
||||||
cache &&
|
cache &&
|
||||||
cache.selection === selection &&
|
|
||||||
cache.maxEvents === maxEvents &&
|
cache.maxEvents === maxEvents &&
|
||||||
cache.windowMs === windowMs &&
|
cache.windowMs === windowMs &&
|
||||||
now - cache.atMs < CACHE_MS
|
now - cache.atMs < CACHE_MS
|
||||||
@@ -66,7 +55,6 @@ export function readUpcomingEvents(
|
|||||||
context,
|
context,
|
||||||
Math.max(0, Math.round(maxEvents)),
|
Math.max(0, Math.round(maxEvents)),
|
||||||
Math.max(0, Math.round(windowMs)),
|
Math.max(0, Math.round(windowMs)),
|
||||||
selection,
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
@@ -74,7 +62,7 @@ export function readUpcomingEvents(
|
|||||||
const events = Array.isArray(parsed)
|
const events = Array.isArray(parsed)
|
||||||
? parsed.map(normalizeEvent).filter((event): event is CalendarEvent => Boolean(event))
|
? parsed.map(normalizeEvent).filter((event): event is CalendarEvent => Boolean(event))
|
||||||
: [];
|
: [];
|
||||||
cache = { events, atMs: now, maxEvents, windowMs, selection };
|
cache = { events, atMs: now, maxEvents, windowMs };
|
||||||
return events;
|
return events;
|
||||||
} catch {
|
} catch {
|
||||||
return [];
|
return [];
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import type { GrayImage } from '../graphics/image'
|
|||||||
import { pebbleIcon } from '../graphics/pebble-icons'
|
import { pebbleIcon } from '../graphics/pebble-icons'
|
||||||
import { AncsClient, ANCS_CONNECT_MESSAGE, type AncsState } from '../g2/ancs-client'
|
import { AncsClient, ANCS_CONNECT_MESSAGE, type AncsState } from '../g2/ancs-client'
|
||||||
import { notificationAppIcon, notificationCategoryIcon } from './notification-app-icons'
|
import { notificationAppIcon, notificationCategoryIcon } from './notification-app-icons'
|
||||||
import { rememberNotificationSources } from './notification-sources'
|
import { rememberNotificationSources, shouldShowNotificationOnGlasses } from './notification-sources'
|
||||||
import type { AndroidNotification } from './notification-types'
|
import type { AndroidNotification } from './notification-types'
|
||||||
export type { AndroidNotification, AndroidNotificationAction } from './notification-types'
|
export type { AndroidNotification, AndroidNotificationAction } from './notification-types'
|
||||||
export type { NotificationIconsResult, NotificationIconResult, NotificationImageResult } from './notification-icons'
|
export type { NotificationIconsResult, NotificationIconResult, NotificationImageResult } from './notification-icons'
|
||||||
@@ -24,8 +24,23 @@ export function onIosNotificationPopup(listener: (key: string) => void): () => v
|
|||||||
export function iosNotificationMessage(): string { return active?.statusMessage ?? ANCS_CONNECT_MESSAGE }
|
export function iosNotificationMessage(): string { return active?.statusMessage ?? ANCS_CONNECT_MESSAGE }
|
||||||
export function iosNotificationState(): AncsState { return active?.state ?? 'disconnected' }
|
export function iosNotificationState(): AncsState { return active?.state ?? 'disconnected' }
|
||||||
export function readActiveNotifications(maxNotifications = 50) { return active?.read(maxNotifications) ?? [] }
|
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 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 dismissNotification(key: string): boolean { return active?.dismiss(key) ?? false }
|
||||||
|
export function dismissAllNotifications(): boolean {
|
||||||
|
const client = active
|
||||||
|
if (!client) return false
|
||||||
|
// Snapshot: removals may arrive while dismissal requests are being sent.
|
||||||
|
let accepted = true
|
||||||
|
for (const notification of [...client.read(ALL_NOTIFICATIONS)]) {
|
||||||
|
if (!client.dismiss(notification.key)) accepted = false
|
||||||
|
}
|
||||||
|
return accepted
|
||||||
|
}
|
||||||
export function onAndroidNotificationPosted(listener: (key: string) => void): () => void {
|
export function onAndroidNotificationPosted(listener: (key: string) => void): () => void {
|
||||||
listeners.add(listener); return () => { listeners.delete(listener) }
|
listeners.add(listener); return () => { listeners.delete(listener) }
|
||||||
}
|
}
|
||||||
@@ -44,7 +59,7 @@ function notificationIcon(notification: AndroidNotification): GrayImage {
|
|||||||
export function readActiveNotificationIcons(maxIcons: number, _allowStale: boolean) {
|
export function readActiveNotificationIcons(maxIcons: number, _allowStale: boolean) {
|
||||||
// One icon per source, standing for its first notification.
|
// One icon per source, standing for its first notification.
|
||||||
const sources = new Map<string, AndroidNotification>()
|
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))
|
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}
|
return {icons: shown.map(notificationIcon),keys: shown.map(n => n.key),stale:false}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { GrayImage } from "../graphics/image";
|
import { GrayImage } from "../graphics/image";
|
||||||
import { logCurrent, spanCurrent } from "./frame-timings";
|
import { logCurrent, spanCurrent } from "./frame-timings";
|
||||||
import { toUint8Array } from "../util/array-util";
|
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 { PHOTO_TONE, grayImageFromPacket } from "./image-files";
|
||||||
import { NOTIFICATION_ICON_SIZE } from "./notification-types";
|
import { NOTIFICATION_ICON_SIZE } from "./notification-types";
|
||||||
|
|
||||||
@@ -21,6 +21,7 @@ const ICON_CACHE_MS = 60_000;
|
|||||||
|
|
||||||
let cachedIcons: GrayImage[] = [];
|
let cachedIcons: GrayImage[] = [];
|
||||||
let cachedKeys: string[] = [];
|
let cachedKeys: string[] = [];
|
||||||
|
let cachedPackages = new Map<string, string>();
|
||||||
let cachedAtMs = 0;
|
let cachedAtMs = 0;
|
||||||
const keyedIconCache = new Map<string, { icon: GrayImage | null; atMs: number }>();
|
const keyedIconCache = new Map<string, { icon: GrayImage | null; atMs: number }>();
|
||||||
const KEYED_ICON_CACHE_MAX = 128;
|
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)) : "");
|
keys.push(index < keyList.size() ? String(keyList.get(index)) : "");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
cachedPackages = new Map(readActiveNotifications(ALL_NOTIFICATIONS).map(n => [n.key, n.packageName]));
|
||||||
cachedIcons = icons;
|
cachedIcons = icons;
|
||||||
cachedKeys = keys;
|
cachedKeys = keys;
|
||||||
cachedAtMs = now;
|
cachedAtMs = now;
|
||||||
@@ -103,7 +105,12 @@ export function readActiveNotificationIcons(maxIcons: number, allowStale: boolea
|
|||||||
|
|
||||||
/** Copies of the first maxIcons cached icons, with their keys. */
|
/** Copies of the first maxIcons cached icons, with their keys. */
|
||||||
function cachedIconsResult(maxIcons: number, stale: boolean): NotificationIconsResult {
|
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 = {
|
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 {
|
export function invokeNotificationAction(notificationKey: string, actionIndex: number): boolean {
|
||||||
if (!global.isAndroid || !notificationKey) return false;
|
if (!global.isAndroid || !notificationKey) return false;
|
||||||
invalidateIconCaches();
|
invalidateIconCaches();
|
||||||
@@ -337,6 +351,13 @@ export function dismissNotification(notificationKey: string): boolean {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Explicit user action: dismiss on the phone as well as on the glasses. */
|
||||||
|
export function dismissAllNotifications(): boolean {
|
||||||
|
if (!global.isAndroid) return false;
|
||||||
|
invalidateIconCaches();
|
||||||
|
return Boolean(com.faceclaw.app.FaceclawMediaNotificationListenerService.dismissAllNotifications());
|
||||||
|
}
|
||||||
|
|
||||||
export function onAndroidNotificationPosted(listener: (notificationKey: string) => void): () => void {
|
export function onAndroidNotificationPosted(listener: (notificationKey: string) => void): () => void {
|
||||||
return addNotificationListener(notificationPostedListeners, listener);
|
return addNotificationListener(notificationPostedListeners, listener);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,16 @@
|
|||||||
import { getStringSetting, setStringSetting } from "./settings-store";
|
import { getStringSetting, setStringSetting } from "./settings-store";
|
||||||
|
|
||||||
const SOURCES_KEY = "notifications.sources";
|
const SOURCES_KEY = "notifications.sources";
|
||||||
|
const DEFAULT_KEY = "notifications.newAppsEnabledByDefault";
|
||||||
|
|
||||||
|
/** Unset preserves the behavior of existing installations. */
|
||||||
|
export function newNotificationAppsEnabledByDefault(): boolean {
|
||||||
|
return getStringSetting(DEFAULT_KEY, "true") !== "false";
|
||||||
|
}
|
||||||
|
|
||||||
|
export function setNewNotificationAppsEnabledByDefault(enabled: boolean): void {
|
||||||
|
setStringSetting(DEFAULT_KEY, String(enabled));
|
||||||
|
}
|
||||||
|
|
||||||
export type NotificationSource = {
|
export type NotificationSource = {
|
||||||
packageName: string;
|
packageName: string;
|
||||||
@@ -8,8 +18,15 @@ export type NotificationSource = {
|
|||||||
showOnGlasses: boolean;
|
showOnGlasses: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
type SavedSource = Omit<NotificationSource, "showOnGlasses"> & { showOnGlasses?: boolean };
|
||||||
|
|
||||||
/** Sources outlive their active notifications so a muted app can always be re-enabled. */
|
/** Sources outlive their active notifications so a muted app can always be re-enabled. */
|
||||||
export function readNotificationSources(): NotificationSource[] {
|
export function readNotificationSources(): NotificationSource[] {
|
||||||
|
const enabled = newNotificationAppsEnabledByDefault();
|
||||||
|
return readSavedSources().map((source) => ({ ...source, showOnGlasses: source.showOnGlasses ?? enabled }));
|
||||||
|
}
|
||||||
|
|
||||||
|
function readSavedSources(): SavedSource[] {
|
||||||
try {
|
try {
|
||||||
const parsed = JSON.parse(getStringSetting(SOURCES_KEY, "[]"));
|
const parsed = JSON.parse(getStringSetting(SOURCES_KEY, "[]"));
|
||||||
if (!Array.isArray(parsed)) return [];
|
if (!Array.isArray(parsed)) return [];
|
||||||
@@ -17,7 +34,7 @@ export function readNotificationSources(): NotificationSource[] {
|
|||||||
.map((source) => ({
|
.map((source) => ({
|
||||||
packageName: source.packageName,
|
packageName: source.packageName,
|
||||||
appName: typeof source.appName === "string" && source.appName ? source.appName : source.packageName,
|
appName: typeof source.appName === "string" && source.appName ? source.appName : source.packageName,
|
||||||
showOnGlasses: source.showOnGlasses !== false,
|
showOnGlasses: typeof source.showOnGlasses === "boolean" ? source.showOnGlasses : undefined,
|
||||||
}));
|
}));
|
||||||
} catch {
|
} catch {
|
||||||
return [];
|
return [];
|
||||||
@@ -25,7 +42,7 @@ export function readNotificationSources(): NotificationSource[] {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function rememberNotificationSources(notifications: { packageName: string; appName: string }[]): void {
|
export function rememberNotificationSources(notifications: { packageName: string; appName: string }[]): void {
|
||||||
const sources = new Map(readNotificationSources().map((source) => [source.packageName, source]));
|
const sources = new Map(readSavedSources().map((source) => [source.packageName, source]));
|
||||||
let changed = false;
|
let changed = false;
|
||||||
for (const notification of notifications) {
|
for (const notification of notifications) {
|
||||||
if (!notification.packageName) continue;
|
if (!notification.packageName) continue;
|
||||||
@@ -35,7 +52,7 @@ export function rememberNotificationSources(notifications: { packageName: string
|
|||||||
sources.set(notification.packageName, {
|
sources.set(notification.packageName, {
|
||||||
packageName: notification.packageName,
|
packageName: notification.packageName,
|
||||||
appName,
|
appName,
|
||||||
showOnGlasses: previous?.showOnGlasses ?? true,
|
showOnGlasses: previous?.showOnGlasses,
|
||||||
});
|
});
|
||||||
changed = true;
|
changed = true;
|
||||||
}
|
}
|
||||||
@@ -44,12 +61,13 @@ export function rememberNotificationSources(notifications: { packageName: string
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function shouldShowNotificationOnGlasses(packageName: string): boolean {
|
export function shouldShowNotificationOnGlasses(packageName: string): boolean {
|
||||||
return readNotificationSources().find((source) => source.packageName === packageName)?.showOnGlasses ?? true;
|
return readNotificationSources().find((source) => source.packageName === packageName)?.showOnGlasses
|
||||||
|
?? newNotificationAppsEnabledByDefault();
|
||||||
}
|
}
|
||||||
|
|
||||||
export function setNotificationSourceEnabled(source: { packageName: string; appName: string }, enabled: boolean): void {
|
export function setNotificationSourceEnabled(source: { packageName: string; appName: string }, enabled: boolean): void {
|
||||||
if (!source.packageName) return;
|
if (!source.packageName) return;
|
||||||
const sources = new Map(readNotificationSources().map((item) => [item.packageName, item]));
|
const sources = new Map(readSavedSources().map((item) => [item.packageName, item]));
|
||||||
sources.set(source.packageName, {
|
sources.set(source.packageName, {
|
||||||
packageName: source.packageName,
|
packageName: source.packageName,
|
||||||
appName: source.appName || source.packageName,
|
appName: source.appName || source.packageName,
|
||||||
@@ -57,3 +75,10 @@ export function setNotificationSourceEnabled(source: { packageName: string; appN
|
|||||||
});
|
});
|
||||||
setStringSetting(SOURCES_KEY, JSON.stringify(Array.from(sources.values())));
|
setStringSetting(SOURCES_KEY, JSON.stringify(Array.from(sources.values())));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Set explicit choices only for sources already discovered; leave the future default alone. */
|
||||||
|
export function setAllNotificationSourcesEnabled(enabled: boolean): void {
|
||||||
|
setStringSetting(SOURCES_KEY, JSON.stringify(readSavedSources().map((source) => ({
|
||||||
|
...source, showOnGlasses: enabled,
|
||||||
|
}))));
|
||||||
|
}
|
||||||
@@ -2,7 +2,7 @@ import { getDefaultSmallFont } from "../graphics/ui-fonts";
|
|||||||
import { GrayImage } from "../graphics/image";
|
import { GrayImage } from "../graphics/image";
|
||||||
import { truncateText } from "../graphics/textwrap";
|
import { truncateText } from "../graphics/textwrap";
|
||||||
import { ALL_NOTIFICATIONS, readActiveNotifications } from "../native/notification-icons";
|
import { ALL_NOTIFICATIONS, readActiveNotifications } from "../native/notification-icons";
|
||||||
import { readNotificationSources, setNotificationSourceEnabled, shouldShowNotificationOnGlasses } from "../native/notification-sources";
|
import { newNotificationAppsEnabledByDefault, setNewNotificationAppsEnabledByDefault, setAllNotificationSourcesEnabled, readNotificationSources, setNotificationSourceEnabled, shouldShowNotificationOnGlasses } from "../native/notification-sources";
|
||||||
import { type InputEvent } from "./gestures";
|
import { type InputEvent } from "./gestures";
|
||||||
import { type Layer, type LayerContext, type PaintBelow } from "./layers";
|
import { type Layer, type LayerContext, type PaintBelow } from "./layers";
|
||||||
import { drawToggleMenuItem, MenuLayer, type MenuItem } from "./menu";
|
import { drawToggleMenuItem, MenuLayer, type MenuItem } from "./menu";
|
||||||
@@ -11,14 +11,26 @@ import { drawToggleMenuItem, MenuLayer, type MenuItem } from "./menu";
|
|||||||
export class NotificationFilterLayer implements Layer {
|
export class NotificationFilterLayer implements Layer {
|
||||||
private menu: MenuLayer | null = null;
|
private menu: MenuLayer | null = null;
|
||||||
private menuWidth = 0;
|
private menuWidth = 0;
|
||||||
/** The package behind each current row, parallel to the menu's items. */
|
/** Stable row keys, including controls, parallel to the menu's items. */
|
||||||
private packages: string[] = [];
|
private packages: string[] = [];
|
||||||
|
|
||||||
private currentMenu(ctx: LayerContext): MenuLayer {
|
private currentMenu(ctx: LayerContext): MenuLayer {
|
||||||
readActiveNotifications(ALL_NOTIFICATIONS);
|
readActiveNotifications(ALL_NOTIFICATIONS);
|
||||||
const sources = readNotificationSources().sort((a, b) =>
|
const sources = readNotificationSources().sort((a, b) =>
|
||||||
a.appName.localeCompare(b.appName) || a.packageName.localeCompare(b.packageName));
|
a.appName.localeCompare(b.appName) || a.packageName.localeCompare(b.packageName));
|
||||||
const items: MenuItem[] = sources.map((source) => ({
|
const items: MenuItem[] = [{
|
||||||
|
label: "New apps enabled by default",
|
||||||
|
onSelect: () => setNewNotificationAppsEnabledByDefault(!newNotificationAppsEnabledByDefault()),
|
||||||
|
render: ({ image, x, y, width, selected }) => {
|
||||||
|
const font = getDefaultSmallFont();
|
||||||
|
drawToggleMenuItem(image, font, x, y, width,
|
||||||
|
truncateText(font, "New apps enabled by default", width - 48), newNotificationAppsEnabledByDefault(), selected);
|
||||||
|
},
|
||||||
|
}, {
|
||||||
|
label: "Enable all", onSelect: () => setAllNotificationSourcesEnabled(true),
|
||||||
|
}, {
|
||||||
|
label: "Disable all", onSelect: () => setAllNotificationSourcesEnabled(false),
|
||||||
|
}, ...sources.map<MenuItem>((source) => ({
|
||||||
label: source.appName,
|
label: source.appName,
|
||||||
onSelect: () => setNotificationSourceEnabled(source, !shouldShowNotificationOnGlasses(source.packageName)),
|
onSelect: () => setNotificationSourceEnabled(source, !shouldShowNotificationOnGlasses(source.packageName)),
|
||||||
render: ({ image, x, y, width, selected }) => {
|
render: ({ image, x, y, width, selected }) => {
|
||||||
@@ -26,11 +38,11 @@ export class NotificationFilterLayer implements Layer {
|
|||||||
drawToggleMenuItem(image, font, x, y, width, truncateText(font, source.appName, width - 48),
|
drawToggleMenuItem(image, font, x, y, width, truncateText(font, source.appName, width - 48),
|
||||||
shouldShowNotificationOnGlasses(source.packageName), selected);
|
shouldShowNotificationOnGlasses(source.packageName), selected);
|
||||||
},
|
},
|
||||||
}));
|
}))];
|
||||||
if (!items.length) items.push({ label: "No notification sources discovered yet.", disabled: true, onSelect: () => {} });
|
if (!sources.length) items.push({ label: "No notification sources discovered yet.", disabled: true, onSelect: () => {} });
|
||||||
const selectedPackage = this.menu?.selectedIndex != null ? this.packages[this.menu.selectedIndex] : undefined;
|
const selectedPackage = this.menu?.selectedIndex != null ? this.packages[this.menu.selectedIndex] : undefined;
|
||||||
const index = sources.findIndex((source) => source.packageName === selectedPackage);
|
this.packages = ["default", "enable-all", "disable-all", ...sources.map((source) => `source:${source.packageName}`)];
|
||||||
this.packages = sources.map((source) => source.packageName);
|
const index = selectedPackage === undefined ? 0 : this.packages.indexOf(selectedPackage);
|
||||||
|
|
||||||
const width = ctx.stack.getBaseSize().width;
|
const width = ctx.stack.getBaseSize().width;
|
||||||
if (!this.menu || width !== this.menuWidth) {
|
if (!this.menu || width !== this.menuWidth) {
|
||||||
@@ -38,7 +50,7 @@ export class NotificationFilterLayer implements Layer {
|
|||||||
this.menu = new MenuLayer("Notification filter", items, {
|
this.menu = new MenuLayer("Notification filter", items, {
|
||||||
x: 8, y: 8, width: width - 16,
|
x: 8, y: 8, width: width - 16,
|
||||||
opaque: true, showBorder: false,
|
opaque: true, showBorder: false,
|
||||||
footer: "On = show popups on glasses",
|
footer: "On = show notifications on glasses",
|
||||||
}).selectItem(Math.max(0, index));
|
}).selectItem(Math.max(0, index));
|
||||||
} else {
|
} else {
|
||||||
this.menu.setItems(items, index >= 0 ? index : undefined);
|
this.menu.setItems(items, index >= 0 ? index : undefined);
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import {
|
|||||||
ALL_NOTIFICATIONS,
|
ALL_NOTIFICATIONS,
|
||||||
dismissNotification,
|
dismissNotification,
|
||||||
invokeNotificationAction,
|
invokeNotificationAction,
|
||||||
readActiveNotifications,
|
readVisibleNotifications,
|
||||||
readNotificationCustomView,
|
readNotificationCustomView,
|
||||||
readNotificationIconByKey,
|
readNotificationIconByKey,
|
||||||
readNotificationLargeIcon,
|
readNotificationLargeIcon,
|
||||||
@@ -141,7 +141,7 @@ export class NotificationsListLayer implements Layer {
|
|||||||
const image = new GrayImage(width, height, 0);
|
const image = new GrayImage(width, height, 0);
|
||||||
const cardWidth = width - 2 * CARD_X;
|
const cardWidth = width - 2 * CARD_X;
|
||||||
const cardTextWidth = cardWidth - CARD_TEXT_X - 14;
|
const cardTextWidth = cardWidth - CARD_TEXT_X - 14;
|
||||||
const notifications = readActiveNotifications(MAX_NOTIFICATIONS);
|
const notifications = readVisibleNotifications(MAX_NOTIFICATIONS);
|
||||||
const selectedIndex = this.resolveSelectedIndex(notifications);
|
const selectedIndex = this.resolveSelectedIndex(notifications);
|
||||||
const layouts = notifications.map((notification, index) =>
|
const layouts = notifications.map((notification, index) =>
|
||||||
buildNotificationCardLayout(font, notification, index === selectedIndex, cardTextWidth),
|
buildNotificationCardLayout(font, notification, index === selectedIndex, cardTextWidth),
|
||||||
@@ -185,7 +185,7 @@ export class NotificationsListLayer implements Layer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
handleInput(event: InputEvent, ctx: LayerContext): void {
|
handleInput(event: InputEvent, ctx: LayerContext): void {
|
||||||
const notifications = readActiveNotifications(MAX_NOTIFICATIONS);
|
const notifications = readVisibleNotifications(MAX_NOTIFICATIONS);
|
||||||
const selectedIndex = this.resolveSelectedIndex(notifications);
|
const selectedIndex = this.resolveSelectedIndex(notifications);
|
||||||
if (event.type === "double-click") {
|
if (event.type === "double-click") {
|
||||||
// At the app's root this is intercepted by the yield wrapper; reached
|
// 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 font = getDefaultSmallFont();
|
||||||
const { width, height } = ctx.stack.getBaseSize();
|
const { width, height } = ctx.stack.getBaseSize();
|
||||||
const image = new GrayImage(width, height, 0);
|
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) {
|
if (!notification) {
|
||||||
return this.closeUnavailableNotification(ctx, paintBelow);
|
return this.closeUnavailableNotification(ctx, paintBelow);
|
||||||
@@ -273,7 +273,7 @@ export class SingleNotificationLayer implements Layer {
|
|||||||
else await menu.handleInput(event);
|
else await menu.handleInput(event);
|
||||||
return;
|
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) {
|
if (!notification) {
|
||||||
this.closeUnavailableNotification(ctx);
|
this.closeUnavailableNotification(ctx);
|
||||||
return;
|
return;
|
||||||
@@ -297,7 +297,7 @@ export class SingleNotificationLayer implements Layer {
|
|||||||
this.close(ctx);
|
this.close(ctx);
|
||||||
} else if (item.kind === "action") {
|
} else if (item.kind === "action") {
|
||||||
invokeNotificationAction(this.notificationKey, item.action.index);
|
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);
|
this.closeUnavailableNotification(ctx);
|
||||||
}
|
}
|
||||||
} else if (item.kind === "dismiss") {
|
} else if (item.kind === "dismiss") {
|
||||||
@@ -310,7 +310,7 @@ export class SingleNotificationLayer implements Layer {
|
|||||||
menu: new Menu<ConfirmationItem>({
|
menu: new Menu<ConfirmationItem>({
|
||||||
items: [
|
items: [
|
||||||
{ label: "Cancel", run: (runCtx) => this.close(runCtx) },
|
{ label: "Cancel", run: (runCtx) => this.close(runCtx) },
|
||||||
{ label: "Turn off popups", run: (runCtx) => {
|
{ label: "Hide on glasses", run: (runCtx) => {
|
||||||
setNotificationSourceEnabled(notification, false);
|
setNotificationSourceEnabled(notification, false);
|
||||||
this.close(runCtx);
|
this.close(runCtx);
|
||||||
} },
|
} },
|
||||||
@@ -341,7 +341,7 @@ export class SingleNotificationLayer implements Layer {
|
|||||||
};
|
};
|
||||||
menu.paint(image, menuBox, ctx.stack.isFocused());
|
menu.paint(image, menuBox, ctx.stack.isFocused());
|
||||||
const top = menuBox.y + menuBox.height + CONFIRM_PROMPT_GAP;
|
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 lines = wrapText(font, prompt, width - 2 * CONFIRM_X);
|
||||||
const maxLines = Math.max(1, Math.floor((height - top - 12) / lineStep(font)));
|
const maxLines = Math.max(1, Math.floor((height - top - 12) / lineStep(font)));
|
||||||
for (let index = 0; index < Math.min(lines.length, maxLines); index++) {
|
for (let index = 0; index < Math.min(lines.length, maxLines); index++) {
|
||||||
|
|||||||
@@ -1,29 +0,0 @@
|
|||||||
# Android calendar selection validation
|
|
||||||
|
|
||||||
Software: `npm test` and `bash lint.sh` for changed TypeScript files.
|
|
||||||
`tests/calendar-selection.test.cjs` covers preference reloads, all versus none,
|
|
||||||
duplicate names/accounts, selection changes with cached readers, deleted IDs,
|
|
||||||
recurrence occurrences and forwarding the selection to the provider before its
|
|
||||||
limit. Provider SQL structure is checked statically; the mocked bridge does not
|
|
||||||
replace an Android CalendarContract integration test.
|
|
||||||
|
|
||||||
On an Android device (pending):
|
|
||||||
|
|
||||||
1. With no saved preference, compare events with the current release.
|
|
||||||
2. Open Calendar's window menu > Calendars displayed (also available through
|
|
||||||
Glanceboard's Calendar widget settings). Select between two equal-named
|
|
||||||
calendars belonging to different accounts. Check ID/account labels.
|
|
||||||
3. Create more than 50 early events in an excluded calendar and later recurring
|
|
||||||
events in a selected calendar. Check those later occurrences still appear.
|
|
||||||
4. Select “No calendars”: Calendar, Glanceboard and any other readers must be
|
|
||||||
empty immediately. Restart and confirm the selection persists.
|
|
||||||
5. Select individual calendars, rename one, then delete one. Remaining selections
|
|
||||||
must stay unchanged. A missing selected ID is shown as unavailable and may be
|
|
||||||
removed; it never causes a fallback to all calendars.
|
|
||||||
6. Select “All calendars”, add a calendar, and check it is included. In individual
|
|
||||||
mode, newly added calendars stay excluded. Check all-day and timed recurring
|
|
||||||
events in both Calendar and Glanceboard, including timezone/DST boundaries.
|
|
||||||
|
|
||||||
IDs are Android CalendarContract IDs, stable across display-name changes within
|
|
||||||
an installation. Removing/re-adding an account can create new calendar IDs.
|
|
||||||
The iOS calendar reader and its behavior are unchanged; iOS selection is deferred.
|
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
# Dismiss all notifications
|
||||||
|
|
||||||
|
The Notifications app menu offers Dismiss all notifications, disabled when the
|
||||||
|
list is empty. This explicit action dismisses notifications on the phone too;
|
||||||
|
popup filtering and source/default preferences remain independent.
|
||||||
|
|
||||||
|
Android uses NotificationListenerService.cancelAllNotifications, so dismissal
|
||||||
|
is not limited to the 50 items displayed by the list and Android controls which
|
||||||
|
notifications are removable. The normal removal callbacks update the list and
|
||||||
|
popups. Missing listener access returns false without changing preferences.
|
||||||
|
iOS uses the existing ANCS dismissal operation on a snapshot of all known keys;
|
||||||
|
notifications without a negative action may remain.
|
||||||
|
|
||||||
|
Software tests cover menu action/disabled state, more than 50 notifications,
|
||||||
|
native bridge dispatch, disconnected access and ANCS bulk dismissal.
|
||||||
|
On a device, verify the permission-granted/revoked cases, protected or ongoing
|
||||||
|
notifications, notification groups, and consistency with the phone's tray.
|
||||||
|
Hardware validation remains pending.
|
||||||
|
|
||||||
|
Reference: https://developer.android.com/reference/android/service/notification/NotificationListenerService#cancelAllNotifications()
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
# Notification filter validation
|
||||||
|
|
||||||
|
Software: `npm test` and `bash lint.sh app/native/notification-sources.ts app/ui/notification-filter.ts`.
|
||||||
|
The notification suite covers legacy preferences, reloads of the settings store,
|
||||||
|
discovery, default changes without overwriting exceptions, both bulk actions,
|
||||||
|
empty lists, stable menu selection and popup suppression before wake.
|
||||||
|
|
||||||
|
Hardware validation (pending; no glasses tested):
|
||||||
|
|
||||||
|
1. On an existing installation, check that enabled and muted applications retain
|
||||||
|
their behavior before touching the new default.
|
||||||
|
2. Turn “New apps enabled by default” off; restart the app. Send a notification
|
||||||
|
from a previously unknown package: it must appear in the filter and on the
|
||||||
|
phone, without waking the glasses or showing a glasses popup.
|
||||||
|
3. Enable that package individually; send another notification and check its popup.
|
||||||
|
4. Change the default in both directions; verify individual exceptions survive.
|
||||||
|
5. Use “Disable all”, then discover another package: it follows the default.
|
||||||
|
Repeat with “Enable all” while the default is off.
|
||||||
|
6. Restart and repeat notifications from enabled and disabled sources. Check that
|
||||||
|
bulk actions and filtering never dismiss notifications on the phone.
|
||||||
|
|
||||||
|
The same source preferences now filter glasses popups, the Notifications list,
|
||||||
|
and the notification tray/status icons. Filtering happens before display limits;
|
||||||
|
source discovery and the phone notification lifecycle remain unfiltered.
|
||||||
|
Cached tray icons reapply the current preferences on each read, including stale
|
||||||
|
reads, so a changed toggle cannot leave a muted icon visible.
|
||||||
|
|
||||||
|
Additional software coverage: Android list limits and warm/stale icon caches,
|
||||||
|
Disable all / re-enable without a new post, and iOS list/tray filtering.
|
||||||
|
|
||||||
|
Additional hardware validation (pending): with mixed enabled/disabled sources,
|
||||||
|
check the list and status bar together. Toggle a source while its notification
|
||||||
|
is already active, then Disable all and Enable all. Verify immediate removal /
|
||||||
|
restoration without a new notification, including after restart, and verify
|
||||||
|
notifications remain available in the phone notification shade.
|
||||||
@@ -1,150 +0,0 @@
|
|||||||
const test = require('node:test');
|
|
||||||
const assert = require('node:assert/strict');
|
|
||||||
const fs = require('node:fs');
|
|
||||||
const path = require('node:path');
|
|
||||||
const vm = require('node:vm');
|
|
||||||
const ts = require('typescript');
|
|
||||||
const source = file => fs.readFileSync(path.join(__dirname, '..', file), 'utf8');
|
|
||||||
function load(file, modules, globals = {}) {
|
|
||||||
const context = { exports: {}, require: name => {
|
|
||||||
assert.ok(name in modules, `Unexpected import ${name}`);
|
|
||||||
return modules[name];
|
|
||||||
}, ...globals };
|
|
||||||
vm.runInNewContext(ts.transpileModule(source(file), {
|
|
||||||
compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2020 },
|
|
||||||
}).outputText, context);
|
|
||||||
return context.exports;
|
|
||||||
}
|
|
||||||
function fixture(settings = new Map()) {
|
|
||||||
const listeners = new Set();
|
|
||||||
const storage = {
|
|
||||||
getStringSetting: (key, fallback) => settings.get(key) ?? fallback,
|
|
||||||
setStringSetting: (key, value) => { settings.set(key, value); for (const fn of listeners) fn(key); },
|
|
||||||
onSettingsStoreChanged: fn => { listeners.add(fn); return () => listeners.delete(fn); },
|
|
||||||
};
|
|
||||||
const prefs = load('app/native/calendar-selection.ts', { './settings-store': storage });
|
|
||||||
let permitted = true;
|
|
||||||
const calls = [];
|
|
||||||
const calendars = [
|
|
||||||
{ id: '1', name: 'Work', accountName: 'one@example.com', accountType: 'google' },
|
|
||||||
{ id: '2', name: 'Work', accountName: 'two@example.com', accountType: 'google' },
|
|
||||||
];
|
|
||||||
const events = [
|
|
||||||
{ id: 1, calendarId: '1', startMs: 10000, endMs: 20000, title: 'Excluded early' },
|
|
||||||
{ id: 9, calendarId: '2', startMs: 30000, endMs: 40000, title: 'Recurrence one' },
|
|
||||||
{ id: 9, calendarId: '2', startMs: 50000, endMs: 60000, title: 'Recurrence two' },
|
|
||||||
];
|
|
||||||
const modules = {
|
|
||||||
'@nativescript/core': { Utils: { android: { getApplicationContext: () => ({}) } } },
|
|
||||||
'../g2/android-permissions': { hasCalendarPermission: () => permitted },
|
|
||||||
'./calendar-permissions': { hasCalendarPermission: () => permitted },
|
|
||||||
'./frame-timings': { spanCurrent: (_name, fn) => fn() },
|
|
||||||
'./calendar-selection': prefs,
|
|
||||||
'./settings-store': storage,
|
|
||||||
};
|
|
||||||
const globals = { global: { isAndroid: true }, com: { faceclaw: { app: { FaceclawCalendarProvider: {
|
|
||||||
getCalendarsJson: () => JSON.stringify(calendars),
|
|
||||||
getUpcomingEventsJson: (_ctx, max, window, selection) => {
|
|
||||||
calls.push({ max, window, selection });
|
|
||||||
const ids = JSON.parse(selection);
|
|
||||||
return JSON.stringify(events.filter(event => ids === null || ids.includes(event.calendarId)).slice(0, max));
|
|
||||||
},
|
|
||||||
} } } } };
|
|
||||||
const api = load('app/native/calendar.ts', modules, globals);
|
|
||||||
const sources = load('app/native/calendar-sources.ts', modules, globals);
|
|
||||||
return { api, prefs, sources, modules, globals, settings, calls, calendars,
|
|
||||||
permissions: value => { permitted = value; } };
|
|
||||||
}
|
|
||||||
|
|
||||||
test('calendar selection distinguishes all and none, survives restart and rejects invalid data', () => {
|
|
||||||
const f = fixture();
|
|
||||||
assert.equal(f.prefs.readCalendarSelection(), null);
|
|
||||||
f.prefs.setCalendarSelection([]);
|
|
||||||
assert.deepEqual(Array.from(fixture(f.settings).prefs.readCalendarSelection()), []);
|
|
||||||
f.prefs.setCalendarSelection(['2', '2', '1']);
|
|
||||||
assert.deepEqual(Array.from(fixture(f.settings).prefs.readCalendarSelection()), ['2', '1']);
|
|
||||||
f.prefs.setCalendarSelection(null);
|
|
||||||
assert.equal(fixture(f.settings).prefs.readCalendarSelection(), null);
|
|
||||||
assert.throws(() => f.prefs.setCalendarSelection(['1 OR 1=1']));
|
|
||||||
for (const value of ['oops', '{}', '[false]', '["bad"]']) {
|
|
||||||
f.settings.set(f.prefs.CALENDAR_SELECTION_KEY, value);
|
|
||||||
assert.equal(f.prefs.readCalendarSelection(), null);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
test('shared reader forwards IDs before limiting, preserves recurrence occurrences and invalidates all cached query variants', async () => {
|
|
||||||
const f = fixture();
|
|
||||||
assert.equal(f.api.readUpcomingEvents(1)[0].title, 'Excluded early');
|
|
||||||
f.api.readUpcomingEvents(1);
|
|
||||||
assert.equal(f.calls.length, 1);
|
|
||||||
let notifications = 0;
|
|
||||||
const off = f.api.onCalendarChanged(() => notifications++);
|
|
||||||
f.prefs.setCalendarSelection(['2']);
|
|
||||||
const rows = f.api.readUpcomingEvents(2);
|
|
||||||
assert.deepEqual(Array.from(rows, event => event.id), [9, 9]);
|
|
||||||
assert.equal(f.calls.at(-1).selection, '["2"]');
|
|
||||||
assert.equal(notifications, 1);
|
|
||||||
assert.equal((await f.api.readUpcomingEventsAsync(1))[0].title, 'Recurrence one');
|
|
||||||
off();
|
|
||||||
f.prefs.setCalendarSelection([]);
|
|
||||||
assert.equal(notifications, 1);
|
|
||||||
assert.equal(f.api.readUpcomingEvents(1).length, 0, 'selection cache key works even without subscriptions');
|
|
||||||
assert.equal(fixture(f.settings).api.readUpcomingEvents().length, 0);
|
|
||||||
f.prefs.setCalendarSelection(['999']);
|
|
||||||
assert.equal(f.api.readUpcomingEvents().length, 0, 'deleted calendar does not revert to all');
|
|
||||||
f.permissions(false);
|
|
||||||
assert.equal(f.api.readUpcomingEvents().length, 0);
|
|
||||||
assert.equal(f.sources.readAvailableCalendars().length, 0);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('calendar menu distinguishes equal names by account and ID; all, none, deleted and individual selections share preferences', () => {
|
|
||||||
const f = fixture();
|
|
||||||
const { CalendarFilterLayer } = load('app/apps/calendar/calendar-filter.ts', {
|
|
||||||
'../../graphics/ui-fonts': { getDefaultSmallFont: () => ({}) },
|
|
||||||
'../../graphics/textwrap': { truncateText: (_font, text) => text },
|
|
||||||
'../../native/calendar-selection': f.prefs,
|
|
||||||
'../../native/calendar-sources': f.sources,
|
|
||||||
'../../native/calendar-permissions': { hasCalendarPermission: () => true },
|
|
||||||
'../../ui/menu': {
|
|
||||||
drawToggleMenuItem: () => {},
|
|
||||||
MenuLayer: class {
|
|
||||||
constructor(_title, items) { this.items = items; this.selectedIndex = 0; }
|
|
||||||
selectItem(index) { this.selectedIndex = index; return this; }
|
|
||||||
setItems(items, index) { this.items = items; this.selectedIndex = index; }
|
|
||||||
paint() { return this.items; }
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}, f.globals);
|
|
||||||
const layer = new CalendarFilterLayer();
|
|
||||||
const ctx = { stack: { getBaseSize: () => ({ width: 576 }) } };
|
|
||||||
const rows = () => layer.paint(ctx, () => {});
|
|
||||||
assert.ok(rows()[2].label.includes('one@example.com'));
|
|
||||||
assert.ok(rows()[3].label.includes('two@example.com'));
|
|
||||||
rows()[2].onSelect();
|
|
||||||
assert.deepEqual(Array.from(f.prefs.readCalendarSelection()), ['2']);
|
|
||||||
rows()[1].onSelect();
|
|
||||||
assert.equal(f.api.readUpcomingEvents().length, 0);
|
|
||||||
rows()[3].onSelect();
|
|
||||||
assert.deepEqual(Array.from(f.prefs.readCalendarSelection()), ['2']);
|
|
||||||
f.calendars.pop();
|
|
||||||
const missing = rows().find(row => row.label === 'Unavailable calendar #2');
|
|
||||||
assert.ok(missing);
|
|
||||||
missing.onSelect();
|
|
||||||
assert.equal(f.prefs.readCalendarSelection().length, 0);
|
|
||||||
rows()[0].onSelect();
|
|
||||||
assert.equal(f.prefs.readCalendarSelection(), null);
|
|
||||||
});
|
|
||||||
|
|
||||||
test('Android provider restricts Instances with bound calendar IDs before cutoff and limit', () => {
|
|
||||||
const kotlin = source('App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawCalendarProvider.kt');
|
|
||||||
assert.match(kotlin, /Instances\.CALENDAR_ID/);
|
|
||||||
assert.match(kotlin, /if \(ids != null && ids.length\(\) == 0\) return "\[\]"/);
|
|
||||||
assert.match(kotlin, /PROJECTION,\s+selection,\s+args,/);
|
|
||||||
assert.ok(kotlin.indexOf('selection,\n args,') < kotlin.indexOf('events.take(limit)'));
|
|
||||||
assert.match(kotlin, /CalendarContract\.Calendars\._ID/);
|
|
||||||
assert.match(kotlin, /CalendarContract\.Calendars\.ACCOUNT_NAME/);
|
|
||||||
for (const file of ['app/apps/calendar/calendar.ts', 'app/apps/glanceboard/widgets/calendar-widget.ts']) {
|
|
||||||
assert.match(source(file), /readUpcomingEvents/);
|
|
||||||
assert.match(source(file), /native\/calendar"/);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
const test = require('node:test');
|
||||||
|
const assert = require('node:assert/strict');
|
||||||
|
const { loader } = require('./helpers/load-typescript.cjs');
|
||||||
|
|
||||||
|
test('Notifications menu dismisses all, including beyond the visible list, and leaves filters untouched', () => {
|
||||||
|
let options, active = Array.from({ length: 80 }, (_, i) => ({ key: String(i) }));
|
||||||
|
let dismissals = 0, renders = 0, pops = 0;
|
||||||
|
const load = loader({}, {
|
||||||
|
'../../ui/notifications': { NotificationsListLayer: class {} },
|
||||||
|
'../../ui/notification-filter': { NotificationFilterLayer: class {} },
|
||||||
|
'../../native/notification-icons': {
|
||||||
|
ALL_NOTIFICATIONS: 0x7fffffff,
|
||||||
|
readActiveNotifications(max) { assert.equal(max, 0x7fffffff); return active; },
|
||||||
|
dismissAllNotifications() { dismissals++; active = []; return true; },
|
||||||
|
onAndroidNotificationsChanged: () => () => {},
|
||||||
|
},
|
||||||
|
'../../ui/shell/in-process-window': {
|
||||||
|
YieldAtRootLayer: class {},
|
||||||
|
createInProcessWindow(value) { options = value; return { requestRender() { renders++; } }; },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
load('app/apps/notifications/notifications-app.ts').createNotificationsAppWindow({});
|
||||||
|
const items = options.menuItems();
|
||||||
|
assert.equal(items[0].label, 'Notification filter');
|
||||||
|
const action = items.find(x => x.label === 'Dismiss all notifications');
|
||||||
|
assert.equal(action.disabled(), false);
|
||||||
|
assert.equal(dismissals, 0);
|
||||||
|
action.onSelect({ stack: { pop() { pops++; } } });
|
||||||
|
assert.equal(dismissals, 1);
|
||||||
|
assert.equal(pops, 1);
|
||||||
|
assert.equal(renders, 1);
|
||||||
|
assert.equal(action.disabled(), true);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('Android bulk action uses the native listener and propagates unavailable access', () => {
|
||||||
|
let calls = 0, allowed = false;
|
||||||
|
const load = loader({ global: { isAndroid: true }, com: { faceclaw: { app: {
|
||||||
|
FaceclawMediaNotificationListenerService: { dismissAllNotifications() { calls++; return allowed; } },
|
||||||
|
} } } }, {
|
||||||
|
'../graphics/image': {}, './frame-timings': {}, '../util/array-util': {},
|
||||||
|
'./notification-sources': {}, './image-files': { PHOTO_TONE: { gamma: 1 } }, './notification-types': { NOTIFICATION_ICON_SIZE: 24 },
|
||||||
|
});
|
||||||
|
const api = load('app/native/notification-icons.ts');
|
||||||
|
assert.equal(api.dismissAllNotifications(), false);
|
||||||
|
allowed = true;
|
||||||
|
assert.equal(api.dismissAllNotifications(), true);
|
||||||
|
assert.equal(calls, 2);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('iOS snapshots all ANCS keys and continues when a notification cannot be dismissed', () => {
|
||||||
|
const load = loader({}, {
|
||||||
|
'../graphics/pebble-icons': {}, '../g2/ancs-client': {}, './notification-app-icons': {}, './notification-sources': {},
|
||||||
|
});
|
||||||
|
const api = load('app/native/notification-icons.ios.ts');
|
||||||
|
assert.equal(api.dismissAllNotifications(), false);
|
||||||
|
const active = Array.from({ length: 80 }, (_, i) => ({ key: String(i) })), attempted = [];
|
||||||
|
api.bindIosNotifications({
|
||||||
|
read(max) { assert.equal(max, api.ALL_NOTIFICATIONS); return active; },
|
||||||
|
dismiss(key) {
|
||||||
|
attempted.push(key);
|
||||||
|
if (key === '1') return false;
|
||||||
|
active.splice(active.findIndex(x => x.key === key), 1);
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
assert.equal(api.dismissAllNotifications(), false);
|
||||||
|
assert.equal(attempted.length, 80);
|
||||||
|
assert.deepEqual(active, [{ key: '1' }]);
|
||||||
|
});
|
||||||
@@ -199,7 +199,6 @@ test('Calendar window subscribes, refreshes periodically, and cleans up on close
|
|||||||
'../../native/calendar': { onCalendarChanged: fn => { listener = fn; return () => unsubscribed++; } },
|
'../../native/calendar': { onCalendarChanged: fn => { listener = fn; return () => unsubscribed++; } },
|
||||||
'../../ui/shell/chrome-layer': { makeImageWindowIcon() {}, windowIcon() {} },
|
'../../ui/shell/chrome-layer': { makeImageWindowIcon() {}, windowIcon() {} },
|
||||||
'./calendar': { CalendarLayer: class {} }, './calendar-icon': {},
|
'./calendar': { CalendarLayer: class {} }, './calendar-icon': {},
|
||||||
'./calendar-filter': { calendarSelectionMenuItems: () => [] },
|
|
||||||
'../../ui/shell/in-process-window': { YieldAtRootLayer: class {}, createInProcessWindow: value => { options = value; return app; } },
|
'../../ui/shell/in-process-window': { YieldAtRootLayer: class {}, createInProcessWindow: value => { options = value; return app; } },
|
||||||
}, { setInterval: fn => { tick = fn; return 1; }, clearInterval: () => cleared++ });
|
}, { setInterval: fn => { tick = fn; return 1; }, clearInterval: () => cleared++ });
|
||||||
createCalendarAppWindow({ onClosed: () => closed++ });
|
createCalendarAppWindow({ onClosed: () => closed++ });
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ const generator = require('../scripts/generate-pebble-icons.cjs');
|
|||||||
function setup(notifications) {
|
function setup(notifications) {
|
||||||
const load = loader({}, {
|
const load = loader({}, {
|
||||||
'../g2/ancs-client': { AncsClient: class {}, ANCS_CONNECT_MESSAGE: '' },
|
'../g2/ancs-client': { AncsClient: class {}, ANCS_CONNECT_MESSAGE: '' },
|
||||||
'./notification-sources': { rememberNotificationSources() {} },
|
'./notification-sources': { rememberNotificationSources() {}, shouldShowNotificationOnGlasses: packageName => packageName !== "muted" },
|
||||||
});
|
});
|
||||||
const icons = load('app/native/notification-icons.ios.ts');
|
const icons = load('app/native/notification-icons.ios.ts');
|
||||||
icons.bindIosNotifications({ read: () => notifications });
|
icons.bindIosNotifications({ read: () => notifications });
|
||||||
@@ -106,3 +106,11 @@ test('the icon generator inverts Pebble art: black ink lights up, white fills hi
|
|||||||
const decoded = loader({}, { './pebble-icons-data': loader({}, {})(dataFile) })('app/graphics/pebble-icons.ts').pebbleIcon('probe');
|
const decoded = loader({}, { './pebble-icons-data': loader({}, {})(dataFile) })('app/graphics/pebble-icons.ts').pebbleIcon('probe');
|
||||||
assert.deepEqual([...decoded.pixels], [...pixels]);
|
assert.deepEqual([...decoded.pixels], [...pixels]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('muted sources are hidden before list and icon limits without removing phone notifications', () => {
|
||||||
|
const notifications = [notification('hidden', 'muted', '0'), notification('shown', 'allowed', '0')];
|
||||||
|
const { icons } = setup(notifications);
|
||||||
|
assert.deepEqual([...icons.readVisibleNotifications(1)].map(n => n.key), ['shown']);
|
||||||
|
assert.deepEqual([...icons.readActiveNotificationIcons(1, false).keys], ['shown']);
|
||||||
|
assert.equal(icons.readActiveNotifications(10).length, 2);
|
||||||
|
});
|
||||||
@@ -70,6 +70,7 @@ function ui(fontSize = 12) {
|
|||||||
const native = {
|
const native = {
|
||||||
ALL_NOTIFICATIONS: 0x7fffffff,
|
ALL_NOTIFICATIONS: 0x7fffffff,
|
||||||
readActiveNotifications: () => { prefs.rememberNotificationSources(active); return active; },
|
readActiveNotifications: () => { prefs.rememberNotificationSources(active); return active; },
|
||||||
|
readVisibleNotifications: () => { prefs.rememberNotificationSources(active); return active.filter(n => prefs.shouldShowNotificationOnGlasses(n.packageName)); },
|
||||||
dismissNotification: () => { dismissals++; active = []; return true; },
|
dismissNotification: () => { dismissals++; active = []; return true; },
|
||||||
readNotificationIconByKey: () => ({ icon: null, stale: false }),
|
readNotificationIconByKey: () => ({ icon: null, stale: false }),
|
||||||
};
|
};
|
||||||
@@ -165,6 +166,7 @@ test('cancel and back dismiss the popup without changing source preferences', as
|
|||||||
test('filter toggles persist after notifications disappear and discovers new sources while open', async () => {
|
test('filter toggles persist after notifications disappear and discovers new sources while open', async () => {
|
||||||
const app = ui();
|
const app = ui();
|
||||||
app.paint(app.filter);
|
app.paint(app.filter);
|
||||||
|
for (let i = 0; i < 3; i++) await app.input(app.filter, 'scroll-down');
|
||||||
await app.input(app.filter, 'click');
|
await app.input(app.filter, 'click');
|
||||||
assert.equal(app.prefs.shouldShowNotificationOnGlasses(mail.packageName), false);
|
assert.equal(app.prefs.shouldShowNotificationOnGlasses(mail.packageName), false);
|
||||||
app.active([{ packageName: 'com.alpha', appName: 'Alpha' }]);
|
app.active([{ packageName: 'com.alpha', appName: 'Alpha' }]);
|
||||||
@@ -177,6 +179,68 @@ test('filter toggles persist after notifications disappear and discovers new sou
|
|||||||
assert.equal(app.prefs.shouldShowNotificationOnGlasses('com.alpha'), true);
|
assert.equal(app.prefs.shouldShowNotificationOnGlasses('com.alpha'), true);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('default persists without overwriting explicit choices, including legacy saved sources', () => {
|
||||||
|
const settings = new Map([['notifications.sources', JSON.stringify([
|
||||||
|
{ ...mail, showOnGlasses: true },
|
||||||
|
{ packageName: 'muted', appName: 'Muted', showOnGlasses: false },
|
||||||
|
])]]);
|
||||||
|
let prefs = store(settings);
|
||||||
|
prefs.rememberNotificationSources([{ packageName: 'discovered', appName: 'Discovered' }]);
|
||||||
|
prefs.setNewNotificationAppsEnabledByDefault(false);
|
||||||
|
prefs = store(settings);
|
||||||
|
assert.equal(prefs.newNotificationAppsEnabledByDefault(), false);
|
||||||
|
assert.equal(prefs.shouldShowNotificationOnGlasses(mail.packageName), true);
|
||||||
|
assert.equal(prefs.shouldShowNotificationOnGlasses('muted'), false);
|
||||||
|
assert.equal(prefs.shouldShowNotificationOnGlasses('discovered'), false);
|
||||||
|
assert.equal(prefs.shouldShowNotificationOnGlasses('future'), false);
|
||||||
|
prefs.rememberNotificationSources([{ packageName: 'future', appName: 'Future' }]);
|
||||||
|
prefs.setNotificationSourceEnabled({ packageName: 'future', appName: 'Future' }, true);
|
||||||
|
prefs.setNewNotificationAppsEnabledByDefault(true);
|
||||||
|
prefs.setNewNotificationAppsEnabledByDefault(false);
|
||||||
|
assert.equal(store(settings).shouldShowNotificationOnGlasses('future'), true);
|
||||||
|
});
|
||||||
|
|
||||||
|
test('bulk choices persist for known sources without changing the default for future sources', () => {
|
||||||
|
const settings = new Map();
|
||||||
|
let prefs = store(settings);
|
||||||
|
prefs.rememberNotificationSources([mail]);
|
||||||
|
prefs.setAllNotificationSourcesEnabled(false);
|
||||||
|
prefs = store(settings);
|
||||||
|
assert.equal(prefs.shouldShowNotificationOnGlasses(mail.packageName), false);
|
||||||
|
assert.equal(prefs.shouldShowNotificationOnGlasses('future'), true);
|
||||||
|
prefs.setNewNotificationAppsEnabledByDefault(false);
|
||||||
|
prefs.setAllNotificationSourcesEnabled(true);
|
||||||
|
prefs = store(settings);
|
||||||
|
assert.equal(prefs.shouldShowNotificationOnGlasses(mail.packageName), true);
|
||||||
|
assert.equal(prefs.shouldShowNotificationOnGlasses('future'), false);
|
||||||
|
prefs.rememberNotificationSources([{ packageName: 'future', appName: 'Future' }]);
|
||||||
|
assert.equal(prefs.shouldShowNotificationOnGlasses('future'), false);
|
||||||
|
prefs.setAllNotificationSourcesEnabled(false);
|
||||||
|
assert.ok(prefs.readNotificationSources().every(source => !source.showOnGlasses));
|
||||||
|
});
|
||||||
|
|
||||||
|
test('filter controls work with an empty list and keep selection as sources arrive', async () => {
|
||||||
|
const app = ui();
|
||||||
|
app.active([]);
|
||||||
|
const labels = app.paint(app.filter).texts.map(({ text }) => text);
|
||||||
|
assert.ok(labels.includes('New apps enabled by default'));
|
||||||
|
assert.ok(labels.includes('Enable all'));
|
||||||
|
assert.ok(labels.includes('Disable all'));
|
||||||
|
await app.input(app.filter, 'click');
|
||||||
|
assert.equal(app.prefs.newNotificationAppsEnabledByDefault(), false);
|
||||||
|
app.active([mail]);
|
||||||
|
app.paint(app.filter);
|
||||||
|
assert.equal(app.prefs.shouldShowNotificationOnGlasses(mail.packageName), false);
|
||||||
|
await app.input(app.filter, 'scroll-down');
|
||||||
|
await app.input(app.filter, 'click');
|
||||||
|
assert.equal(app.prefs.shouldShowNotificationOnGlasses(mail.packageName), true);
|
||||||
|
assert.equal(app.prefs.newNotificationAppsEnabledByDefault(), false);
|
||||||
|
await app.input(app.filter, 'scroll-down');
|
||||||
|
await app.input(app.filter, 'click');
|
||||||
|
assert.equal(app.prefs.shouldShowNotificationOnGlasses(mail.packageName), false);
|
||||||
|
assert.equal(app.dismissals(), 0);
|
||||||
|
});
|
||||||
|
|
||||||
test('popup action wraps fully and stays visible with small and large fonts', async () => {
|
test('popup action wraps fully and stays visible with small and large fonts', async () => {
|
||||||
for (const size of [12, 20]) {
|
for (const size of [12, 20]) {
|
||||||
const app = ui(size);
|
const app = ui(size);
|
||||||
@@ -254,3 +318,33 @@ test('controller filters before waking or opening a popup, and still refreshes t
|
|||||||
elapse();
|
elapse();
|
||||||
assert.equal(popups, 1);
|
assert.equal(popups, 1);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('Android display filters before limits and reapplies preferences to cached tray icons', () => {
|
||||||
|
const prefs = store();
|
||||||
|
const active = [{ ...mail, key: 'hidden' }, { packageName: 'allowed', appName: 'Allowed', key: 'shown' }];
|
||||||
|
const file = ts.createSourceFile('icons.ts', source('app/native/notification-icons.ts'), ts.ScriptTarget.Latest, true);
|
||||||
|
const functions = file.statements.filter(node => ts.isFunctionDeclaration(node) &&
|
||||||
|
['readVisibleNotifications', 'cachedIconsResult'].includes(node.name?.text)).map(node => node.getText(file));
|
||||||
|
const { readVisibleNotifications, cachedIconsResult } = evaluate(functions.join('\n') + '\nexport { cachedIconsResult };', null, {
|
||||||
|
ALL_NOTIFICATIONS: 0x7fffffff,
|
||||||
|
readActiveNotifications: () => { prefs.rememberNotificationSources(active); return active; },
|
||||||
|
shouldShowNotificationOnGlasses: prefs.shouldShowNotificationOnGlasses,
|
||||||
|
cachedKeys: ['hidden', 'shown'],
|
||||||
|
cachedPackages: new Map(active.map(n => [n.key, n.packageName])),
|
||||||
|
cachedIcons: [{ clone: () => 'mail-icon' }, { clone: () => 'allowed-icon' }],
|
||||||
|
});
|
||||||
|
prefs.setNotificationSourceEnabled(mail, false);
|
||||||
|
assert.deepEqual(Array.from(readVisibleNotifications(1), n => n.key), ['shown']);
|
||||||
|
for (const stale of [false, true]) {
|
||||||
|
const result = cachedIconsResult(1, stale);
|
||||||
|
assert.deepEqual(Array.from(result.keys), ['shown']);
|
||||||
|
assert.deepEqual(Array.from(result.icons), ['allowed-icon']);
|
||||||
|
assert.equal(result.stale, stale);
|
||||||
|
}
|
||||||
|
prefs.setAllNotificationSourcesEnabled(false);
|
||||||
|
assert.equal(cachedIconsResult(10, false).keys.length, 0);
|
||||||
|
assert.equal(readVisibleNotifications(50).length, 0);
|
||||||
|
prefs.setNotificationSourceEnabled(mail, true);
|
||||||
|
assert.deepEqual(Array.from(cachedIconsResult(1, false).keys), ['hidden']);
|
||||||
|
assert.equal(active.length, 2);
|
||||||
|
});
|
||||||
Reference in new issue
Block a user