Skip to content

Commit d7913ac

Browse files
BBvmlabsBBvmlabs
committed
package v1.1.0
1 parent d7aa39b commit d7913ac

5 files changed

Lines changed: 77 additions & 74 deletions

File tree

‎.vscode/tasks.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
{
1717
"label": "Build Extension (Prod)",
1818
"type": "shell",
19-
"command": "node ./scripts/set-flavor.js prod && npx vsce package",
19+
"command": "npm run package",
2020
"group": {
2121
"kind": "build",
2222
"isDefault": true

‎extension.js‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ async function activate(context) {
2424
const viewTitle = isDev ? 'Dev-Devices' : 'Devices';
2525

2626
// Register the TreeView
27-
const treeView = vscode.window.createTreeView('dev-adbDevices', {
27+
const treeView = vscode.window.createTreeView('adbDevices', {
2828
treeDataProvider: provider,
2929
showCollapseAll: true
3030
});
@@ -33,24 +33,24 @@ async function activate(context) {
3333
// Register the toolbar WebviewView
3434
const toolbarProvider = new AdbToolbarProvider(context, isDev);
3535
context.subscriptions.push(
36-
vscode.window.registerWebviewViewProvider('dev-adbToolbar', toolbarProvider)
36+
vscode.window.registerWebviewViewProvider('adbToolbar', toolbarProvider)
3737
);
3838

3939
const commands = [
40-
vscode.commands.registerCommand('dev.wirelessDebug.refreshDevices', () => provider.refresh()),
41-
vscode.commands.registerCommand('dev.wirelessDebug.autoConnect', () => autoDiscoverConnect(provider)),
42-
vscode.commands.registerCommand('dev.wirelessDebug.clearHistory', () => provider.clearHistory()),
43-
vscode.commands.registerCommand('dev.wirelessDebug.pair', () => pairDevice(provider)),
44-
vscode.commands.registerCommand('dev.wirelessDebug.pairQr', () => wirelessPairingQr(provider)),
45-
vscode.commands.registerCommand('dev.wirelessDebug.connect', (d) => connectDevice(provider, d)),
46-
vscode.commands.registerCommand('dev.wirelessDebug.disconnect', (d) => d && disconnectDevice(d, provider)),
47-
vscode.commands.registerCommand('dev.wirelessDebug.mirror', async (d) => await mirrorDevice(d || await selectDevice(provider))),
48-
vscode.commands.registerCommand('dev.wirelessDebug.liveView', async (d) => await startLiveView(d || await selectDevice(provider))),
49-
vscode.commands.registerCommand('dev.wirelessDebug.logcat', (d) => d && openLogcat(d)),
50-
vscode.commands.registerCommand('dev.wirelessDebug.screenshot', (d) => d && takeScreenshot(d)),
51-
vscode.commands.registerCommand('dev.wirelessDebug.switchToWireless', (d) => d && switchToWireless(d, provider)),
52-
vscode.commands.registerCommand('dev.wirelessDebug.reboot', (d) => d && rebootDevice(d, provider)),
53-
vscode.commands.registerCommand('dev.wirelessDebug.deleteHistoryItem', (d) => d && provider.deleteHistoryItem(d)),
40+
vscode.commands.registerCommand('wirelessDebug.refreshDevices', () => provider.refresh()),
41+
vscode.commands.registerCommand('wirelessDebug.autoConnect', () => autoDiscoverConnect(provider)),
42+
vscode.commands.registerCommand('wirelessDebug.clearHistory', () => provider.clearHistory()),
43+
vscode.commands.registerCommand('wirelessDebug.pair', () => pairDevice(provider)),
44+
vscode.commands.registerCommand('wirelessDebug.pairQr', () => wirelessPairingQr(provider)),
45+
vscode.commands.registerCommand('wirelessDebug.connect', (d) => connectDevice(provider, d)),
46+
vscode.commands.registerCommand('wirelessDebug.disconnect', (d) => d && disconnectDevice(d, provider)),
47+
vscode.commands.registerCommand('wirelessDebug.mirror', async (d) => await mirrorDevice(d || await selectDevice(provider))),
48+
vscode.commands.registerCommand('wirelessDebug.liveView', async (d) => await startLiveView(d || await selectDevice(provider))),
49+
vscode.commands.registerCommand('wirelessDebug.logcat', (d) => d && openLogcat(d)),
50+
vscode.commands.registerCommand('wirelessDebug.screenshot', (d) => d && takeScreenshot(d)),
51+
vscode.commands.registerCommand('wirelessDebug.switchToWireless', (d) => d && switchToWireless(d, provider)),
52+
vscode.commands.registerCommand('wirelessDebug.reboot', (d) => d && rebootDevice(d, provider)),
53+
vscode.commands.registerCommand('wirelessDebug.deleteHistoryItem', (d) => d && provider.deleteHistoryItem(d)),
5454
];
5555

5656
context.subscriptions.push(provider, treeView, ...commands);

‎package.json‎

Lines changed: 58 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "dev-wireless-debug-extension",
2+
"name": "wireless-debug-extension",
33
"publisher": "bbvmlabs",
4-
"displayName": "Dev Wireless Debug",
4+
"displayName": "Wireless Debug",
55
"description": "Wireless Android debugging using adb pair and connect",
66
"version": "1.1.0",
77
"icon": "media/icon.png",
@@ -10,25 +10,25 @@
1010
"vscode": "^1.60.0"
1111
},
1212
"activationEvents": [
13-
"onView:dev-adbDevices",
14-
"onView:dev-adbToolbar",
15-
"onCommand:dev.wirelessDebug.pair",
16-
"onCommand:dev.wirelessDebug.pairQr",
17-
"onCommand:dev.wirelessDebug.connect",
18-
"onCommand:dev.wirelessDebug.refreshDevices",
19-
"onCommand:dev.wirelessDebug.disconnect",
20-
"onCommand:dev.wirelessDebug.mirror",
21-
"onCommand:dev.wirelessDebug.logcat",
22-
"onCommand:dev.wirelessDebug.screenshot",
23-
"onCommand:dev.wirelessDebug.switchToWireless",
24-
"onCommand:dev.wirelessDebug.reboot"
13+
"onView:adbDevices",
14+
"onView:adbToolbar",
15+
"onCommand:wirelessDebug.pair",
16+
"onCommand:wirelessDebug.pairQr",
17+
"onCommand:wirelessDebug.connect",
18+
"onCommand:wirelessDebug.refreshDevices",
19+
"onCommand:wirelessDebug.disconnect",
20+
"onCommand:wirelessDebug.mirror",
21+
"onCommand:wirelessDebug.logcat",
22+
"onCommand:wirelessDebug.screenshot",
23+
"onCommand:wirelessDebug.switchToWireless",
24+
"onCommand:wirelessDebug.reboot"
2525
],
2626
"main": "./extension.js",
2727
"contributes": {
2828
"configuration": {
2929
"title": "ADB Wireless Debug",
3030
"properties": {
31-
"dev.wirelessDebug.scrcpyPath": {
31+
"wirelessDebug.scrcpyPath": {
3232
"type": "string",
3333
"default": "scrcpy",
3434
"description": "Path to the scrcpy executable. Default is 'scrcpy' (must be in PATH)."
@@ -38,153 +38,156 @@
3838
"viewsContainers": {
3939
"activitybar": [
4040
{
41-
"id": "dev-adb-wireless-view",
41+
"id": "adb-wireless-view",
4242
"title": "ADB Wireless",
4343
"icon": "media/logo.svg"
4444
}
4545
]
4646
},
4747
"views": {
48-
"dev-adb-wireless-view": [
48+
"adb-wireless-view": [
4949
{
5050
"type": "webview",
51-
"id": "dev-adbToolbar",
52-
"name": "Dev-ADB Wireless"
51+
"id": "adbToolbar",
52+
"name": "ADB Wireless"
5353
},
5454
{
55-
"id": "dev-adbDevices",
56-
"name": "Dev-Devices"
55+
"id": "adbDevices",
56+
"name": "Devices"
5757
}
5858
]
5959
},
6060
"commands": [
6161
{
62-
"command": "dev.wirelessDebug.refreshDevices",
62+
"command": "wirelessDebug.refreshDevices",
6363
"title": "Refresh Devices",
6464
"icon": "$(refresh)"
6565
},
6666
{
67-
"command": "dev.wirelessDebug.clearHistory",
67+
"command": "wirelessDebug.clearHistory",
6868
"title": "Clear History",
6969
"icon": "$(trash)"
7070
},
7171
{
72-
"command": "dev.wirelessDebug.deleteHistoryItem",
72+
"command": "wirelessDebug.deleteHistoryItem",
7373
"title": "Remove from History",
7474
"icon": "$(close)"
7575
},
7676
{
77-
"command": "dev.wirelessDebug.pair",
77+
"command": "wirelessDebug.pair",
7878
"title": "Pair Device via Code"
7979
},
8080
{
81-
"command": "dev.wirelessDebug.pairQr",
81+
"command": "wirelessDebug.pairQr",
8282
"title": "Pair Device via QR Code",
8383
"icon": "$(device-camera)"
8484
},
8585
{
86-
"command": "dev.wirelessDebug.connect",
86+
"command": "wirelessDebug.connect",
8787
"title": "Connect to Device",
8888
"icon": "$(link)"
8989
},
9090
{
91-
"command": "dev.wirelessDebug.disconnect",
91+
"command": "wirelessDebug.disconnect",
9292
"title": "Disconnect Device",
9393
"icon": "$(debug-disconnect)"
9494
},
9595
{
96-
"command": "dev.wirelessDebug.mirror",
96+
"command": "wirelessDebug.mirror",
9797
"title": "Screen Mirror (scrcpy)",
9898
"icon": "$(display)"
9999
},
100100
{
101-
"command": "dev.wirelessDebug.logcat",
101+
"command": "wirelessDebug.logcat",
102102
"title": "Open Logcat",
103103
"icon": "$(output)"
104104
},
105105
{
106-
"command": "dev.wirelessDebug.screenshot",
106+
"command": "wirelessDebug.screenshot",
107107
"title": "Take Screenshot",
108108
"icon": "$(camera)"
109109
},
110110
{
111-
"command": "dev.wirelessDebug.switchToWireless",
111+
"command": "wirelessDebug.switchToWireless",
112112
"title": "Switch to Wireless mode",
113113
"icon": "$(rss)"
114114
},
115115
{
116-
"command": "dev.wirelessDebug.autoConnect",
116+
"command": "wirelessDebug.autoConnect",
117117
"title": "Auto-Discover & Connect",
118118
"icon": "$(broadcast)"
119119
},
120120
{
121-
"command": "dev.wirelessDebug.liveView",
121+
"command": "wirelessDebug.liveView",
122122
"title": "Live View (Internal Mirror)",
123123
"icon": "$(vm-active)"
124124
},
125125
{
126-
"command": "dev.wirelessDebug.reboot",
126+
"command": "wirelessDebug.reboot",
127127
"title": "Reboot Device",
128128
"icon": "$(sync)"
129129
}
130130
],
131131
"menus": {
132132
"view/title": [
133133
{
134-
"command": "dev.wirelessDebug.refreshDevices",
135-
"when": "view == dev-adbDevices",
134+
"command": "wirelessDebug.refreshDevices",
135+
"when": "view == adbDevices",
136136
"group": "navigation"
137137
}
138138
],
139139
"view/item/context": [
140140
{
141-
"command": "dev.wirelessDebug.connect",
142-
"when": "view == dev-adbDevices && viewItem == recentDevice",
141+
"command": "wirelessDebug.connect",
142+
"when": "view == adbDevices && viewItem == recentDevice",
143143
"group": "inline@1"
144144
},
145145
{
146-
"command": "dev.wirelessDebug.deleteHistoryItem",
147-
"when": "view == dev-adbDevices && viewItem == recentDevice",
146+
"command": "wirelessDebug.deleteHistoryItem",
147+
"when": "view == adbDevices && viewItem == recentDevice",
148148
"group": "inline@2"
149149
},
150150
{
151-
"command": "dev.wirelessDebug.liveView",
152-
"when": "view == dev-adbDevices && (viewItem == connectedDeviceUsb || viewItem == connectedDeviceWireless)",
151+
"command": "wirelessDebug.liveView",
152+
"when": "view == adbDevices && (viewItem == connectedDeviceUsb || viewItem == connectedDeviceWireless)",
153153
"group": "inline@1"
154154
},
155155
{
156-
"command": "dev.wirelessDebug.logcat",
157-
"when": "view == dev-adbDevices && (viewItem == connectedDeviceUsb || viewItem == connectedDeviceWireless)",
156+
"command": "wirelessDebug.logcat",
157+
"when": "view == adbDevices && (viewItem == connectedDeviceUsb || viewItem == connectedDeviceWireless)",
158158
"group": "inline@2"
159159
},
160160
{
161-
"command": "dev.wirelessDebug.disconnect",
162-
"when": "view == dev-adbDevices && viewItem == connectedDeviceWireless",
161+
"command": "wirelessDebug.disconnect",
162+
"when": "view == adbDevices && viewItem == connectedDeviceWireless",
163163
"group": "inline@3"
164164
},
165165
{
166-
"command": "dev.wirelessDebug.mirror",
167-
"when": "view == dev-adbDevices && (viewItem == connectedDeviceUsb || viewItem == connectedDeviceWireless)",
166+
"command": "wirelessDebug.mirror",
167+
"when": "view == adbDevices && (viewItem == connectedDeviceUsb || viewItem == connectedDeviceWireless)",
168168
"group": "1_actions@1"
169169
},
170170
{
171-
"command": "dev.wirelessDebug.screenshot",
172-
"when": "view == dev-adbDevices && (viewItem == connectedDeviceUsb || viewItem == connectedDeviceWireless)",
171+
"command": "wirelessDebug.screenshot",
172+
"when": "view == adbDevices && (viewItem == connectedDeviceUsb || viewItem == connectedDeviceWireless)",
173173
"group": "1_actions@2"
174174
},
175175
{
176-
"command": "dev.wirelessDebug.switchToWireless",
177-
"when": "view == dev-adbDevices && viewItem == connectedDeviceUsb",
176+
"command": "wirelessDebug.switchToWireless",
177+
"when": "view == adbDevices && viewItem == connectedDeviceUsb",
178178
"group": "2_mode"
179179
},
180180
{
181-
"command": "dev.wirelessDebug.reboot",
182-
"when": "view == dev-adbDevices && (viewItem == connectedDeviceUsb || viewItem == connectedDeviceWireless)",
181+
"command": "wirelessDebug.reboot",
182+
"when": "view == adbDevices && (viewItem == connectedDeviceUsb || viewItem == connectedDeviceWireless)",
183183
"group": "z_danger"
184184
}
185185
]
186186
}
187187
},
188+
"scripts": {
189+
"package": "node ./scripts/set-flavor.js prod && npx vsce package"
190+
},
188191
"dependencies": {
189192
"jmuxer": "^2.1.0",
190193
"qrcode": "^1.5.4",

‎src/adbCommands.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ async function autoDiscoverConnect(provider) {
152152
"No devices found. Make sure Wireless Debugging is ON and both devices are on the same network.",
153153
'Pair via Code', 'Pair via QR'
154154
).then(choice => {
155-
if (choice === 'Pair via Code') vscode.commands.executeCommand('dev.wirelessDebug.pair');
156-
if (choice === 'Pair via QR') vscode.commands.executeCommand('dev.wirelessDebug.pairQr');
155+
if (choice === 'Pair via Code') vscode.commands.executeCommand('wirelessDebug.pair');
156+
if (choice === 'Pair via QR') vscode.commands.executeCommand('wirelessDebug.pairQr');
157157
});
158158
return;
159159
}

‎wireless-debug-extension-1.1.0.vsix‎

669 KB
Binary file not shown.

0 commit comments

Comments
 (0)