From f41c0357d3af565faeba500335a9c5df215a5e7f Mon Sep 17 00:00:00 2001 From: Suhan G Paradkar <76830230+suhan-paradkar@users.noreply.github.com> Date: Thu, 27 May 2021 13:37:26 +0530 Subject: [PATCH] Squash bugs and set up workflow --- .github/workflows/debug_build.yml | 26 +++++++++++++++++++ .../workflows/gradle-wrapper-validation.yml | 19 ++++++++++++++ .github/workflows/run_tests.yml | 21 +++++++++++++++ .../java/com/termux/x11/LorieService.java | 6 +++-- 4 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/debug_build.yml create mode 100644 .github/workflows/gradle-wrapper-validation.yml create mode 100644 .github/workflows/run_tests.yml diff --git a/.github/workflows/debug_build.yml b/.github/workflows/debug_build.yml new file mode 100644 index 0000000..5d23d11 --- /dev/null +++ b/.github/workflows/debug_build.yml @@ -0,0 +1,26 @@ +name: Build + +on: + push: + branches: + - master + - android-10 + pull_request: + branches: + - master + - android-10 + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Clone repository + uses: actions/checkout@v2 + - name: Build + run: | + ./gradlew assembleDebug + - name: Store generated APK file + uses: actions/upload-artifact@v2 + with: + name: termux-x11 + path: ./app/build/outputs/apk/debug diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml new file mode 100644 index 0000000..7c8edaf --- /dev/null +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -0,0 +1,19 @@ +name: "Validate Gradle Wrapper" + +on: + push: + branches: + - master + - android-10 + pull_request: + branches: + - master + - android-10 + +jobs: + validation: + name: "Validation" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: gradle/wrapper-validation-action@v1 diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml new file mode 100644 index 0000000..2647499 --- /dev/null +++ b/.github/workflows/run_tests.yml @@ -0,0 +1,21 @@ +name: Unit tests + +on: + push: + branches: + - master + - android-10 + pull_request: + branches: + - master + - android-10 + +jobs: + testing: + runs-on: ubuntu-latest + steps: + - name: Clone repository + uses: actions/checkout@v2 + - name: Execute tests + run: | + ./gradlew test diff --git a/app/src/main/java/com/termux/x11/LorieService.java b/app/src/main/java/com/termux/x11/LorieService.java index 208a1da..c1619a8 100644 --- a/app/src/main/java/com/termux/x11/LorieService.java +++ b/app/src/main/java/com/termux/x11/LorieService.java @@ -30,6 +30,8 @@ import android.view.SurfaceHolder; import android.view.SurfaceView; import android.view.View; import android.widget.Toast; +import android.graphics.PixelFormat; + @SuppressWarnings({"ConstantConditions", "SameParameterValue"}) @SuppressLint({"ClickableViewAccessibility", "StaticFieldLeak"}) @@ -234,14 +236,14 @@ public class LorieService extends Service { @SuppressWarnings("SameParameterValue") private static class ServiceEventListener implements SurfaceHolder.Callback, View.OnTouchListener, View.OnKeyListener, View.OnHoverListener, View.OnGenericMotionListener, TouchParser.OnTouchParseListener { LorieService svc; - + private void setAsListenerTo(SurfaceView view) { view.getHolder().addCallback(this); view.setOnTouchListener(this); view.setOnHoverListener(this); view.setOnGenericMotionListener(this); view.setOnKeyListener(this); - surfaceChanged(view.getHolder(), 0, view.getWidth(), view.getHeight()); + surfaceChanged(view.getHolder(), PixelFormat.UNKNOWN, view.getWidth(), view.getHeight()); } public void onPointerButton(int button, int state) {