FreshRSS
/
Readrops
mirror of https://github.com/readrops/Readrops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update compose BOM

This commit is contained in:
Shinokuni 2023-08-27 22:31:47 +02:00
parent 51806993a1
commit 5a6a6d4b23
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
appcompose/build.gradle
View File

@ -5,12 +5,12 @@ plugins {
android { android {
namespace 'com.readrops.app.compose' namespace 'com.readrops.app.compose'
compileSdk 33 compileSdk rootProject.ext.compileSdkVersion
defaultConfig { defaultConfig {
applicationId "com.readrops.app.compose" applicationId "com.readrops.app.compose"
minSdk 21 minSdk rootProject.ext.minSdkVersion
targetSdk 33 targetSdk rootProject.ext.targetSdkVersion
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
@ -68,7 +68,7 @@ dependencies {
androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' 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 implementation composeBom
androidTestImplementation composeBom androidTestImplementation composeBom

6
appcompose/src/main/java/com/readrops/app/compose/MainActivity.kt
View File

@ -5,8 +5,8 @@ import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent import androidx.activity.compose.setContent
import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.animation.ExperimentalAnimationApi
import androidx.compose.material3.* import androidx.compose.material3.*
import cafe.adriel.voyager.navigator.CurrentScreen
import cafe.adriel.voyager.navigator.Navigator 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.AccountSelectionScreen
import com.readrops.app.compose.account.selection.AccountSelectionViewModel import com.readrops.app.compose.account.selection.AccountSelectionViewModel
import com.readrops.app.compose.home.HomeScreen import com.readrops.app.compose.home.HomeScreen
@ -26,8 +26,8 @@ class MainActivity : ComponentActivity() {
ReadropsTheme { ReadropsTheme {
Navigator( Navigator(
screen = if (accountExists) HomeScreen() else AccountSelectionScreen() screen = if (accountExists) HomeScreen() else AccountSelectionScreen()
) { navigator -> ) {
FadeTransition(navigator) CurrentScreen()
} }
} }
} }

8
build.gradle
View File

@ -8,7 +8,7 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { 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.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jacoco:org.jacoco.core:0.8.7" classpath "org.jacoco:org.jacoco.core:0.8.7"
} }
@ -30,10 +30,10 @@ allprojects {
} }
ext { ext {
compileSdkVersion = 33 compileSdkVersion = 34
minSdkVersion = 21 minSdkVersion = 21
targetSdkVersion = 33 targetSdkVersion = 34
buildToolsVersion = "33.0.2" buildToolsVersion = "34.0.0"
koin_version = "3.3.3" koin_version = "3.3.3"
} }