Fix the small mechanical rules. [skip build]
Checks / checks (push) Successful in 2m12s
Trigger cinny-mobile / dispatch (push) Successful in 1s

This commit is contained in:
2026-11-01 10:28:59 +11:00
parent bb85cd9778
commit 73554ecf7f
45 changed files with 331 additions and 347 deletions
+65 -72
View File
@@ -205,6 +205,70 @@ export function Settings({ initialPage, requestClose }: SettingsProps) {
const isSearching = searchQuery.trim().length > 0;
let navContent: React.ReactNode;
if (isSearching) {
if (searchResults.length > 0) {
navContent = searchResults.map(({ item }) => (
<button
key={`${item.page}-${item.title}`}
type="button"
className={SettingsSearchResult}
aria-pressed={activePage === item.page}
onClick={() => openSearchResult(item.page, item.title)}
>
<Box shrink="No" style={{ paddingTop: config.space.S100 }}>
<Icon
src={iconByPage.get(item.page) ?? Icons.Setting}
size="100"
filled={activePage === item.page}
/>
</Box>
<Box grow="Yes" direction="Column" gap="100" style={{ minWidth: 0 }}>
<Text
className={BreakWord}
size="T300"
style={{
fontWeight: activePage === item.page ? config.fontWeight.W600 : undefined,
}}
>
{item.title}
</Text>
<Text size="T200" priority="300">
{pageNameByPage.get(item.page)}
</Text>
</Box>
</button>
));
} else {
navContent = (
<Box direction="Column" alignItems="Center" style={{ padding: config.space.S400 }}>
<Text size="T300" priority="300" className={BreakWord}>
No settings match “{searchQuery.trim()}”
</Text>
</Box>
);
}
} else {
navContent = menuItems.map((item) => (
<MenuItem
key={item.name}
variant="Background"
radii="400"
aria-pressed={activePage === item.page}
before={<Icon src={item.icon} size="100" filled={activePage === item.page} />}
onClick={() => setActivePage(item.page)}
>
<Text
style={{ fontWeight: activePage === item.page ? config.fontWeight.W600 : undefined }}
size="T300"
truncate
>
{item.name}
</Text>
</MenuItem>
));
}
return (
<SettingsFocusProvider value={settingsFocus}>
<PageRoot
@@ -261,78 +325,7 @@ export function Settings({ initialPage, requestClose }: SettingsProps) {
/>
</Box>
<PageNavContent>
<div style={{ flexGrow: 1 }}>
{isSearching ? (
searchResults.length > 0 ? (
searchResults.map(({ item }) => (
<button
key={`${item.page}-${item.title}`}
type="button"
className={SettingsSearchResult}
aria-pressed={activePage === item.page}
onClick={() => openSearchResult(item.page, item.title)}
>
<Box shrink="No" style={{ paddingTop: config.space.S100 }}>
<Icon
src={iconByPage.get(item.page) ?? Icons.Setting}
size="100"
filled={activePage === item.page}
/>
</Box>
<Box grow="Yes" direction="Column" gap="100" style={{ minWidth: 0 }}>
<Text
className={BreakWord}
size="T300"
style={{
fontWeight:
activePage === item.page ? config.fontWeight.W600 : undefined,
}}
>
{item.title}
</Text>
<Text size="T200" priority="300">
{pageNameByPage.get(item.page)}
</Text>
</Box>
</button>
))
) : (
<Box
direction="Column"
alignItems="Center"
style={{ padding: config.space.S400 }}
>
<Text size="T300" priority="300" className={BreakWord}>
No settings match “{searchQuery.trim()}”
</Text>
</Box>
)
) : (
menuItems.map((item) => (
<MenuItem
key={item.name}
variant="Background"
radii="400"
aria-pressed={activePage === item.page}
before={
<Icon src={item.icon} size="100" filled={activePage === item.page} />
}
onClick={() => setActivePage(item.page)}
>
<Text
style={{
fontWeight:
activePage === item.page ? config.fontWeight.W600 : undefined,
}}
size="T300"
truncate
>
{item.name}
</Text>
</MenuItem>
))
)}
</div>
<div style={{ flexGrow: 1 }}>{navContent}</div>
</PageNavContent>
<Box style={{ padding: config.space.S200 }} shrink="No" direction="Column">
<UseStateProvider initial={false}>
@@ -390,9 +390,9 @@ function ProfileBanner({
setError(undefined);
try {
await mx.setAvatarUrl(upload.mxc);
const userId = mx.getUserId();
if (userId) {
const user = mx.getUser(userId);
const currentUserId = mx.getUserId();
if (currentUserId) {
const user = mx.getUser(currentUserId);
if (user && user.avatarUrl !== upload.mxc) {
user.setAvatarUrl(upload.mxc);
}
+40 -32
View File
@@ -771,6 +771,42 @@ export function Audio({ requestClose }: AudioProps) {
settings.autoGainControl,
]);
let micVariant: 'Critical' | 'Success' | 'Secondary';
if (micTestState === 'error') {
micVariant = 'Critical';
} else if (micTestState === 'done') {
micVariant = 'Success';
} else {
micVariant = 'Secondary';
}
let micLabel = 'Test';
if (micTestState === 'testing') {
micLabel = 'Testing...';
} else if (micTestState === 'done') {
micLabel = 'Done ✓';
} else if (micTestState === 'error') {
micLabel = 'Failed';
}
let speakerVariant: 'Critical' | 'Success' | 'Secondary';
if (speakerTestState === 'error') {
speakerVariant = 'Critical';
} else if (speakerTestState === 'done') {
speakerVariant = 'Success';
} else {
speakerVariant = 'Secondary';
}
let speakerLabel = 'Test';
if (speakerTestState === 'testing') {
speakerLabel = 'Playing...';
} else if (speakerTestState === 'done') {
speakerLabel = 'Done ✓';
} else if (speakerTestState === 'error') {
speakerLabel = 'Failed';
}
return (
<Page>
<PageHeader>
@@ -833,27 +869,13 @@ export function Audio({ requestClose }: AudioProps) {
<Box gap="200" alignItems="Center">
<Button
size="300"
variant={
micTestState === 'error'
? 'Critical'
: micTestState === 'done'
? 'Success'
: 'Secondary'
}
variant={micVariant}
fill="Soft"
radii="300"
onClick={handleTestMicrophone}
disabled={micTestState === 'testing' || micMonitoring}
>
<Text size="T300">
{micTestState === 'testing'
? 'Testing...'
: micTestState === 'done'
? 'Done ✓'
: micTestState === 'error'
? 'Failed'
: 'Test'}
</Text>
<Text size="T300">{micLabel}</Text>
</Button>
<Button
size="300"
@@ -915,27 +937,13 @@ export function Audio({ requestClose }: AudioProps) {
/>
<Button
size="300"
variant={
speakerTestState === 'error'
? 'Critical'
: speakerTestState === 'done'
? 'Success'
: 'Secondary'
}
variant={speakerVariant}
fill="Soft"
radii="300"
onClick={handleTestSpeaker}
disabled={speakerTestState === 'testing'}
>
<Text size="T300">
{speakerTestState === 'testing'
? 'Playing...'
: speakerTestState === 'done'
? 'Done ✓'
: speakerTestState === 'error'
? 'Failed'
: 'Test'}
</Text>
<Text size="T300">{speakerLabel}</Text>
</Button>
</Box>
}
@@ -98,9 +98,9 @@ export function DeveloperTools({ requestClose }: DeveloperToolsProps) {
);
const handleProfileExpand = useCallback(
(expand: boolean) => {
setProfileExpand(expand);
if (expand) fetchProfileFields(profileUserId.trim());
(expanded: boolean) => {
setProfileExpand(expanded);
if (expanded) fetchProfileFields(profileUserId.trim());
},
[fetchProfileFields, profileUserId],
);
@@ -184,11 +184,12 @@ function AndroidPushNotifications() {
const refresh = useCallback(async () => {
setLoading(true);
const s = await getBackgroundSyncStatus();
const distributors = Array.isArray(s?.distributors)
? s.distributors
: typeof s?.distributors === 'string' && s.distributors && s.distributors !== '[]'
? [s.distributors]
: [];
let distributors: string[] = [];
if (Array.isArray(s?.distributors)) {
distributors = s.distributors;
} else if (typeof s?.distributors === 'string' && s.distributors && s.distributors !== '[]') {
distributors = [s.distributors];
}
setStatus(
s
? {
@@ -205,7 +206,7 @@ function AndroidPushNotifications() {
}, []);
useEffect(() => {
void refresh();
refresh();
}, [refresh]);
const [resetState, reset] = useAsyncCallback(
@@ -109,7 +109,7 @@ export function PluginLoader({ matrixClient, children }: PluginLoaderProps) {
};
}, [matrixClient]);
return <>{children}</>;
return children;
}
/**