Skip to content

fix(mobile): the Android usage widget lists and scrolls every limit again #23077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
voida6 wants to merge 3 commits into
base: main
Choose a base branch
from
+75 −64
Open

fix(mobile): the Android usage widget lists and scrolls every limit again #23077

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a6e10a1
fix(mobile): the Android usage widget lists and scrolls every limit a…
voida6 Oct 21, 2026
fe85b58
chore(mobile): merge main into android widget repair
maria-rcks Oct 26, 2026
483c548
Merge remote-tracking branch 'origin/main' into fix/android-widget-sc…
juliusmarminge Nov 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
139 changes: 75 additions & 64 deletions apps/mobile/src/widgets/SubscriptionUsage.android.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {
Button,
Column,
getMaterialColors,
LazyColumn,
LinearProgressIndicator,
Text,
} from "@expo/ui/jetpack-compose";
Expand All @@ -13,14 +14,14 @@ import {
paddingAll,
} from "@expo/ui/jetpack-compose/modifiers";
import { createWidget, type WidgetEnvironment } from "expo-widgets";
import type { ReactNode } from "react";

import type { SubscriptionUsageSnapshot as SubscriptionUsageProps } from "./subscriptionUsageSnapshot";

export function SubscriptionUsage(props: SubscriptionUsageProps, environment: WidgetEnvironment) {
"widget";
// The widget runtime evaluates this function without the app's module scope.
const now = Date.now();
const limit = 2;
const mode = props.theme?.mode;
const appearance =
mode === "light" || mode === "dark"
Expand All @@ -44,6 +45,19 @@ export function SubscriptionUsage(props: SubscriptionUsageProps, environment: Wi
{ name: "Codex", detail: "Open T3 to connect", windows: [], expiresAt: 0, totalWindows: 0 },
{ name: "Claude", detail: "Open T3 to connect", windows: [], expiresAt: 0, totalWindows: 0 },
];
const rows = providers.map((provider) => {
const stale =
provider.windows.length > 0 && provider.expiresAt > 0 && now >= provider.expiresAt;
return { provider, stale, shown: stale ? [] : provider.windows };
});
// Placeholders such as "Open T3 to refresh" are not limits.
const limits = rows.reduce((total, row) => total + row.shown.length, 0);
// A scrolling list swallows taps meant for the card behind it, so each item is its own tap target.
const tappable = (key: string, child: ReactNode) => (
<Button key={key} modifiers={[fillMaxWidth()]} onClick={() => {}}>
{child}
</Button>
);
return (
// Android lacks widgetURL; one card Button routes taps to the app listener opening props.url.
<Button
Expand All @@ -52,71 +66,68 @@ export function SubscriptionUsage(props: SubscriptionUsageProps, environment: Wi
onClick={() => {}}
>
<Column modifiers={[fillMaxSize(), paddingAll(16)]}>
{providers.map((provider, index) => {
const stale =
provider.windows.length > 0 && provider.expiresAt > 0 && now >= provider.expiresAt;
const shown = stale ? [] : provider.windows.slice(0, limit);
const hidden = stale ? 0 : (provider.totalWindows ?? provider.windows.length) - limit;
return (
<Column
key={provider.name}
modifiers={[fillMaxWidth(), padding(0, index === 0 ? 0 : 10, 0, 0)]}
>
<Text
color={colors.onSurface}
maxLines={1}
style={{ fontSize: 13, fontWeight: "bold" }}
>
{provider.name}
</Text>
{shown.length === 0 ? (
<Text color={muted} maxLines={1} style={{ fontSize: 11 }}>
{stale ? "Open T3 to refresh" : provider.detail}
<Text color={colors.onSurface} maxLines={1} style={{ fontSize: 16, fontWeight: "bold" }}>
{limits > 0 ? `Subscription usage (${limits})` : "Subscription usage"}
</Text>
<LazyColumn modifiers={[fillMaxWidth()]}>
{rows.flatMap(({ provider, shown, stale }, index) => [
tappable(
provider.name,
<Column modifiers={[fillMaxWidth(), padding(0, index === 0 ? 0 : 10, 0, 0)]}>
<Text
color={colors.onSurface}
maxLines={1}
style={{ fontSize: 13, fontWeight: "bold" }}
>
{provider.name}
</Text>
) : null}
{shown.map((window) => {
const low = window.remaining <= 10;
return (
<Column key={window.label} modifiers={[fillMaxWidth(), padding(0, 4, 0, 0)]}>
<Text
color={low ? colors.error : colors.onSurface}
maxLines={1}
style={{ fontSize: 11 }}
>
{`${window.label} · ${window.remaining}% left`}
</Text>
<Column modifiers={[fillMaxWidth(), padding(0, 3, 0, 3)]}>
<LinearProgressIndicator
progress={window.remaining / 100}
color={low ? colors.error : colors.primary}
trackColor={colors.surfaceVariant}
modifiers={[fillMaxWidth(), height(6)]}
/>
</Column>
<Text color={muted} maxLines={1} style={{ fontSize: 10 }}>
{window.reset}
</Text>
{shown.length === 0 ? (
<Text color={muted} maxLines={1} style={{ fontSize: 11 }}>
{stale ? "Open T3 to refresh" : provider.detail}
</Text>
) : null}
</Column>,
),
...shown.map((window) => {
const low = window.remaining <= 10;
return tappable(
`${provider.name}:${window.label}`,
<Column modifiers={[fillMaxWidth(), padding(0, 4, 0, 0)]}>
<Text
color={low ? colors.error : colors.onSurface}
maxLines={1}
style={{ fontSize: 11 }}
>
{`${window.label} · ${window.remaining}% left`}
</Text>
<Column modifiers={[fillMaxWidth(), padding(0, 3, 0, 3)]}>
<LinearProgressIndicator
progress={window.remaining / 100}
color={low ? colors.error : colors.primary}
trackColor={colors.surfaceVariant}
modifiers={[fillMaxWidth(), height(6)]}
/>
</Column>
);
})}
{hidden > 0 ? (
<Text color={muted} maxLines={1} style={{ fontSize: 10 }}>
{`${hidden} more in T3`}
</Text>
) : null}
</Column>
);
})}
<Text
color={muted}
maxLines={1}
style={{ fontSize: 10 }}
modifiers={[padding(0, 10, 0, 0)]}
>
{props.checkedAt
? `As of ${new Date(props.checkedAt).toLocaleString(undefined, { hour: "numeric", minute: "2-digit", month: "short", day: "numeric" })}`
: "Tap to connect in T3"}
</Text>
<Text color={muted} maxLines={1} style={{ fontSize: 10 }}>
{window.reset}
</Text>
</Column>,
);
}),
])}
{/* The runtime ignores weight, so a footer after the list would be pushed out of the card. */}
{/* A Button holding bare text renders as a Material button; a Column keeps it a plain tap target. */}
{tappable(
"checked",
<Column modifiers={[fillMaxWidth(), padding(0, 10, 0, 0)]}>
<Text color={muted} maxLines={1} style={{ fontSize: 10 }}>
{props.checkedAt
? `Last checked ${new Date(props.checkedAt).toLocaleString(undefined, { hour: "numeric", minute: "2-digit", month: "short", day: "numeric" })}`
: "Tap to connect in T3"}
</Text>
</Column>,
)}
</LazyColumn>
</Column>
</Button>
);
Expand Down
Loading