Merge branch 'main' into wear

Author: kul3r4

.github/workflows/apply_spotless.yml

@@ -33,6 +33,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         token: ${{ secrets.PAT || github.token }}
+        fetch-depth: 0
 
     - name: set up Java 17
       uses: actions/setup-java@v4

.github/workflows/sync_main_latest.yml

@@ -21,7 +21,7 @@ jobs:
 
       - name: Create pull request
         id: cpr
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.PAT }}
           commit-message: 🤖 Sync main to latest

.github/workflows/update_deps.yml

@@ -19,7 +19,7 @@ jobs:
         run: ./gradlew versionCatalogUpdate
       - name: Create pull request
         id: cpr
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.PAT }}
           commit-message: 🤖 Update Dependencies

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

@@ -6,7 +6,6 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
-import com.sample.android.bluetoothle.java.MainActivity
 
 class MainActivity : AppCompatActivity() {
 

build.gradle.kts

@@ -5,9 +5,11 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.kotlin.android) apply false
-    alias(libs.plugins.kapt) apply false
+    alias(libs.plugins.ksp) apply false
     alias(libs.plugins.hilt) apply false
     alias(libs.plugins.kotlin.parcelize) apply false
+    alias(libs.plugins.compose.compiler) apply false
+    alias(libs.plugins.kotlin.serialization) apply false
 }
 
 apply("${project.rootDir}/buildscripts/toml-updater-config.gradle")

