Merge branch 'main' into latest

Author: arriolac

.github/workflows/apply_spotless.yml

@@ -0,0 +1,49 @@
+# Copyright 2024 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+name: Apply spotless
+
+on:
+  pull_request:
+    branches: [ '*' ]
+  workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  apply-spotless:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    if: github.repository == 'android/snippets'
+
+    steps:
+    - name: Checkout Repository
+      uses: actions/checkout@v3
+      with:
+        token: ${{ secrets.PAT || github.token }}
+
+    - name: set up Java 17
+      uses: actions/setup-java@v2
+      with:
+        distribution: 'zulu'
+        java-version: '17'
+
+    - name: Run spotlessApply
+      run: ./gradlew :compose:spotlessApply --init-script gradle/init.gradle.kts --no-configuration-cache --stacktrace
+
+    - name: Auto-commit if spotlessApply has changes
+      uses: stefanzweifel/git-auto-commit-action@v4
+      with:
+        commit_message: Apply Spotless

.github/workflows/build.yml

@@ -31,17 +31,12 @@ jobs:
     steps:
     - uses: actions/checkout@v3
       with:
-        token: ${{ secrets.PAT}}
+        token: ${{ secrets.PAT || github.token }}
     - name: set up Java 17
       uses: actions/setup-java@v2
       with:
         distribution: 'zulu'
         java-version: '17'
-    - name: Apply formatting if failed
-      run: ./gradlew :compose:spotlessApply --init-script gradle/init.gradle.kts --no-configuration-cache --stacktrace
-    - uses: stefanzweifel/git-auto-commit-action@v4
-      with:
-        commit_message: Apply Spotless
     - name: Build Compose
       run: ./gradlew :compose:snippets:build
     - name: Build recompose snippets

.github/workflows/sync_main_latest.yml

@@ -10,11 +10,22 @@ jobs:
     name: Syncing branches
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
-      - name: Opening pull request
-        id: pull
-        uses: tretuna/[email protected]
+        uses: actions/checkout@v3
+
+      - name: Merge main into latest
+        run: git checkout latest && git merge main
+
+      - name: Create pull request
+        id: cpr
+        uses: peter-evans/create-pull-request@v4
         with:
-          GITHUB_TOKEN: ${{secrets.PAT}}
-          FROM_BRANCH: "main"
-          TO_BRANCH: "latest"
+          token: ${{ secrets.PAT }}
+          commit-message: 🤖 Sync main to latest
+          committer: compose-devrel-github-bot <[email protected]>
+          author: compose-devrel-github-bot <[email protected]>
+          signoff: false
+          branch: bot-sync-main
+          delete-branch: true
+          title: '🤖 Sync main to latest'
+          body: Updated dependencies
+          reviewers: ${{ github.actor }}

compose/snippets/build.gradle.kts

@@ -86,6 +86,7 @@ dependencies {
     implementation(libs.androidx.compose.ui)
     implementation(libs.androidx.compose.ui.util)
     implementation(libs.androidx.compose.ui.graphics)
+    implementation(libs.androidx.graphics.shapes)
     implementation(libs.androidx.compose.ui.tooling.preview)
     implementation(libs.androidx.compose.ui.viewbinding)
     implementation(libs.androidx.paging.compose)
@@ -128,6 +129,9 @@ dependencies {
     implementation(libs.androidx.lifecycle.runtime)
     implementation(libs.androidx.lifecycle.viewModelCompose)
 
+    implementation(libs.androidx.media3.common)
+    implementation(libs.androidx.media3.exoplayer)
+
     implementation(libs.androidx.navigation.compose)
     implementation(libs.hilt.android)
     implementation(libs.androidx.hilt.navigation.compose)

compose/snippets/src/main/AndroidManifest.xml

@@ -28,10 +28,15 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Snippets">
+<!--    [START android_compose_pip_manifest_entry]-->
         <activity
             android:name=".SnippetsActivity"
             android:exported="true"
+            android:supportsPictureInPicture="true"
+            android:configChanges="orientation|screenLayout|screenSize|smallestScreenSize"
             android:theme="@style/Theme.Snippets">
+            <!--    [END android_compose_pip_manifest_entry]-->
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

compose/snippets/src/main/java/com/example/compose/snippets/SnippetsActivity.kt

@@ -38,6 +38,7 @@ import com.example.compose.snippets.components.ProgressIndicatorExamples
 import com.example.compose.snippets.components.ScaffoldExample
 import com.example.compose.snippets.components.SliderExamples
 import com.example.compose.snippets.components.SwitchExamples
+import com.example.compose.snippets.graphics.ApplyPolygonAsClipImage
 import com.example.compose.snippets.graphics.BitmapFromComposableSnippet
 import com.example.compose.snippets.graphics.BrushExamplesScreen
 import com.example.compose.snippets.images.ImageExamplesScreen
@@ -75,6 +76,7 @@ class SnippetsActivity : ComponentActivity() {
                                             it.route
                                         )
                                     }
+                                    Destination.ShapesExamples -> ApplyPolygonAsClipImage()
                                 }
                             }
                         }