A fully functional Android app built entirely with Kotlin and Jetpack Compose
Simplify Drag&Drop implementation
Rob Orgiu31c4f05872d8
diff --git a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txtindex f36981625..4e0b3ef48 100644--- a/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt+++ b/app-nia-catalog/dependencies/releaseRuntimeClasspath.txt@@ -2,24 +2,24 @@ androidx.activity:activity-compose:1.9.3androidx.activity:activity-ktx:1.9.3androidx.activity:activity:1.9.3androidx.annotation:annotation-experimental:1.4.1-androidx.annotation:annotation-jvm:1.8.1-androidx.annotation:annotation:1.8.1+androidx.annotation:annotation-jvm:1.9.1+androidx.annotation:annotation:1.9.1androidx.appcompat:appcompat-resources:1.6.1androidx.arch.core:core-common:2.2.0androidx.arch.core:core-runtime:2.2.0androidx.autofill:autofill:1.0.0androidx.browser:browser:1.8.0-androidx.collection:collection-jvm:1.4.4-androidx.collection:collection-ktx:1.4.4-androidx.collection:collection:1.4.4-androidx.compose.animation:animation-android:1.7.6-androidx.compose.animation:animation-core-android:1.7.6-androidx.compose.animation:animation-core:1.7.6-androidx.compose.animation:animation:1.7.6-androidx.compose.foundation:foundation-android:1.7.6-androidx.compose.foundation:foundation-layout-android:1.7.6-androidx.compose.foundation:foundation-layout:1.7.6-androidx.compose.foundation:foundation:1.7.6+androidx.collection:collection-jvm:1.5.0-alpha06+androidx.collection:collection-ktx:1.5.0-alpha06+androidx.collection:collection:1.5.0-alpha06+androidx.compose.animation:animation-android:1.8.0-alpha06+androidx.compose.animation:animation-core-android:1.8.0-alpha06+androidx.compose.animation:animation-core:1.8.0-alpha06+androidx.compose.animation:animation:1.8.0-alpha06+androidx.compose.foundation:foundation-android:1.8.0-alpha06+androidx.compose.foundation:foundation-layout-android:1.8.0-alpha06+androidx.compose.foundation:foundation-layout:1.8.0-alpha06+androidx.compose.foundation:foundation:1.8.0-alpha06androidx.compose.material3.adaptive:adaptive-android:1.0.0androidx.compose.material3.adaptive:adaptive:1.0.0androidx.compose.material3:material3-adaptive-navigation-suite-android:1.3.1@@ -32,55 +32,55 @@ androidx.compose.material:material-icons-extended-android:1.7.6androidx.compose.material:material-icons-extended:1.7.6androidx.compose.material:material-ripple-android:1.7.6androidx.compose.material:material-ripple:1.7.6-androidx.compose.runtime:runtime-android:1.7.6-androidx.compose.runtime:runtime-saveable-android:1.7.6-androidx.compose.runtime:runtime-saveable:1.7.6-androidx.compose.runtime:runtime:1.7.6-androidx.compose.ui:ui-android:1.7.6-androidx.compose.ui:ui-geometry-android:1.7.6-androidx.compose.ui:ui-geometry:1.7.6-androidx.compose.ui:ui-graphics-android:1.7.6-androidx.compose.ui:ui-graphics:1.7.6-androidx.compose.ui:ui-text-android:1.7.6-androidx.compose.ui:ui-text:1.7.6-androidx.compose.ui:ui-tooling-preview-android:1.7.6-androidx.compose.ui:ui-tooling-preview:1.7.6-androidx.compose.ui:ui-unit-android:1.7.6-androidx.compose.ui:ui-unit:1.7.6-androidx.compose.ui:ui-util-android:1.7.6-androidx.compose.ui:ui-util:1.7.6-androidx.compose.ui:ui:1.7.6+androidx.compose.runtime:runtime-android:1.8.0-alpha06+androidx.compose.runtime:runtime-saveable-android:1.8.0-alpha06+androidx.compose.runtime:runtime-saveable:1.8.0-alpha06+androidx.compose.runtime:runtime:1.8.0-alpha06+androidx.compose.ui:ui-android:1.8.0-alpha06+androidx.compose.ui:ui-geometry-android:1.8.0-alpha06+androidx.compose.ui:ui-geometry:1.8.0-alpha06+androidx.compose.ui:ui-graphics-android:1.8.0-alpha06+androidx.compose.ui:ui-graphics:1.8.0-alpha06+androidx.compose.ui:ui-text-android:1.8.0-alpha06+androidx.compose.ui:ui-text:1.8.0-alpha06+androidx.compose.ui:ui-tooling-preview-android:1.8.0-alpha06+androidx.compose.ui:ui-tooling-preview:1.8.0-alpha06+androidx.compose.ui:ui-unit-android:1.8.0-alpha06+androidx.compose.ui:ui-unit:1.8.0-alpha06+androidx.compose.ui:ui-util-android:1.8.0-alpha06+androidx.compose.ui:ui-util:1.8.0-alpha06+androidx.compose.ui:ui:1.8.0-alpha06androidx.compose:compose-bom:2024.12.01androidx.concurrent:concurrent-futures:1.1.0androidx.core:core-ktx:1.13.1androidx.core:core:1.13.1androidx.customview:customview-poolingcontainer:1.0.0androidx.customview:customview:1.0.0-androidx.emoji2:emoji2:1.3.0+androidx.emoji2:emoji2:1.4.0androidx.exifinterface:exifinterface:1.3.7androidx.fragment:fragment:1.5.1androidx.graphics:graphics-path:1.0.1androidx.interpolator:interpolator:1.0.0-androidx.lifecycle:lifecycle-common-java8:2.8.3-androidx.lifecycle:lifecycle-common-jvm:2.8.3-androidx.lifecycle:lifecycle-common:2.8.3-androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.3-androidx.lifecycle:lifecycle-livedata-core:2.8.3-androidx.lifecycle:lifecycle-livedata:2.8.3-androidx.lifecycle:lifecycle-process:2.8.3-androidx.lifecycle:lifecycle-runtime-android:2.8.3-androidx.lifecycle:lifecycle-runtime-compose-android:2.8.3-androidx.lifecycle:lifecycle-runtime-compose:2.8.3-androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.3-androidx.lifecycle:lifecycle-runtime-ktx:2.8.3-androidx.lifecycle:lifecycle-runtime:2.8.3-androidx.lifecycle:lifecycle-viewmodel-android:2.8.3-androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3-androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.3-androidx.lifecycle:lifecycle-viewmodel:2.8.3+androidx.lifecycle:lifecycle-common-java8:2.8.7+androidx.lifecycle:lifecycle-common-jvm:2.8.7+androidx.lifecycle:lifecycle-common:2.8.7+androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.7+androidx.lifecycle:lifecycle-livedata-core:2.8.7+androidx.lifecycle:lifecycle-livedata:2.8.7+androidx.lifecycle:lifecycle-process:2.8.7+androidx.lifecycle:lifecycle-runtime-android:2.8.7+androidx.lifecycle:lifecycle-runtime-compose-android:2.8.7+androidx.lifecycle:lifecycle-runtime-compose:2.8.7+androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.7+androidx.lifecycle:lifecycle-runtime-ktx:2.8.7+androidx.lifecycle:lifecycle-runtime:2.8.7+androidx.lifecycle:lifecycle-viewmodel-android:2.8.7+androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7+androidx.lifecycle:lifecycle-viewmodel:2.8.7androidx.loader:loader:1.0.0androidx.metrics:metrics-performance:1.0.0-beta01-androidx.profileinstaller:profileinstaller:1.3.1+androidx.profileinstaller:profileinstaller:1.4.0androidx.savedstate:savedstate-ktx:1.2.1androidx.savedstate:savedstate:1.2.1androidx.startup:startup-runtime:1.1.1diff --git a/app/dependencies/prodReleaseRuntimeClasspath.txt b/app/dependencies/prodReleaseRuntimeClasspath.txtindex e334aa676..f1cafaad0 100644--- a/app/dependencies/prodReleaseRuntimeClasspath.txt+++ b/app/dependencies/prodReleaseRuntimeClasspath.txt@@ -2,25 +2,25 @@ androidx.activity:activity-compose:1.9.3androidx.activity:activity-ktx:1.9.3androidx.activity:activity:1.9.3androidx.annotation:annotation-experimental:1.4.1-androidx.annotation:annotation-jvm:1.8.1-androidx.annotation:annotation:1.8.1+androidx.annotation:annotation-jvm:1.9.1+androidx.annotation:annotation:1.9.1androidx.appcompat:appcompat-resources:1.7.0androidx.appcompat:appcompat:1.7.0androidx.arch.core:core-common:2.2.0androidx.arch.core:core-runtime:2.2.0androidx.autofill:autofill:1.0.0androidx.browser:browser:1.8.0-androidx.collection:collection-jvm:1.4.4-androidx.collection:collection-ktx:1.4.4-androidx.collection:collection:1.4.4-androidx.compose.animation:animation-android:1.7.6-androidx.compose.animation:animation-core-android:1.7.6-androidx.compose.animation:animation-core:1.7.6-androidx.compose.animation:animation:1.7.6-androidx.compose.foundation:foundation-android:1.7.6-androidx.compose.foundation:foundation-layout-android:1.7.6-androidx.compose.foundation:foundation-layout:1.7.6-androidx.compose.foundation:foundation:1.7.6+androidx.collection:collection-jvm:1.5.0-alpha06+androidx.collection:collection-ktx:1.5.0-alpha06+androidx.collection:collection:1.5.0-alpha06+androidx.compose.animation:animation-android:1.8.0-alpha06+androidx.compose.animation:animation-core-android:1.8.0-alpha06+androidx.compose.animation:animation-core:1.8.0-alpha06+androidx.compose.animation:animation:1.8.0-alpha06+androidx.compose.foundation:foundation-android:1.8.0-alpha06+androidx.compose.foundation:foundation-layout-android:1.8.0-alpha06+androidx.compose.foundation:foundation-layout:1.8.0-alpha06+androidx.compose.foundation:foundation:1.8.0-alpha06androidx.compose.material3.adaptive:adaptive-android:1.0.0androidx.compose.material3.adaptive:adaptive-layout-android:1.0.0androidx.compose.material3.adaptive:adaptive-layout:1.0.0@@ -39,25 +39,25 @@ androidx.compose.material:material-icons-extended-android:1.7.6androidx.compose.material:material-icons-extended:1.7.6androidx.compose.material:material-ripple-android:1.7.6androidx.compose.material:material-ripple:1.7.6-androidx.compose.runtime:runtime-android:1.7.6-androidx.compose.runtime:runtime-saveable-android:1.7.6-androidx.compose.runtime:runtime-saveable:1.7.6-androidx.compose.runtime:runtime-tracing:1.7.6-androidx.compose.runtime:runtime:1.7.6-androidx.compose.ui:ui-android:1.7.6-androidx.compose.ui:ui-geometry-android:1.7.6-androidx.compose.ui:ui-geometry:1.7.6-androidx.compose.ui:ui-graphics-android:1.7.6-androidx.compose.ui:ui-graphics:1.7.6-androidx.compose.ui:ui-text-android:1.7.6-androidx.compose.ui:ui-text:1.7.6-androidx.compose.ui:ui-tooling-preview-android:1.7.6-androidx.compose.ui:ui-tooling-preview:1.7.6-androidx.compose.ui:ui-unit-android:1.7.6-androidx.compose.ui:ui-unit:1.7.6-androidx.compose.ui:ui-util-android:1.7.6-androidx.compose.ui:ui-util:1.7.6-androidx.compose.ui:ui:1.7.6+androidx.compose.runtime:runtime-android:1.8.0-alpha06+androidx.compose.runtime:runtime-saveable-android:1.8.0-alpha06+androidx.compose.runtime:runtime-saveable:1.8.0-alpha06+androidx.compose.runtime:runtime-tracing:1.8.0-alpha06+androidx.compose.runtime:runtime:1.8.0-alpha06+androidx.compose.ui:ui-android:1.8.0-alpha06+androidx.compose.ui:ui-geometry-android:1.8.0-alpha06+androidx.compose.ui:ui-geometry:1.8.0-alpha06+androidx.compose.ui:ui-graphics-android:1.8.0-alpha06+androidx.compose.ui:ui-graphics:1.8.0-alpha06+androidx.compose.ui:ui-text-android:1.8.0-alpha06+androidx.compose.ui:ui-text:1.8.0-alpha06+androidx.compose.ui:ui-tooling-preview-android:1.8.0-alpha06+androidx.compose.ui:ui-tooling-preview:1.8.0-alpha06+androidx.compose.ui:ui-unit-android:1.8.0-alpha06+androidx.compose.ui:ui-unit:1.8.0-alpha06+androidx.compose.ui:ui-util-android:1.8.0-alpha06+androidx.compose.ui:ui-util:1.8.0-alpha06+androidx.compose.ui:ui:1.8.0-alpha06androidx.compose:compose-bom:2024.12.01androidx.concurrent:concurrent-futures-ktx:1.1.0androidx.concurrent:concurrent-futures:1.1.0@@ -79,8 +79,8 @@ androidx.datastore:datastore-preferences:1.1.1androidx.datastore:datastore:1.1.1androidx.documentfile:documentfile:1.0.0androidx.drawerlayout:drawerlayout:1.0.0-androidx.emoji2:emoji2-views-helper:1.3.0-androidx.emoji2:emoji2:1.3.0+androidx.emoji2:emoji2-views-helper:1.4.0+androidx.emoji2:emoji2:1.4.0androidx.exifinterface:exifinterface:1.3.7androidx.fragment:fragment:1.5.4androidx.graphics:graphics-path:1.0.1diff --git a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.ktindex ff10b8d38..f6e446be0 100644--- a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt+++ b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt@@ -138,16 +138,14 @@ fun NewsResourceCardExpanded(userNewsResource.title,modifier = Modifier.fillMaxWidth((.8f))- .dragAndDropSource {- startTransfer(+ .dragAndDropSource { _ ->DragAndDropTransferData(ClipData.newPlainText(sharingLabel,sharingContent,),flags = dragAndDropFlags,- ),- )+ )},)Spacer(modifier = Modifier.weight(1f))diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex ce4bd2c64..1936fe5c1 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -57,6 +57,7 @@ room = "2.6.1"secrets = "2.0.1"truth = "1.4.4"turbine = "1.2.0"+composeFoundation = "1.8.0-alpha06"[bundles]androidx-compose-ui-test = ["androidx-compose-ui-test", "androidx-compose-ui-testManifest"]@@ -69,7 +70,7 @@ androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", versionandroidx-benchmark-macro = { group = "androidx.benchmark", name = "benchmark-macro-junit4", version.ref = "androidxMacroBenchmark" }androidx-browser = { group = "androidx.browser", name = "browser", version.ref = "androidxBrowser" }androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" }-androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation" }+androidx-compose-foundation = { group = "androidx.compose.foundation", name = "foundation", version.ref = "composeFoundation" }androidx-compose-foundation-layout = { group = "androidx.compose.foundation", name = "foundation-layout" }androidx-compose-material-iconsExtended = { group = "androidx.compose.material", name = "material-icons-extended" }androidx-compose-material3 = { group = "androidx.compose.material3", name = "material3" }