android
diff --git a/‎bluetoothle/src/main/java/com/sample/android/bluetoothle/kotlin/MainActivity.kt
-1 b/‎bluetoothle/src/main/java/com/sample/android/bluetoothle/kotlin/MainActivity.kt
-1
diff --git a/‎build.gradle.kts
+2 b/‎build.gradle.kts
+2
diff --git a/‎compose/recomposehighlighter/build.gradle.kts
+1-3 b/‎compose/recomposehighlighter/build.gradle.kts
+1-3
diff --git a/‎compose/snippets/build.gradle.kts
+3-4 b/‎compose/snippets/build.gradle.kts
+3-4
diff --git a/‎compose/snippets/src/main/java/com/example/compose/snippets/SnippetsActivity.kt
+5-3 b/‎compose/snippets/src/main/java/com/example/compose/snippets/SnippetsActivity.kt
+5-3
diff --git a/‎compose/snippets/src/main/java/com/example/compose/snippets/adaptivelayouts/SampleListDetailPaneScaffold.kt
-2 b/‎compose/snippets/src/main/java/com/example/compose/snippets/adaptivelayouts/SampleListDetailPaneScaffold.kt
-2
diff --git a/‎compose/snippets/src/main/java/com/example/compose/snippets/adaptivelayouts/SampleNavigationSuiteScaffold.kt
-3 b/‎compose/snippets/src/main/java/com/example/compose/snippets/adaptivelayouts/SampleNavigationSuiteScaffold.kt
-3
diff --git a/‎compose/snippets/src/main/java/com/example/compose/snippets/animations/AnimationQuickGuide.kt
-2 b/‎compose/snippets/src/main/java/com/example/compose/snippets/animations/AnimationQuickGuide.kt
-2
@@ -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() {
 
 
@@ -8,6 +8,8 @@ plugins {
     alias(libs.plugins.kapt) 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")
 
@@ -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)
 
@@ -20,6 +20,8 @@ plugins {
     alias(libs.plugins.kapt)
     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,6 +136,7 @@ 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)
 
 
@@ -28,9 +28,11 @@ 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.CheckboxExamples
 import com.example.compose.snippets.components.ChipExamples
 import com.example.compose.snippets.components.ComponentsScreen
@@ -45,14 +47,13 @@ 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.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.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?) {
@@ -76,13 +77,14 @@ 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()
                                 }
                             }
                         }
 
@@ -35,8 +35,6 @@ import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffold
 import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole
 import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-@file:OptIn(ExperimentalMaterial3AdaptiveNavigationSuiteApi::class)
-
 package com.example.compose.snippets.adaptivelayouts
 
 import androidx.annotation.StringRes
@@ -29,7 +27,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.NavigationBarItemDefaults
 import androidx.compose.material3.Text
 import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
-import androidx.compose.material3.adaptive.navigationsuite.ExperimentalMaterial3AdaptiveNavigationSuiteApi
 import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteDefaults
 import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold
 import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffoldDefaults
 
@@ -87,7 +87,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.drawBehind
@@ -720,7 +719,6 @@ private fun LoadingScreen() {
     }
 }
 
-@OptIn(ExperimentalComposeUiApi::class)
 @Preview
 @Composable
 fun AnimationLayout() {
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@ plugins {`
`8`	`8`	`alias(libs.plugins.kapt) apply false`
`9`	`9`	`alias(libs.plugins.hilt) apply false`
`10`	`10`	`alias(libs.plugins.kotlin.parcelize) apply false`
	`11`	`+ alias(libs.plugins.compose.compiler) apply false`
	`12`	`+ alias(libs.plugins.kotlin.serialization) apply false`
`11`	`13`	`}`
`12`	`14`
`13`	`15`	`apply("${project.rootDir}/buildscripts/toml-updater-config.gradle")`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`plugins {`
`2`	`2`	`alias(libs.plugins.android.application)`
`3`	`3`	`alias(libs.plugins.kotlin.android)`
	`4`	`+ alias(libs.plugins.compose.compiler)`
`4`	`5`	`}`
`5`	`6`	`android {`
`6`	`7`	`compileSdk = libs.versions.compileSdk.get().toInt()`
`@@ -40,9 +41,6 @@ android {`
`40`	`41`	`viewBinding = true`
`41`	`42`	`}`
`42`	`43`
`43`		`- composeOptions {`
`44`		`- kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()`
`45`		`- }`
`46`	`44`	`}`
`47`	`45`	`dependencies {`
`48`	`46`	`val composeBom = platform(libs.androidx.compose.bom)`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,6 @@ import androidx.compose.runtime.mutableStateOf`
`87`	`87`	`import androidx.compose.runtime.remember`
`88`	`88`	`import androidx.compose.runtime.setValue`
`89`	`89`	`import androidx.compose.ui.Alignment`
`90`		`-import androidx.compose.ui.ExperimentalComposeUiApi`
`91`	`90`	`import androidx.compose.ui.Modifier`
`92`	`91`	`import androidx.compose.ui.draw.clip`
`93`	`92`	`import androidx.compose.ui.draw.drawBehind`
`@@ -720,7 +719,6 @@ private fun LoadingScreen() {`
`720`	`719`	`}`
`721`	`720`	`}`
`722`	`721`
`723`		`-@OptIn(ExperimentalComposeUiApi::class)`
`724`	`722`	`@Preview`
`725`	`723`	`@Composable`
`726`	`724`	`fun AnimationLayout() {`