Revert "[DrawablePainter] Fix overwriting bounds of drawable when dra…

…wing it via DrawablePainter"
google · Oct 11, 2022 · 397c05f · 397c05f
1 parent 2fad8c2
commit 397c05f
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 158 deletions.
diff --git a/drawablepainter/build.gradle b/drawablepainter/build.gradle
@@ -66,32 +66,6 @@ android {
 dependencies {
     implementation libs.compose.ui.ui
     implementation libs.kotlin.coroutines.android
-
-    // ======================
-    // Test dependencies
-    // ======================
-
-    androidTestImplementation libs.compose.foundation.foundation
-
-    androidTestImplementation project(':internal-testutils')
-    testImplementation project(':internal-testutils')
-
-    androidTestImplementation libs.junit
-    testImplementation libs.junit
-
-    androidTestImplementation libs.truth
-    testImplementation libs.truth
-
-    androidTestImplementation libs.compose.ui.test.junit4
-    testImplementation libs.compose.ui.test.junit4
-
-    androidTestImplementation libs.compose.ui.test.manifest
-    testImplementation libs.compose.ui.test.manifest
-
-    androidTestImplementation libs.androidx.test.runner
-    testImplementation libs.androidx.test.runner
-
-    testImplementation libs.robolectric
 }
 
 apply plugin: "com.vanniktech.maven.publish"
diff --git a/...nter/src/androidTest/kotlin/com/google/accompanist/drawablepainter/DrawablePainterTest.kt b/...nter/src/androidTest/kotlin/com/google/accompanist/drawablepainter/DrawablePainterTest.kt
diff --git a/drawablepainter/src/androidTest/kotlin/com/google/accompanist/drawablepainter/Drawables.kt b/drawablepainter/src/androidTest/kotlin/com/google/accompanist/drawablepainter/Drawables.kt
diff --git a/drawablepainter/src/main/java/com/google/accompanist/drawablepainter/DrawablePainter.kt b/drawablepainter/src/main/java/com/google/accompanist/drawablepainter/DrawablePainter.kt
@@ -130,10 +130,8 @@ class DrawablePainter(
             // Reading this ensures that we invalidate when invalidateDrawable() is called
             drawInvalidateTick
 
-            // Update the Drawable's bounds if necessary
-            if (drawable.bounds.isEmpty) {
-                drawable.setBounds(0, 0, size.width.roundToInt(), size.height.roundToInt())
-            }
+            // Update the Drawable's bounds
+            drawable.setBounds(0, 0, size.width.roundToInt(), size.height.roundToInt())
 
             canvas.withSave {
                 drawable.draw(canvas.nativeCanvas)