Merge pull request #636 from android/madebymozart/camera-samples-overhaul

Refactor, Modernize & Enhance Android Camera Samples with new features

Author: madebymozart

.claude/settings.local.json

@@ -0,0 +1,10 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(gh pr *)",
+      "Bash(gh api *)",
+      "Bash(python3 -c \"import json,sys; data=json.load\\(sys.stdin\\); print\\(f'Total inline comments: {len\\(data\\)}'\\); [print\\(f'\\\\n--- {c[\\\\\"user\\\\\"][\\\\\"login\\\\\"]} on {c.get\\(\\\\\"path\\\\\"\\)}:{c.get\\(\\\\\"line\\\\\"\\) or c.get\\(\\\\\"original_line\\\\\"\\)} ---\\\\n{c[\\\\\"body\\\\\"]}'\\) for c in data]\")",
+      "Bash(python3 -c \"import json,sys; data=json.load\\(sys.stdin\\); [print\\(f'\\\\n=== Review by {r[\\\\\"user\\\\\"][\\\\\"login\\\\\"]} [{r[\\\\\"state\\\\\"]}] ===\\\\n{r.get\\(\\\\\"body\\\\\",\\\\\"\\\\\"\\)}'\\) for r in data]\")"
+    ]
+  }
+}

.editorconfig

@@ -0,0 +1,3 @@
+[*.{kt,kts}]
+# @Composable functions are intentionally PascalCase across this project.
+ktlint_function_naming_ignore_when_annotated_with = Composable

.github/scripts/copy_utils.sh

@@ -22,213 +22,34 @@ on:
     branches: [ main ]
 
 jobs:
-  camerax_basic:
-    name: CameraXBasic
+  build:
+    name: Build & check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-      - name: Build project
-        working-directory: CameraXBasic
-        run: ./gradlew assembleDebug
-      - name: Zip artifacts
-        working-directory: CameraXBasic
-        run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: camerax_basic_assemble
-          path: CameraXBasic/assemble.zip
-  camerax_extensions:
-    name: CameraXExtensions
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-      - name: Build project
-        working-directory: CameraXExtensions
-        run: ./gradlew assembleDebug
-      - name: Zip artifacts
-        working-directory: CameraXExtensions
-        run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: camerax_extensions_assemble
-          path: CameraXExtensions/assemble.zip
-  camerax_video:
-    name: CameraXVideo
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-      - name: Build project
-        working-directory: CameraXVideo
-        run: ./gradlew assembleDebug
-      - name: Zip artifacts
-        working-directory: CameraXVideo
-        run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: camerax_video_assemble
-          path: CameraXVideo/assemble.zip
-  camerax_advanced:
-    name: CameraXAdvanced
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-      - name: Build project
-        working-directory: CameraXAdvanced
-        run: ./gradlew assembleDebug
-      - name: Zip artifacts
-        working-directory: CameraXAdvanced
-        run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: camerax_advanced_assemble
-          path: CameraXAdvanced/assemble.zip
-  camerax_mlkit:
-    name: CameraX-MLKit
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-      - name: Build project
-        working-directory: CameraX-MLKit
-        run: ./gradlew assembleDebug
-      - name: Zip artifacts
-        working-directory: CameraX-MLKit
-        run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: camerax_mlkit_assemble
-          path: CameraX-MLKit/assemble.zip
-  camera2_basic:
-    name: Camera2Basic
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-      - name: Build project
-        working-directory: Camera2Basic
-        run: ./gradlew assembleDebug
-      - name: Zip artifacts
-        working-directory: Camera2Basic
-        run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: camera2_basic_assemble
-          path: Camera2Basic/assemble.zip
-  camera2_extensions:
-    name: Camera2Extensions
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: set up JDK 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '17'
-      - name: Build project
-        working-directory: Camera2Extensions
-        run: ./gradlew assembleDebug
-      - name: Zip artifacts
-        working-directory: Camera2Extensions
-        run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: camera2_extensions_assemble
-          path: Camera2Extensions/assemble.zip
-  camera2_video:
-    name: Camera2Video
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: set up JDK 17
+
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: '17'
-      - name: Build project
-        working-directory: Camera2Video
-        run: ./gradlew assembleDebug
-      - name: Zip artifacts
-        working-directory: Camera2Video
-        run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: camera2_video_assemble
-          path: Camera2Video/assemble.zip
-  camera2_slowmotion:
-    name: Camera2SlowMotion
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: set up JDK 11
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '11'
-      - name: Build project
-        working-directory: Camera2SlowMotion
-        run: ./gradlew assembleDebug
-      - name: Zip artifacts
-        working-directory: Camera2SlowMotion
-        run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: camera2_slowmotion_assemble
-          path: Camera2SlowMotion/assemble.zip
-  camerautils:
-    name: CameraUtils
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: set up JDK 11
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'zulu'
-          java-version: '11'
-      - name: Build project
-        working-directory: CameraUtils
+          cache: gradle
+
+      - name: Set up Android SDK
+        uses: android-actions/setup-android@v3
+
+      # The project compiles against API 37 (Android 17); install that platform.
+      - name: Install compileSdk 37 platform
+        run: yes | sdkmanager "platforms;android-37.0" > /dev/null
+
+      - name: Check formatting (Spotless)
+        run: ./gradlew spotlessCheck
+
+      - name: Assemble debug
         run: ./gradlew assembleDebug
-      - name: Zip artifacts
-        working-directory: CameraUtils
-        run: zip -r assemble.zip . -i '**/build/*.apk' '**/build/*.aab' '**/build/*.aar' '**/build/*.so'
-      - name: Upload artifacts
+
+      - name: Upload debug APK
         uses: actions/upload-artifact@v4
         with:
-          name: camerautils_assemble
-          path: CameraUtils/assemble.zip
+          name: app-debug
+          path: app/build/outputs/apk/debug/app-debug.apk