compose/recomposehighlighter/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.compose.compiler)
 }
 android {
     compileSdk = libs.versions.compileSdk.get().toInt()
@@ -40,9 +41,6 @@ android {
         viewBinding = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
 }
 dependencies {
     val composeBom = platform(libs.androidx.compose.bom)

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

@@ -73,7 +73,7 @@ private class RecomposeHighlighterModifier : Modifier.Node(), DrawModifierNode {
     private var totalCompositions: Long = 0
         set(value) {
             if (field == value) return
-            restartTimer()
+            if (value > 0) restartTimer()
             field = value
             invalidateDraw()
         }
@@ -103,7 +103,6 @@ private class RecomposeHighlighterModifier : Modifier.Node(), DrawModifierNode {
         timerJob = coroutineScope.launch {
             delay(3000)
             totalCompositions = 0
-            invalidateDraw()
         }
     }
 

compose/snippets/build.gradle.kts

@@ -17,9 +17,11 @@
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.kapt)
+    alias(libs.plugins.ksp)
     alias(libs.plugins.hilt)
     alias(libs.plugins.kotlin.parcelize)
+    alias(libs.plugins.compose.compiler)
+    alias(libs.plugins.kotlin.serialization)
 }
 
 android {
@@ -62,10 +64,6 @@ android {
         viewBinding = true
     }
 
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
-    }
-
     packaging.resources {
         // Multiple dependency bring these files in. Exclude them to enable
         // our test APK to build (has no effect on our AARs)
@@ -138,14 +136,17 @@ dependencies {
     implementation(libs.androidx.navigation.compose)
     implementation(libs.hilt.android)
     implementation(libs.androidx.hilt.navigation.compose)
+    implementation(libs.kotlinx.serialization.json)
 
     implementation(libs.androidx.recyclerview)
 
     implementation(libs.googlemaps.compose)
     implementation(libs.googlemaps.maps)
 
     implementation(libs.hilt.android)
-    kapt(libs.hilt.compiler)
+    implementation(libs.glide.compose)
+
+    ksp(libs.hilt.compiler)
 
     testImplementation(libs.junit)
 

compose/snippets/src/androidTest/java/com/example/compose/snippets/deviceconfigurationoverride/DeviceConfigurationOverrideSnippets.kt

@@ -42,7 +42,7 @@ class DeviceConfigurationOverrideSnippetsTest {
             DeviceConfigurationOverride(
                 DeviceConfigurationOverride.ForcedSize(DpSize(1280.dp, 800.dp))
             ) {
-                MyScreen() // will be rendered in the space for 1280dp by 800dp without clipping
+                MyScreen() // Will be rendered in the space for 1280dp by 800dp without clipping.
             }
         }
         // [END android_compose_deviceconfigurationoverride_forcedsize]

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

@@ -16,6 +16,7 @@
 
 package com.example.compose.snippets
 
+import NavigationDrawerExamples
 import android.os.Bundle
 import android.os.StrictMode
 import androidx.activity.ComponentActivity
@@ -28,29 +29,37 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import com.example.compose.snippets.animations.AnimationExamplesScreen
+import com.example.compose.snippets.animations.sharedelement.PlaceholderSizeAnimated_Demo
 import com.example.compose.snippets.components.AppBarExamples
 import com.example.compose.snippets.components.BadgeExamples
 import com.example.compose.snippets.components.ButtonExamples
+import com.example.compose.snippets.components.CardExamples
+import com.example.compose.snippets.components.CarouselExamples
 import com.example.compose.snippets.components.CheckboxExamples
 import com.example.compose.snippets.components.ChipExamples
 import com.example.compose.snippets.components.ComponentsScreen
+import com.example.compose.snippets.components.DatePickerExamples
 import com.example.compose.snippets.components.DialogExamples
 import com.example.compose.snippets.components.DividerExamples
 import com.example.compose.snippets.components.FloatingActionButtonExamples
+import com.example.compose.snippets.components.MenusExamples
 import com.example.compose.snippets.components.PartialBottomSheet
 import com.example.compose.snippets.components.ProgressIndicatorExamples
 import com.example.compose.snippets.components.ScaffoldExample
+import com.example.compose.snippets.components.SegmentedButtonExamples
 import com.example.compose.snippets.components.SliderExamples
 import com.example.compose.snippets.components.SwitchExamples
+import com.example.compose.snippets.components.TimePickerExamples
+import com.example.compose.snippets.components.TooltipExamples
 import com.example.compose.snippets.graphics.ApplyPolygonAsClipImage
-import com.example.compose.snippets.graphics.BitmapFromComposableSnippet
+import com.example.compose.snippets.graphics.BitmapFromComposableFullSnippet
 import com.example.compose.snippets.graphics.BrushExamplesScreen
 import com.example.compose.snippets.images.ImageExamplesScreen
 import com.example.compose.snippets.landing.LandingScreen
+import com.example.compose.snippets.layouts.PagerExamples
 import com.example.compose.snippets.navigation.Destination
 import com.example.compose.snippets.navigation.TopComponentsDestination
 import com.example.compose.snippets.ui.theme.SnippetsTheme
-import com.example.topcomponents.CardExamples
 
 class SnippetsActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -74,13 +83,15 @@ class SnippetsActivity : ComponentActivity() {
                                     Destination.BrushExamples -> BrushExamplesScreen()
                                     Destination.ImageExamples -> ImageExamplesScreen()
                                     Destination.AnimationQuickGuideExamples -> AnimationExamplesScreen()
-                                    Destination.ScreenshotExample -> BitmapFromComposableSnippet()
+                                    Destination.ScreenshotExample -> BitmapFromComposableFullSnippet()
                                     Destination.ComponentsExamples -> ComponentsScreen {
                                         navController.navigate(
                                             it.route
                                         )
                                     }
                                     Destination.ShapesExamples -> ApplyPolygonAsClipImage()
+                                    Destination.SharedElementExamples -> PlaceholderSizeAnimated_Demo()
+                                    Destination.PagerExamples -> PagerExamples()
                                 }
                             }
                         }
@@ -103,6 +114,13 @@ class SnippetsActivity : ComponentActivity() {
                                     TopComponentsDestination.DividerExamples -> DividerExamples()
                                     TopComponentsDestination.BadgeExamples -> BadgeExamples()
                                     TopComponentsDestination.PartialBottomSheet -> PartialBottomSheet()
+                                    TopComponentsDestination.TimePickerExamples -> TimePickerExamples()
+                                    TopComponentsDestination.DatePickerExamples -> DatePickerExamples()
+                                    TopComponentsDestination.CarouselExamples -> CarouselExamples()
+                                    TopComponentsDestination.MenusExample -> MenusExamples()
+                                    TopComponentsDestination.TooltipExamples -> TooltipExamples()
+                                    TopComponentsDestination.NavigationDrawerExamples -> NavigationDrawerExamples()
+                                    TopComponentsDestination.SegmentedButtonExamples -> SegmentedButtonExamples()
                                 }
                             }
                         }