Skip to content

Commit f5b4d5e

Browse files
committed
Better integration
1 parent d7e6c4b commit f5b4d5e

File tree

4 files changed

+42
-2
lines changed

4 files changed

+42
-2
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,6 @@ RUN curl -LsSf https://astral.sh/uv/install.sh | sh \
6767
# Install ws-scrcpy
6868
SHELL ["/bin/bash", "-lic"]
6969
RUN fnm install --lts \
70-
&& cd $HOME && git clone https://github.com/NetrisTV/ws-scrcpy.git && cd ws-scrcpy \
70+
&& cd $HOME && git clone https://github.com/axonasif/ws-scrcpy && cd ws-scrcpy \
7171
&& uv run npm install && npm run dist:prod
7272
# && uv run bun install && uv run bun run dist:prod

.devcontainer/devcontainer.json

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,27 @@
2929
"mounts": [
3030
"source=/boot,target=/boot,type=bind",
3131
"source=/lib/modules,target=/lib/modules,type=bind"
32-
]
32+
],
33+
34+
"portsAttributes": {
35+
"8000": {
36+
"label": "Emulator Control Web",
37+
"onAutoForward": "openPreview"
38+
}
39+
},
40+
"customizations": {
41+
"vscode": {
42+
"extensions": [
43+
"esafirm.kotlin-formatter",
44+
"fwcd.kotlin",
45+
"vscjava.vscode-gradle",
46+
"vscjava.vscode-java-dependency",
47+
"vscjava.vscode-java-test",
48+
"vscjava.vscode-maven",
49+
"vscjava.vscode-java-debug",
50+
"redhat.java",
51+
"VisualStudioExptTeam.vscodeintellicode"
52+
]
53+
}
54+
}
3355
}

.gitpod/automations.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ services:
44
commands:
55
start: |
66
echo "Starting Android Emulator..."
7+
adb kill-server || :
78
adb start-server
89
emulator -avd headless_avd -port 5554 -no-window -no-audio -no-boot-anim -gpu swiftshader_indirect -accel on -no-metrics
910
ready: adb shell getprop sys.boot_completed 2>/dev/null | grep -q 1
@@ -24,12 +25,14 @@ services:
2425
emulator_control:
2526
name: Emulator Control Web
2627
commands:
28+
ready: adb shell getprop sys.boot_completed 2>/dev/null | grep -q 1
2729
start: |
2830
until adb shell getprop sys.boot_completed 2>/dev/null | grep -q 1; do sleep 1; done
2931
cd ~/ws-scrcpy/dist
3032
node ./index.js
3133
triggeredBy:
3234
- postEnvironmentStart
35+
3336

3437

3538
tasks:

.vscode/tasks.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "build and launch apk",
6+
"type": "shell",
7+
"command": "./gradlew installDebug && adb shell monkey -p com.google.samples.apps.niacatalog -c android.intent.category.LAUNCHER 1",
8+
"group": {
9+
"kind": "build",
10+
"isDefault": true
11+
},
12+
"problemMatcher": []
13+
}
14+
]
15+
}

0 commit comments

Comments
 (0)