Skip to content

Commit b6b16a1

Browse files
Use Accompanist Drawable Painter
1 parent 183cc58 commit b6b16a1

3 files changed

Lines changed: 9 additions & 7 deletions

File tree

app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,7 @@ dependencies {
305305
// Jetpack Compose related dependencies
306306
implementation libs.androidx.paging.compose
307307
implementation libs.androidx.navigation.compose
308+
implementation libs.accompanist.drawablepainter
308309

309310
// Coroutines interop
310311
implementation libs.kotlinx.coroutines.rx3

app/src/main/java/org/schabi/newpipe/ui/components/about/AboutTab.kt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package org.schabi.newpipe.ui.components.about
22

33
import androidx.annotation.StringRes
4+
import androidx.appcompat.content.res.AppCompatResources
5+
import androidx.compose.foundation.Image
46
import androidx.compose.foundation.layout.Arrangement
57
import androidx.compose.foundation.layout.Column
68
import androidx.compose.foundation.layout.Spacer
@@ -16,7 +18,6 @@ import androidx.compose.material3.Text
1618
import androidx.compose.material3.TextButton
1719
import androidx.compose.runtime.Composable
1820
import androidx.compose.runtime.NonRestartableComposable
19-
import androidx.compose.runtime.remember
2021
import androidx.compose.ui.Alignment
2122
import androidx.compose.ui.Modifier
2223
import androidx.compose.ui.platform.LocalContext
@@ -26,8 +27,7 @@ import androidx.compose.ui.tooling.preview.Preview
2627
import androidx.compose.ui.tooling.preview.PreviewParameter
2728
import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
2829
import androidx.compose.ui.unit.dp
29-
import androidx.core.content.ContextCompat.getDrawable
30-
import coil3.compose.AsyncImage
30+
import com.google.accompanist.drawablepainter.rememberDrawablePainter
3131
import my.nanihadesuka.compose.ColumnScrollbar
3232
import org.schabi.newpipe.BuildConfig
3333
import org.schabi.newpipe.R
@@ -84,10 +84,9 @@ fun AboutTab() {
8484
horizontalAlignment = Alignment.CenterHorizontally
8585
) {
8686
// note: the preview
87-
val context = LocalContext.current
88-
val launcherDrawable = remember { getDrawable(context, R.mipmap.ic_launcher) }
89-
AsyncImage(
90-
model = launcherDrawable,
87+
val icon = AppCompatResources.getDrawable(LocalContext.current, R.mipmap.ic_launcher)
88+
Image(
89+
painter = rememberDrawablePainter(icon),
9190
contentDescription = stringResource(R.string.app_name),
9291
)
9392
Spacer(Modifier.height(4.dp))

gradle/libs.versions.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[versions]
22
aboutLibraries = "11.2.3"
3+
accompanist = "0.37.3"
34
acraCore = "5.11.3"
45
androidState = "1.4.1"
56
androidx-junit = "1.1.5"
@@ -77,6 +78,7 @@ sonarqube = { id = "org.sonarqube", version.ref = "sonarqube" }
7778
[libraries]
7879
aboutlibraries-compose-m3 = { group = "com.mikepenz", name = "aboutlibraries-compose-m3", version.ref = "aboutLibraries" }
7980
aboutlibraries-plugin = { group = "com.mikepenz.aboutlibraries.plugin", name = "aboutlibraries-plugin", version.ref = "aboutLibraries" }
81+
accompanist-drawablepainter = { module = "com.google.accompanist:accompanist-drawablepainter", version.ref = "accompanist" }
8082
acra-core = { group = "ch.acra", name = "acra-core", version.ref = "acraCore" }
8183
android-state = { group = "com.evernote", name = "android-state", version.ref = "androidState" }
8284
android-state-processor = { group = "com.evernote", name = "android-state-processor", version.ref = "androidState" }

0 commit comments

Comments
 (0)