From ed32a511e7d3b6d0ffb33c66b437f56ad2474428 Mon Sep 17 00:00:00 2001 From: arkon Date: Wed, 8 Mar 2023 22:52:19 -0500 Subject: [PATCH] Bump dependencies --- .../tachiyomi/util/view/ViewExtensions.kt | 18 ------------------ gradle/androidx.versions.toml | 6 +++--- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt b/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt index 14b0f76d39..92f21074d6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/util/view/ViewExtensions.kt @@ -19,36 +19,18 @@ import androidx.appcompat.content.res.AppCompatResources import androidx.appcompat.view.menu.MenuBuilder import androidx.appcompat.widget.PopupMenu import androidx.appcompat.widget.TooltipCompat -import androidx.compose.foundation.layout.consumeWindowInsets import androidx.compose.material3.LocalContentColor import androidx.compose.material3.LocalTextStyle import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.runtime.CompositionContext import androidx.compose.runtime.CompositionLocalProvider -import androidx.compose.ui.platform.ComposeView -import androidx.compose.ui.platform.ViewCompositionStrategy import androidx.core.view.forEach import com.google.android.material.shape.MaterialShapeDrawable import eu.kanade.presentation.theme.TachiyomiTheme import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.system.getResourceColor -inline fun ComposeView.setComposeContent(crossinline content: @Composable () -> Unit) { - consumeWindowInsets = false - setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed) - setContent { - TachiyomiTheme { - CompositionLocalProvider( - LocalTextStyle provides MaterialTheme.typography.bodySmall, - LocalContentColor provides MaterialTheme.colorScheme.onBackground, - ) { - content() - } - } - } -} - inline fun ComponentActivity.setComposeContent( parent: CompositionContext? = null, crossinline content: @Composable () -> Unit, diff --git a/gradle/androidx.versions.toml b/gradle/androidx.versions.toml index 20b391722e..513505b620 100644 --- a/gradle/androidx.versions.toml +++ b/gradle/androidx.versions.toml @@ -1,5 +1,5 @@ [versions] -agp_version = "7.4.1" +agp_version = "7.4.2" lifecycle_version = "2.6.0-rc01" [libraries] @@ -10,9 +10,9 @@ appcompat = "androidx.appcompat:appcompat:1.6.1" biometricktx = "androidx.biometric:biometric-ktx:1.2.0-alpha05" constraintlayout = "androidx.constraintlayout:constraintlayout:2.1.4" coordinatorlayout = "androidx.coordinatorlayout:coordinatorlayout:1.2.0" -corektx = "androidx.core:core-ktx:1.10.0-beta01" +corektx = "androidx.core:core-ktx:1.10.0-rc01" splashscreen = "androidx.core:core-splashscreen:1.0.0-alpha02" -recyclerview = "androidx.recyclerview:recyclerview:1.3.0-rc01" +recyclerview = "androidx.recyclerview:recyclerview:1.3.0" viewpager = "androidx.viewpager:viewpager:1.1.0-alpha01" glance = "androidx.glance:glance-appwidget:1.0.0-alpha03" profileinstaller = "androidx.profileinstaller:profileinstaller:1.2.2"