Skip to content

Commit 56de2a4

Browse files
authored
Update write bitmap snippet. (#144)
* Clean up snippet for bitmap
1 parent 8cda9e6 commit 56de2a4

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

compose/snippets/src/main/java/com/example/compose/snippets/SnippetsActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class SnippetsActivity : ComponentActivity() {
9090
TopComponentsDestination.ButtonExamples -> ButtonExamples()
9191
TopComponentsDestination.ProgressIndicatorExamples -> ProgressIndicatorExamples()
9292
TopComponentsDestination.ScaffoldExample -> ScaffoldExample()
93-
TopComponentsDestination.AppBarExamples -> AppBarExamples()
93+
TopComponentsDestination.AppBarExamples -> AppBarExamples()
9494
}
9595
}
9696
}

compose/snippets/src/main/java/com/example/compose/snippets/graphics/AdvancedGraphicsSnippets.kt

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import android.content.Context
2121
import android.content.Intent
2222
import android.content.Intent.createChooser
2323
import android.graphics.Bitmap
24+
import android.graphics.Canvas
2425
import android.graphics.Picture
2526
import android.media.MediaScannerConnection
2627
import android.net.Uri
@@ -165,6 +166,7 @@ fun BitmapFromComposableSnippet() {
165166
drawIntoCanvas { canvas -> canvas.nativeCanvas.drawPicture(picture) }
166167
}
167168
}
169+
168170
) {
169171
ScreenContentToCapture()
170172
}
@@ -205,15 +207,19 @@ private fun ScreenContentToCapture() {
205207

206208
private fun createBitmapFromPicture(picture: Picture): Bitmap {
207209
// [START android_compose_draw_into_bitmap_convert_picture]
208-
val bitmap = Bitmap.createBitmap(
209-
picture.width,
210-
picture.height,
211-
Bitmap.Config.ARGB_8888
212-
)
213-
214-
val canvas = android.graphics.Canvas(bitmap)
215-
canvas.drawColor(android.graphics.Color.WHITE)
216-
canvas.drawPicture(picture)
210+
val bitmap = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
211+
Bitmap.createBitmap(picture)
212+
} else {
213+
val bitmap = Bitmap.createBitmap(
214+
picture.width,
215+
picture.height,
216+
Bitmap.Config.ARGB_8888
217+
)
218+
val canvas = android.graphics.Canvas(bitmap)
219+
canvas.drawColor(android.graphics.Color.WHITE)
220+
canvas.drawPicture(picture)
221+
bitmap
222+
}
217223
// [END android_compose_draw_into_bitmap_convert_picture]
218224
return bitmap
219225
}

0 commit comments

Comments
 (0)