diff --git a/appcompose/build.gradle b/appcompose/build.gradle index f937e8cf..a8c9d9bc 100644 --- a/appcompose/build.gradle +++ b/appcompose/build.gradle @@ -5,12 +5,12 @@ plugins { android { namespace 'com.readrops.app.compose' - compileSdk 33 + compileSdk rootProject.ext.compileSdkVersion defaultConfig { applicationId "com.readrops.app.compose" - minSdk 21 - targetSdk 33 + minSdk rootProject.ext.minSdkVersion + targetSdk rootProject.ext.targetSdkVersion versionCode 1 versionName "1.0" @@ -68,7 +68,7 @@ dependencies { androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' - def composeBom = platform('androidx.compose:compose-bom:2023.06.01') + def composeBom = platform('androidx.compose:compose-bom:2023.08.00') implementation composeBom androidTestImplementation composeBom diff --git a/appcompose/src/main/java/com/readrops/app/compose/MainActivity.kt b/appcompose/src/main/java/com/readrops/app/compose/MainActivity.kt index 03c0df30..2bcf35ef 100644 --- a/appcompose/src/main/java/com/readrops/app/compose/MainActivity.kt +++ b/appcompose/src/main/java/com/readrops/app/compose/MainActivity.kt @@ -5,8 +5,8 @@ import androidx.activity.ComponentActivity import androidx.activity.compose.setContent import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.material3.* +import cafe.adriel.voyager.navigator.CurrentScreen import cafe.adriel.voyager.navigator.Navigator -import cafe.adriel.voyager.transitions.FadeTransition import com.readrops.app.compose.account.selection.AccountSelectionScreen import com.readrops.app.compose.account.selection.AccountSelectionViewModel import com.readrops.app.compose.home.HomeScreen @@ -26,8 +26,8 @@ class MainActivity : ComponentActivity() { ReadropsTheme { Navigator( screen = if (accountExists) HomeScreen() else AccountSelectionScreen() - ) { navigator -> - FadeTransition(navigator) + ) { + CurrentScreen() } } } diff --git a/build.gradle b/build.gradle index 15978c13..79ca1cd2 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.1.0' + classpath 'com.android.tools.build:gradle:8.1.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jacoco:org.jacoco.core:0.8.7" } @@ -30,10 +30,10 @@ allprojects { } ext { - compileSdkVersion = 33 + compileSdkVersion = 34 minSdkVersion = 21 - targetSdkVersion = 33 - buildToolsVersion = "33.0.2" + targetSdkVersion = 34 + buildToolsVersion = "34.0.0" koin_version = "3.3.3" }