Skip to content

Commit ba20664

Browse files
jwlillyjwlilly
committed
2.0.5
- Added pane title - Added window title - Showing content description in tree node - Added support for hint - Fixing issue with showing content invalid property - Updating target size to only check visible elements
1 parent a37715d commit ba20664

6 files changed

Lines changed: 74 additions & 41 deletions

File tree

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"hot",
1313
"reload"
1414
],
15-
"version": "2.0.4",
15+
"version": "2.0.5",
1616
"homepage": "https://github.com/jwlilly/Android-Accessibility-Inspector-Ap/#readme",
1717
"bugs": {
1818
"url": "https://github.com/jwlilly/Android-Accessibility-Inspector-App/issues"
@@ -36,7 +36,7 @@
3636
"postinstall": "ts-node .erb/scripts/check-native-dep.js && electron-builder install-app-deps && npm run build:dll && npx patch-package",
3737
"lint": "cross-env NODE_ENV=development eslint . --ext .js,.jsx,.ts,.tsx",
3838
"lint:fix": "cross-env NODE_ENV=development eslint . --ext .js,.jsx,.ts,.tsx --fix",
39-
"package": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish never && npm run build:dll",
39+
"package": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build -w -m --x64 --arm64 --publish never && npm run build:dll",
4040
"publish": "ts-node ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish=onTagOrDraft && npm run build:dll",
4141
"rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir release/app",
4242
"prestart": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.main.dev.ts",

‎release/app/package-lock.json‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎release/app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "android-accessibility-inspector",
3-
"version": "2.0.4",
3+
"version": "2.0.5",
44
"description": "View and analyze the accessibility tree for Android apps",
55
"license": "GPL-3.0-only",
66
"author": {

‎src/renderer/views/basic-tree-view.tsx‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,26 @@ const BasicTreeView = function BasicTreeView({
6565
}
6666
};
6767

68+
const renderSupplementalInfo = (element: INode<IFlatMetadata>) => {
69+
if (element !== undefined && element.metadata !== undefined) {
70+
if (element.metadata.content !== undefined) {
71+
return (
72+
<div className="overflow-hidden text-xs font-thin max-w-44 text-ellipsis whitespace-nowrap">
73+
{element.metadata.content}
74+
</div>
75+
);
76+
}
77+
if (element.metadata.text !== undefined) {
78+
return (
79+
<div className="overflow-hidden text-xs font-thin max-w-44 text-ellipsis whitespace-nowrap">
80+
{element.metadata.text}
81+
</div>
82+
);
83+
}
84+
}
85+
return null;
86+
};
87+
6888
const viewExpanded = useCallback((expandedData: ITreeViewOnExpandProps) => {
6989
if (expandedData.isExpanded) {
7090
setExpandedIds((expandArray) => [
@@ -232,12 +252,7 @@ const BasicTreeView = function BasicTreeView({
232252
<div className="flex flex-row overflow-hidden whitespace-nowrap">
233253
<div className="flex-col">
234254
{element.name}
235-
{element.metadata !== undefined &&
236-
element.metadata.text !== undefined ? (
237-
<div className="overflow-hidden text-xs font-thin max-w-44 text-ellipsis whitespace-nowrap">
238-
{element.metadata.text}
239-
</div>
240-
) : null}
255+
{renderSupplementalInfo(element)}
241256
<span className="sr-only">
242257
{isSelected ? 'selected' : ''}
243258
</span>

‎src/renderer/views/main-view.tsx‎

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ function MainView(): React.JSX.Element {
118118
item.metadata &&
119119
item.metadata.properties &&
120120
item.metadata.properties.includes('clickable') &&
121+
item.metadata.visibility !== 'invisible' &&
121122
(item.metadata.scaledWidth < 24.0 || item.metadata.scaledHeight < 24.0);
122123
if (clickable) {
123124
const scaleFactor = item.metadata.dpScaleFactor;
@@ -148,36 +149,39 @@ function MainView(): React.JSX.Element {
148149
setOverlappingViews(overlaps);
149150
};
150151

151-
const messageReceived = useCallback((data: any) => {
152-
if (!data.announcement) {
153-
setSelectedView(0);
154-
setViewHierarchy(data);
155-
findOverlappingViews(data);
156-
setSearchTerm('');
157-
} else if (data.announcement) {
158-
toast.info(
159-
<div className="flex flex-col">
160-
<h2 className="text-md">accessibility announcement </h2>
161-
<div className="text-sm">{data.announcement}</div>
162-
</div>,
163-
);
164-
const currentDate = new Date();
165-
const day = currentDate.getDay();
166-
const month = currentDate.getMonth();
167-
const year = currentDate.getFullYear();
168-
const hour = currentDate.getHours();
169-
const minutes = currentDate.getMinutes();
170-
const seconds = currentDate.getSeconds();
171-
const message = {
172-
time: `${month}/${day}/${year}-${hour}:${minutes}:${seconds}`,
173-
message: data.announcement,
174-
type: 'accessibility announcement',
175-
id: Math.random() * (5000 - 0) + 0,
176-
};
152+
const messageReceived = useCallback(
153+
(data: any) => {
154+
if (!data.announcement) {
155+
setSelectedView(0);
156+
setViewHierarchy(data);
157+
findOverlappingViews(data);
158+
setSearchTerm('');
159+
} else if (data.announcement) {
160+
toast.info(
161+
<div className="flex flex-col">
162+
<h2 className="text-md">accessibility announcement </h2>
163+
<div className="text-sm">{data.announcement}</div>
164+
</div>,
165+
);
166+
const currentDate = new Date();
167+
const day = currentDate.getDay();
168+
const month = currentDate.getMonth();
169+
const year = currentDate.getFullYear();
170+
const hour = currentDate.getHours();
171+
const minutes = currentDate.getMinutes();
172+
const seconds = currentDate.getSeconds();
173+
const message = {
174+
time: `${month}/${day}/${year}-${hour}:${minutes}:${seconds}`,
175+
message: data.announcement,
176+
type: 'accessibility announcement',
177+
id: Math.random() * (5000 - 0) + 0,
178+
};
177179

178-
setLogMessages((logMessages) => [...logMessages, message]);
179-
}
180-
}, []);
180+
setLogMessages((logMessages) => [...logMessages, message]);
181+
}
182+
},
183+
[setLogMessages],
184+
);
181185

182186
const handleBlur = useCallback((e: { currentTarget: any }) => {
183187
const { currentTarget } = e;

‎src/renderer/views/view-details.tsx‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,10 @@ const ViewDetails = function ViewDetails({ selectedView, viewHierarchy }: any) {
124124
{transformData(view.metadata.content)}
125125
</td>
126126
</tr>
127+
<tr>
128+
<td>hint</td>
129+
<td className="font-mono">{transformData(view.metadata.hint)}</td>
130+
</tr>
127131
<tr>
128132
<td>heading</td>
129133
<td className="font-mono">
@@ -146,6 +150,16 @@ const ViewDetails = function ViewDetails({ selectedView, viewHierarchy }: any) {
146150
{transformData(view.metadata.tooltip)}
147151
</td>
148152
</tr>
153+
<tr>
154+
<td>{view.metadata.role === 'Window' ? 'title' : 'pane title'}</td>
155+
<td className="font-mono">
156+
{transformData(
157+
view.metadata.role === 'Window'
158+
? view.metadata.title
159+
: view.metadata.paneTitle,
160+
)}
161+
</td>
162+
</tr>
149163
<tr>
150164
<td>checked</td>
151165
<td className="font-mono">
@@ -155,7 +169,7 @@ const ViewDetails = function ViewDetails({ selectedView, viewHierarchy }: any) {
155169
<tr>
156170
<td>content invalid</td>
157171
<td className="font-mono">
158-
{transformData(view.metadata.contentInvalid)}
172+
{view.metadata.contentInvalid ? 'true' : 'false'}
159173
</td>
160174
</tr>
161175
<tr>

0 commit comments

Comments
 (0)