Merge branch 'dev'

hannesa2 · Dec 31, 2022 · 4b6646f · 4b6646f
2 parents d271040 + 5d8c443
commit 4b6646f
Show file tree

Hide file tree

Showing 9 changed files with 180 additions and 39 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gradle"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
diff --git a/.github/release.yml b/.github/release.yml
@@ -0,0 +1,16 @@
+changelog:
+  exclude:
+    labels:
+      - ignore-for-release
+    authors:
+      - someuser
+  categories:
+    - title: Breaking Changes 🛠
+      labels:
+        - breaking-change
+    - title: Exciting New Features 🎉
+      labels:
+        - enhancement
+    - title: Other Changes
+      labels:
+        - "*"
diff --git a/.github/workflows/Android-CI-Espresso.yml b/.github/workflows/Android-CI-Espresso.yml
@@ -0,0 +1,59 @@
+name: Github CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  build:
+    name: Build
+    runs-on: macOS-latest
+    strategy:
+      matrix:
+        java_version: [ 11 ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+      - name: Install JDK ${{ matrix.java_version }}
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'adopt'
+          java-version: ${{ matrix.java_version }}
+      - name: Install Android SDK
+        uses: malinskiy/action-android/install-sdk@release/0.1.4
+      - name: Build project
+        run: ./gradlew assembleDebug
+      # TODO test is broken, it needs work work and is out of the scope og this pull request
+      # - name: Run tests
+      #   run: ./gradlew test
+# TODO lint is broken, it needs a lot of work and is out of the scope og this pull request
+#  check:
+#    name: Check
+#    runs-on: ubuntu-latest
+#    strategy:
+#      matrix:
+#        java_version: [ 11 ]
+#    steps:
+#      - name: Checkout
+#        uses: actions/checkout@v3
+#        with:
+#          submodules: true
+#      - name: Install JDK ${{ matrix.java_version }}
+#        uses: actions/setup-java@v3
+#        with:
+#          distribution: 'adopt'
+#          java-version: ${{ matrix.java_version }}
+#      - name: Install Android SDK
+#        uses: malinskiy/action-android/install-sdk@release/0.1.4
+#      - name: Gradle checks
+#        run: ./gradlew check
+#      - name: Archive Lint report
+#        uses: actions/upload-artifact@v3
+#        if: ${{ always() }}
+#        with:
+#          name: 3D-Lint
+#          path: ./**/build/reports/lint-results.html
diff --git a/.github/workflows/Android-CI-release.yml b/.github/workflows/Android-CI-release.yml
@@ -0,0 +1,43 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  build:
+    name: Publish release
+    runs-on: macOS-latest # it comes with NDK installed
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          submodules: true
+      - name: Find Tag
+        id: tagger
+        uses: jimschubert/query-tag-action@v2
+        with:
+          skip-unshallow: 'true'
+          abbrev: false
+          commit-ish: HEAD
+      - name: Install JDK
+        uses: actions/setup-java@v3
+        with:
+          java-version: 11
+      - name: Install Android SDK
+        uses: malinskiy/action-android/install-sdk@release/0.1.4
+      - name: Build project
+        run: ./gradlew build
+        env:
+          VERSION: ${{ github.ref }}
+      - name: Create Release
+          uses: softprops/action-gh-release@v1
+          with:
+            tag_name: ${{steps.tagger.outputs.tag}}
+            name: ${{steps.tagger.outputs.tag}}
+            generate_release_notes: true
+            files: ./app/build/outputs/apk/release/LiveEdgeDetection-*-release.apk
+          env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
@@ -0,0 +1,11 @@
+name: "Validate Gradle Wrapper"
+
+on: [pull_request]
+
+jobs:
+  validation:
+    name: "Validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: gradle/wrapper-validation-action@v1
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
@@ -1,9 +1,10 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
+        android:title="@string/action_settings"
+        app:showAsAction="never" />
 
 </menu>
diff --git a/app/src/main/res/menu/menu.xml b/app/src/main/res/menu/menu.xml
@@ -1,9 +1,10 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item
         android:id="@+id/action_settings"
         android:orderInCategory="100"
-        android:showAsAction="never"
-        android:title="@string/action_settings"/>
+        android:title="@string/action_settings"
+        app:showAsAction="never" />
 
 </menu>
diff --git a/app/src/main/res/menu/model.xml b/app/src/main/res/menu/model.xml
@@ -1,84 +1,85 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android" >
 
 
     <item
         android:id="@+id/model_toggle_skybox"
         android:icon="@android:drawable/ic_menu_gallery"
         android:orderInCategory="100"
-        android:showAsAction="ifRoom"
-        android:title="Toggle Sky Box"/>
+        android:title="Toggle Sky Box"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/model_toggle_projection"
         android:icon="@android:drawable/ic_menu_camera"
         android:orderInCategory="200"
-        android:showAsAction="ifRoom"
-        android:title="Toggle Projection"/>
+        android:title="Toggle Projection"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/model_toggle_lights"
         android:icon="@android:drawable/ic_menu_compass"
         android:orderInCategory="300"
-        android:showAsAction="ifRoom"
-        android:title="@string/toggle_lights"/>
+        android:title="@string/toggle_lights"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/model_toggle_wireframe"
         android:icon="@android:drawable/ic_menu_sort_by_size"
         android:orderInCategory="400"
-        android:showAsAction="ifRoom"
-        android:title="@string/toggle_wireframe"/>
+        android:title="@string/toggle_wireframe"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/model_toggle_textures"
         android:icon="@android:drawable/ic_menu_gallery"
         android:orderInCategory="500"
-        android:showAsAction="ifRoom"
-        android:title="@string/toggle_textures"/>
+        android:title="@string/toggle_textures"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/model_toggle_animation"
         android:icon="@android:drawable/ic_menu_gallery"
         android:orderInCategory="600"
-        android:showAsAction="ifRoom"
-        android:title="@string/toggle_animation"/>
+        android:title="@string/toggle_animation"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/model_toggle_smooth"
         android:icon="@android:drawable/ic_menu_gallery"
         android:orderInCategory="700"
-        android:showAsAction="ifRoom"
-        android:title="Toggle Smooth"/>
+        android:title="Toggle Smooth"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/model_load_texture"
         android:icon="@android:drawable/ic_menu_gallery"
         android:orderInCategory="800"
-        android:showAsAction="ifRoom"
-        android:title="@string/load_texture"/>
+        android:title="@string/load_texture"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/model_toggle_stereoscopic"
         android:icon="@android:drawable/ic_menu_gallery"
         android:orderInCategory="900"
-        android:showAsAction="ifRoom"
-        android:title="Toggle Stereoscopic"/>
+        android:title="Toggle Stereoscopic"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/model_toggle_blending"
         android:icon="@android:drawable/ic_menu_gallery"
         android:orderInCategory="1000"
-        android:showAsAction="ifRoom"
-        android:title="Toggle X-Ray" />
+        android:title="Toggle X-Ray"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/model_toggle_boundingbox"
         android:icon="@android:drawable/ic_menu_crop"
         android:orderInCategory="1100"
-        android:showAsAction="ifRoom"
-        android:title="@string/toggle_boundingbox"/>
+        android:title="@string/toggle_boundingbox"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/model_toggle_collision"
         android:icon="@android:drawable/ic_menu_gallery"
         android:orderInCategory="1200"
-        android:showAsAction="ifRoom"
-        android:title="Toggle Collision"/>
+        android:title="Toggle Collision"
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/model_toggle_immersive"
         android:icon="@android:drawable/ic_menu_gallery"
         android:orderInCategory="1300"
-        android:showAsAction="ifRoom"
-        android:title="Toggle Immersive"/>
+        android:title="Toggle Immersive"
+        app:showAsAction="ifRoom" />
 
     <!--
     <item
@@ -87,8 +88,6 @@
         android:orderInCategory="500"
         android:showAsAction="ifRoom"
         android:title="@string/action_settings"/>
-
-
     -->
 
 </menu>
diff --git a/build.gradle b/build.gradle
@@ -1,14 +1,10 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.2.2'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
     }
 }