diff --git a/app/build.gradle b/app/build.gradle index 0841086ad7c..bc0c7d98770 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -305,6 +305,7 @@ dependencies { // Jetpack Compose related dependencies implementation libs.androidx.paging.compose implementation libs.androidx.navigation.compose + implementation libs.accompanist.drawablepainter // Coroutines interop implementation libs.kotlinx.coroutines.rx3 diff --git a/app/src/main/java/org/schabi/newpipe/ui/components/about/AboutTab.kt b/app/src/main/java/org/schabi/newpipe/ui/components/about/AboutTab.kt index 3bba5dba998..b85d1ed7ebd 100644 --- a/app/src/main/java/org/schabi/newpipe/ui/components/about/AboutTab.kt +++ b/app/src/main/java/org/schabi/newpipe/ui/components/about/AboutTab.kt @@ -1,6 +1,8 @@ package org.schabi.newpipe.ui.components.about import androidx.annotation.StringRes +import androidx.appcompat.content.res.AppCompatResources +import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer @@ -16,7 +18,6 @@ import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable import androidx.compose.runtime.NonRestartableComposable -import androidx.compose.runtime.remember import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext @@ -26,8 +27,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider import androidx.compose.ui.unit.dp -import androidx.core.content.ContextCompat.getDrawable -import coil3.compose.AsyncImage +import com.google.accompanist.drawablepainter.rememberDrawablePainter import my.nanihadesuka.compose.ColumnScrollbar import org.schabi.newpipe.BuildConfig import org.schabi.newpipe.R @@ -84,10 +84,9 @@ fun AboutTab() { horizontalAlignment = Alignment.CenterHorizontally ) { // note: the preview - val context = LocalContext.current - val launcherDrawable = remember { getDrawable(context, R.mipmap.ic_launcher) } - AsyncImage( - model = launcherDrawable, + val icon = AppCompatResources.getDrawable(LocalContext.current, R.mipmap.ic_launcher) + Image( + painter = rememberDrawablePainter(icon), contentDescription = stringResource(R.string.app_name), ) Spacer(Modifier.height(4.dp)) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8647d813047..674b869505c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,6 @@ [versions] aboutLibraries = "11.2.3" +accompanist = "0.37.3" acraCore = "5.11.3" androidState = "1.4.1" androidx-junit = "1.1.5" @@ -77,6 +78,7 @@ sonarqube = { id = "org.sonarqube", version.ref = "sonarqube" } [libraries] aboutlibraries-compose-m3 = { group = "com.mikepenz", name = "aboutlibraries-compose-m3", version.ref = "aboutLibraries" } aboutlibraries-plugin = { group = "com.mikepenz.aboutlibraries.plugin", name = "aboutlibraries-plugin", version.ref = "aboutLibraries" } +accompanist-drawablepainter = { module = "com.google.accompanist:accompanist-drawablepainter", version.ref = "accompanist" } acra-core = { group = "ch.acra", name = "acra-core", version.ref = "acraCore" } android-state = { group = "com.evernote", name = "android-state", version.ref = "androidState" } android-state-processor = { group = "com.evernote", name = "android-state-processor", version.ref = "androidState" }