Merge branch 'main' into nav3

* main: (74 commits)
  Add basic WindowInsetsRulers cases (#621)
  Adding shadows code snippets (#620)
  Update the wear preview code
  Update state based (#619)
  add WindowInsetsRulers snippet (#616)
  Migrate snippets from dac/training/wearables/tiles/screen-size (#617)
  Resolve warnings in the Wakelock code snippets (#615)
  Disabling some "unused" warnings (#610)
  Add android_wear_tile_version_fallback (#614)
  Add viewmodel screen for KMP (#613)
  Fix missing snippet (#612)
  Add KMP ViewModel snippets (#611)
  docs(modifiers): Add TODOs for inspectableProperties lint warnings (#589)
  Fix: Prevent memory leak from implicit SAM conversion (#588)
  Fix(gestures): Handle pointer events inside awaitPointerEventScope (#590)
  Lint: Use specialized state holders to avoid autoboxing (#591)
  Refactor: Rename Composable functions to follow naming conventions (#592)
  Refactor(text): Use KTX extension for isDigitsOnly check (#593)
  Refactor(SearchBar): Reorder modifier parameter to follow convention (#594)
  Add padding to avoid overwriting TimeText (#529)
  ...

Author: dturner

.github/workflows/apply_spotless.yml

@@ -42,16 +42,7 @@ jobs:
         java-version: '17'
 
     - name: Run spotlessApply
-      run: ./gradlew :compose:spotlessApply --init-script gradle/init.gradle.kts --no-configuration-cache --stacktrace
-
-    - name: Run spotlessApply for Wear
-      run: ./gradlew :wear:spotlessApply --init-script gradle/init.gradle.kts --no-configuration-cache --stacktrace
-
-    - name: Run spotlessApply for Misc
-      run: ./gradlew :misc:spotlessApply --init-script gradle/init.gradle.kts --no-configuration-cache --stacktrace
-
-    - name: Run spotlessApply for XR
-      run: ./gradlew :xr:spotlessApply --init-script gradle/init.gradle.kts --no-configuration-cache --stacktrace
+      run: ./gradlew spotlessApply --init-script gradle/init.gradle.kts --no-configuration-cache --stacktrace
 
     - name: Auto-commit if spotlessApply has changes
       uses: stefanzweifel/git-auto-commit-action@v5

.github/workflows/build-ios.yml

@@ -0,0 +1,51 @@
+# Copyright 2025 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: Build snippets
+
+on:
+  push:
+    branches: [ '*' ]
+    paths:
+      - 'kmp/**'
+      - '.github/workflows/build-ios.yml'
+  pull_request:
+    branches: [ '*' ]
+    paths:
+      - 'kmp/**'
+      - '.github/workflows/build-ios.yml'
+  workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}-build-ios
+  cancel-in-progress: true
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  build_ios:
+    name: Build iOS app
+    runs-on: macos-latest
+    steps:
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: latest-stable
+
+      - name: Checkout
+        uses: actions/checkout@v5
+
+      - name: Build iOS app
+        uses: mxcl/xcodebuild@v3
+        with:
+          xcode: ^16
+          scheme: iosApp
+          platform: iOS
+          action: build
+          working-directory: kmp/iosApp

.github/workflows/build.yml

@@ -37,15 +37,7 @@ jobs:
       with:
         distribution: 'zulu'
         java-version: '17'
-    - name: Build Compose
-      run: ./gradlew :compose:snippets:build
-    - name: Build recompose snippets
-      run: ./gradlew :compose:recomposehighlighter:build
-    - name: Build kotlin snippets
-      run: ./gradlew :kotlin:build
-    - name: Build Wear snippets
-      run: ./gradlew :wear:build
-    - name: Build misc snippets
-      run: ./gradlew :misc:build
-    - name: Build XR snippets
-      run: ./gradlew :xr:build
+    - name: Build All
+      run: ./gradlew build --stacktrace
+    - name: Build Watch Face Push validation snippets
+      run: ./gradlew :watchfacepush:validator:run --stacktrace

.gitignore

@@ -6,8 +6,22 @@
 /.idea/modules.xml
 /.idea/workspace.xml
 .DS_Store
-/build
+build
 /captures
 .externalNativeBuild
 .idea/*
 /.idea/*
+.kotlin
+
+### Xcode ###
+## User settings
+xcuserdata/
+
+### Xcode Patch ###
+*.xcodeproj/*
+!*.xcodeproj/project.pbxproj
+!*.xcodeproj/xcshareddata/
+!*.xcodeproj/project.xcworkspace/
+!*.xcworkspace/contents.xcworkspacedata
+/*.gcno
+**/xcshareddata/WorkspaceSettings.xcsettings

bluetoothle/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.sample.android.bluetoothle">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
     <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
@@ -23,6 +22,6 @@
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
 
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-
 </manifest>

bluetoothle/src/main/java/com/sample/android/bluetoothle/java/MainActivity.java

@@ -1,13 +1,15 @@
 package com.sample.android.bluetoothle.java;
 
-import androidx.appcompat.app.AppCompatActivity;
-
+import android.Manifest;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothManager;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
+import androidx.annotation.RequiresPermission;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.sample.android.bluetoothle.R;
 
 public class MainActivity extends AppCompatActivity {
@@ -19,6 +21,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_main);
     }
 
+    @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
     private void setUpBLE() {
         // [START get_bluetooth_adapter]
         // Initializes Bluetooth adapter.

bluetoothle/src/main/java/com/sample/android/bluetoothle/kotlin/DeviceScanActivity.kt

@@ -16,11 +16,13 @@
 
 package com.sample.android.bluetoothle.kotlin
 
+import android.Manifest
 import android.app.ListActivity
 import android.bluetooth.BluetoothAdapter
 import android.bluetooth.le.ScanCallback
 import android.bluetooth.le.ScanResult
 import android.os.Handler
+import androidx.annotation.RequiresPermission
 import com.sample.android.bluetoothle.java.LeDeviceListAdapter
 
 /**
@@ -47,6 +49,7 @@ class DeviceScanActivity : ListActivity() {
     // Stops scanning after 10 seconds.
     private val SCAN_PERIOD: Long = 10000
 
+    @RequiresPermission(Manifest.permission.BLUETOOTH_SCAN)
     private fun scanLeDevice() {
         if (!mScanning) { // Stops scanning after a pre-defined scan period.
             handler.postDelayed({

bluetoothle/src/main/java/com/sample/android/bluetoothle/kotlin/MainActivity.kt

@@ -16,11 +16,13 @@
 
 package com.sample.android.bluetoothle.kotlin
 
+import android.Manifest
 import android.bluetooth.BluetoothAdapter
 import android.bluetooth.BluetoothManager
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import androidx.annotation.RequiresPermission
 import androidx.appcompat.app.AppCompatActivity
 
 class MainActivity : AppCompatActivity() {
@@ -31,6 +33,7 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
     }
 
+    @RequiresPermission(Manifest.permission.BLUETOOTH_CONNECT)
     private fun setUpBLE() {
         // [START get_bluetooth_adapter]
         // Initializes Bluetooth adapter.

build.gradle.kts

@@ -10,6 +10,9 @@ plugins {
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.kotlin.serialization) apply false
+    alias(libs.plugins.kotlin.multiplatform) apply false
+    alias(libs.plugins.android.kotlin.multiplatform.library) apply false
+    alias(libs.plugins.android.lint) apply false
 }
 
 apply("${project.rootDir}/buildscripts/toml-updater-config.gradle")

compose/recomposehighlighter/src/main/java/com/example/android/compose/recomposehighlighter/RecomposeHighlighter.kt

@@ -89,6 +89,11 @@ private class RecomposeHighlighterModifier : Modifier.Node(), DrawModifierNode {
 
     override val shouldAutoInvalidate: Boolean = false
 
+    override fun onReset() {
+        totalCompositions = 0
+        timerJob?.cancel()
+    }
+
     override fun onDetach() {
         timerJob?.cancel()
     }