Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions demo/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ plugins {

android {
compileSdk = libs.versions.sdk.compile.get().toInt()
buildToolsVersion = libs.versions.buildTools.get()

buildFeatures.compose = true
buildFeatures {
compose = true
}

defaultConfig {
applicationId = "com.mxalbert.sharedelements.demo"
Expand Down Expand Up @@ -35,12 +36,12 @@ android {

kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
freeCompilerArgs = freeCompilerArgs + "-Xopt-in=kotlin.RequiresOptIn"
}

composeOptions {
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}
namespace = "com.mxalbert.sharedelements.demo"
}

dependencies {
Expand Down
3 changes: 1 addition & 2 deletions demo/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mxalbert.sharedelements.demo">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:allowBackup="false"
Expand Down
3 changes: 2 additions & 1 deletion demo/src/main/java/com/mxalbert/sharedelements/demo/Demo.kt
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ fun UserListRoot() {
val listState = rememberLazyListState()
Crossfade(
targetState = selectedUser,
animationSpec = tween(durationMillis = TransitionDurationMillis)
animationSpec = tween(durationMillis = TransitionDurationMillis),
label = ""
) { user ->
when {
user < 0 -> UserListScreen(listState)
Expand Down
3 changes: 3 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,6 @@ POM_SCM_DEV_CONNECTION=scm:git:git://github.com/mxalbert1996/compose-shared-elem
POM_DEVELOPER_ID=mxalbert1996
POM_DEVELOPER_NAME=Albert Chang
POM_DEVELOPER_URL=https://github.com/mxalbert1996/
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
19 changes: 9 additions & 10 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
[versions]
agp = "7.3.1"
agp = "8.1.4"
sdk-min = "21"
sdk-target = "33"
sdk-compile = "33"
buildTools = "33.0.0"
sdk-target = "34"
sdk-compile = "34"
maven-publish = "0.21.0"
kotlin = "1.7.20"
compose-compiler = "1.3.2"
compose-bom = "2022.11.00"
androidx-core = "1.9.0"
androidx-activity = "1.6.1"
kotlin = "1.9.20"
compose-compiler = "1.5.4"
compose-bom = "2023.10.01"
androidx-core = "1.12.0"
androidx-activity = "1.8.1"
jUnit = "4.13.2"
testExt = "1.1.4"
testExt = "1.1.5"

[libraries]
kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Dec 04 17:51:34 JST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
2 changes: 1 addition & 1 deletion shared-elements/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ plugins {

android {
compileSdk = libs.versions.sdk.compile.get().toInt()
buildToolsVersion = libs.versions.buildTools.get()

buildFeatures {
buildConfig = false
Expand All @@ -36,6 +35,7 @@ android {
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
}
namespace = "com.mxalbert.sharedelements"
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion shared-elements/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="com.mxalbert.sharedelements" />
<manifest />