Merge pull request #1 from android/supporting_pane_libraries_update

Update SupportingPane libraries

Author: tiwiz

.idea/.gitignore

@@ -1,15 +1,11 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
 .DS_Store
 /build
 /captures
 .externalNativeBuild
 .cxx
 local.properties
+/.idea/*
+

CanonicalLayouts/supporting-pane-compose/.gitignore

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2025 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
-    id("org.jetbrains.kotlin.plugin.compose") version "2.0.20"
+    id("org.jetbrains.kotlin.plugin.compose") version "2.1.0"
 
 }
 
@@ -68,19 +68,18 @@ composeCompiler {
 }
 
 dependencies {
-    def composeBom = platform('androidx.compose:compose-bom:2024.11.00')
+    def composeBom = platform('androidx.compose:compose-bom:2025.01.01')
     implementation(composeBom)
 
     implementation 'androidx.core:core-ktx:1.15.0'
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.7'
-    implementation 'androidx.activity:activity-compose:1.9.3'
+    implementation 'androidx.activity:activity-compose:1.10.0'
     implementation "androidx.compose.ui:ui"
     implementation "androidx.compose.ui:ui-tooling-preview"
     implementation "androidx.window:window:1.3.0"
-    implementation 'androidx.compose.material3:material3:1.4.0-alpha04'
-    implementation 'androidx.compose.material3.adaptive:adaptive:1.1.0-alpha07'
-    implementation 'androidx.compose.material3.adaptive:adaptive-layout:1.1.0-alpha07'
-    implementation 'androidx.compose.material3.adaptive:adaptive-navigation:1.1.0-alpha07'
-    implementation "androidx.compose.material3:material3-window-size-class:1.3.1"
+    implementation 'androidx.compose.material3:material3:1.4.0-alpha07'
+    implementation 'androidx.compose.material3.adaptive:adaptive:1.1.0-beta01'
+    implementation 'androidx.compose.material3.adaptive:adaptive-layout:1.1.0-beta01'
+    implementation 'androidx.compose.material3.adaptive:adaptive-navigation:1.1.0-beta01'
     testImplementation 'junit:junit:4.13.2'
 }

CanonicalLayouts/supporting-pane-compose/app/build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 The Android Open Source Project
+ * Copyright 2025 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,17 +19,21 @@ package com.example.supportingpanecompose
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
+import androidx.compose.ui.Modifier
 import com.example.supportingpanecompose.ui.SupportingPaneSample
 import com.example.supportingpanecompose.ui.theme.SupportingPaneCompose
 
 @OptIn(ExperimentalMaterial3AdaptiveApi::class)
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
         setContent {
             SupportingPaneCompose {
-                SupportingPaneSample()
+                SupportingPaneSample(modifier = Modifier.safeDrawingPadding())
             }
         }
     }

CanonicalLayouts/supporting-pane-compose/app/src/main/java/com/example/supportingpanecompose/MainActivity.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2025 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@ import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.layout.AnimatedPane
 import androidx.compose.material3.adaptive.layout.SupportingPaneScaffold
 import androidx.compose.material3.adaptive.layout.SupportingPaneScaffoldRole
+import androidx.compose.material3.adaptive.layout.defaultDragHandleSemantics
 import androidx.compose.material3.adaptive.layout.rememberPaneExpansionState
 import androidx.compose.material3.adaptive.navigation.rememberSupportingPaneScaffoldNavigator
 import androidx.compose.runtime.Composable
@@ -62,7 +63,7 @@ private val data = mapOf(
 
 @ExperimentalMaterial3AdaptiveApi
 @Composable
-fun SupportingPaneSample() {
+fun SupportingPaneSample(modifier: Modifier = Modifier) {
     var selectedTopic: String by rememberSaveable { mutableStateOf(data.keys.first()) }
     val navigator = rememberSupportingPaneScaffoldNavigator()
     val scope = rememberCoroutineScope()
@@ -76,6 +77,7 @@ fun SupportingPaneSample() {
     SupportingPaneScaffold(
         directive = navigator.scaffoldDirective,
         value = navigator.scaffoldValue,
+        modifier = modifier,
         supportingPane = {
             AnimatedPane(
                 modifier = Modifier.padding(all = 16.dp)
@@ -149,11 +151,11 @@ fun SupportingPaneSample() {
                 remember { MutableInteractionSource() }
             VerticalDragHandle(
                 modifier =
-                Modifier.paneExpansionDraggable(
-                    state,
-                    LocalMinimumInteractiveComponentSize.current,
-                    interactionSource
-                ), interactionSource = interactionSource
+                    Modifier.paneExpansionDraggable(
+                        state,
+                        LocalMinimumInteractiveComponentSize.current,
+                        interactionSource, state.defaultDragHandleSemantics()
+                    ), interactionSource = interactionSource
             )
         })
 }

CanonicalLayouts/supporting-pane-compose/app/src/main/java/com/example/supportingpanecompose/ui/SupportingPaneSample.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 plugins {
-    id 'com.android.application' version '8.7.3' apply false
-    id 'com.android.library' version '8.7.3' apply false
+    id 'com.android.application' version '8.8.0' apply false
+    id 'com.android.library' version '8.8.0' apply false
     id 'org.jetbrains.kotlin.android' version '2.0.20' apply false
 }

CanonicalLayouts/supporting-pane-compose/build.gradle

@@ -1,6 +1,6 @@
 #Wed May 25 14:11:15 UTC 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME