Status Update
Comments
so...@google.com <so...@google.com>
nj...@google.com <nj...@google.com> #2
Branch: androidx-main
commit bbe1d83f1c87167b0da0104a8cc997db7b00f498
Author: Anastasia Soboleva <soboleva@google.com>
Date: Mon Sep 25 09:38:18 2023
Add Uspecified to Hyphens, LineBreak, TextAlign, TextDirection
ParagraphStyle and TextStyle takes these as non-null params in ctors, copy and merge to avoid boxing.
Deprecated getTextAlign and similar public getters nullable for binary compat. Introduced non-null counterparts that compile into primitives.
Before:
5,150 ns 5 allocs Trace Method Trace EMULATOR_AllAppsWithSpans.draw[size=2, spanCount=4]
18,965 ns 99 allocs Trace Method Trace EMULATOR_AllAppsWithSpans.recomposeOnly[size=2, spanCount=4]
44,769 ns 208 allocs Trace Method Trace EMULATOR_AllAppsWithSpans.recomposeMeasureLayout[size=2, spanCount=4]
After:
5,265 ns 5 allocs Trace Method Trace EMULATOR_AllAppsWithSpans.draw[size=2, spanCount=4]
19,054 ns 99 allocs Trace Method Trace EMULATOR_AllAppsWithSpans.recomposeOnly[size=2, spanCount=4]
44,617 ns 201 allocs Trace Method Trace EMULATOR_AllAppsWithSpans.recomposeMeasureLayout[size=2, spanCount=4]
Before:
159,575 ns 647 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.toggleRectangleColor_measure[10]
138,596 ns 580 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.layout[10]
191,924 ns 715 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.first_measure[10]
1,653,166 ns 6220 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.toggleRectangleColor_measure[100]
1,246,603 ns 5490 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.layout[100]
1,529,656 ns 6859 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.first_measure[100]
After:
177,292 ns 597 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.toggleRectangleColor_measure[10]
139,119 ns 550 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.layout[10]
186,741 ns 645 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.first_measure[10]
1,642,789 ns 5500 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.toggleRectangleColor_measure[100]
1,352,991 ns 5231 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.layout[100]
1,570,829 ns 6159 allocs Trace Method Trace EMULATOR_TextInColumnBenchmark.first_measure[100]
Test: ui:ui-text:test, ui:ui-text:cC
Test: benchmarks
Bug: 299490814
Relnote: "Introduced a special Unspecified value for TextAlign, TextDirection, Hyphens and LineBreak fields of the ParagraphTextStyle to replace “null”. Because these classes are inline classes, by replacing nullable with the Unspecified, we avoid primitive type boxing.
Constructors, getters and other methods in TextStyle and Paragraph style were update to accept the mentioned parameters as non-null types."
Change-Id: I4197ea85db556846ecad27ca8f561955e2370951
M compose/material/material/src/commonMain/kotlin/androidx/compose/material/Text.kt
M compose/material3/material3/src/commonMain/kotlin/androidx/compose/material3/Text.kt
M compose/ui/ui-inspection/src/androidTest/java/androidx/compose/ui/inspection/inspector/ParameterFactoryTest.kt
M compose/ui/ui-text/api/current.ignore
M compose/ui/ui-text/api/current.txt
M compose/ui/ui-text/api/restricted_current.ignore
M compose/ui/ui-text/api/restricted_current.txt
M compose/ui/ui-text/src/androidInstrumentedTest/kotlin/androidx/compose/ui/text/AndroidParagraphTest.kt
M compose/ui/ui-text/src/androidInstrumentedTest/kotlin/androidx/compose/ui/text/AndroidParagraphTextDirectionTest.kt
M compose/ui/ui-text/src/androidInstrumentedTest/kotlin/androidx/compose/ui/text/MultiParagraphIntegrationTextDirectionTest.kt
M compose/ui/ui-text/src/androidInstrumentedTest/kotlin/androidx/compose/ui/text/ParagraphIntegrationTextDirectionTest.kt
M compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/AndroidParagraph.android.kt
M compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/platform/AndroidParagraphIntrinsics.android.kt
M compose/ui/ui-text/src/androidMain/kotlin/androidx/compose/ui/text/style/LineBreak.android.kt
M compose/ui/ui-text/src/androidUnitTest/kotlin/androidx/compose/ui/text/ParagraphStyleTest.kt
M compose/ui/ui-text/src/androidUnitTest/kotlin/androidx/compose/ui/text/TextStyleLayoutAttributesTest.kt
M compose/ui/ui-text/src/androidUnitTest/kotlin/androidx/compose/ui/text/TextStyleTest.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/MultiParagraphIntrinsics.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/ParagraphStyle.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/Savers.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/SpanStyle.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/TextStyle.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/style/Hyphens.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/style/LineBreak.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/style/TextAlign.kt
M compose/ui/ui-text/src/commonMain/kotlin/androidx/compose/ui/text/style/TextDirection.kt
M compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/platform/SkiaParagraph.skiko.kt
M compose/ui/ui-text/src/skikoMain/kotlin/androidx/compose/ui/text/style/LineBreak.skiko.kt
M tv/tv-material/src/main/java/androidx/tv/material3/Text.kt
M wear/compose/compose-material-core/src/main/java/androidx/wear/compose/materialcore/Text.kt
ma...@gmail.com <ma...@gmail.com> #3
Branch: androidx-main
commit e21f04493c5ee666dc8fc472ff3e085e4ab88945
Author: Anastasia Soboleva <soboleva@google.com>
Date: Mon Oct 09 12:16:50 2023
Replace TextAlign? parameter with TextAlign in tv Text
Since tv's Text is still experimental, we better replace nullable with non-null to avoid primitive type boxing
Bug: 299490814
Test: TextTest
Relnote: "TV Text component's TextAlign parameter is now non-null"
Change-Id: Ib73b136b5d997de3869ca63e7c6dcad5e513ec1e
M tv/tv-material/api/current.txt
M tv/tv-material/api/restricted_current.txt
M tv/tv-material/src/main/java/androidx/tv/material3/Text.kt
nj...@google.com <nj...@google.com> #4
The following release(s) address this bug.It is possible this bug has only been partially addressed:
androidx.compose.material:material:1.6.0-alpha08
androidx.compose.material:material-android:1.6.0-alpha08
androidx.compose.material:material-desktop:1.6.0-alpha08
androidx.compose.material3:material3:1.2.0-alpha10
androidx.compose.material3:material3-android:1.2.0-alpha10
androidx.compose.material3:material3-desktop:1.2.0-alpha10
androidx.compose.ui:ui-text:1.6.0-alpha08
androidx.compose.ui:ui-text-android:1.6.0-alpha08
androidx.compose.ui:ui-text-desktop:1.6.0-alpha08
androidx.wear.compose:compose-material-core:1.3.0-alpha08
ma...@gmail.com <ma...@gmail.com> #5
Here are 2 screenshots of the same pixel art asset displayed in an android app using an ImageView. In the first screenshot(Screenshot_1566295198-576x1024.png) I've created a Bitmap with antialiasing, dither and filter disabled. I didn't find a way to get that result with compose
nj...@google.com <nj...@google.com> #6
Thanks! Can you share the code for these snippets as well?
From the screenshots it looks like you may need to have a higher resolution image per resource drawable buckets as well. Would you happen to know the display density of the Android device that this is running on?
ma...@gmail.com <ma...@gmail.com> #7
The resource is a 16x16 pixel art. I cannot have an higher resolution version. The resources are taken from a pixel art game because the app is a sort of companion for that game so it uses the same resources of the game.
ma...@gmail.com <ma...@gmail.com> #8
I cannot share a code snippet now but I've used the same approach exposed in that answer on Stack overflow
nj...@google.com <nj...@google.com> #9
Thanks for the screenshots.
I think you can do the following as a workaround to draw the pixel art image directly with anti-aliasing disabled:
val imageBitmap = BitmapFactory.decodeResource(
LocalContext.current.resources,
R.drawable.my_pixel_art
).asImageBitmap()
val paint = remember {
Paint().apply {
isAntiAlias = false
}
}
Canvas(modifier = Modifier.fillMaxSize()) { // DrawScope
drawIntoCanvas { canvas ->
canvas.drawImage(imageBitmap, Offset.Zero, paint)
}
}
ro...@google.com <ro...@google.com> #10
It's filtering you want to disable for pixel art, not anti-aliasing (although you may want that too when the image is rotated or uses subpixel positioning).
ma...@gmail.com <ma...@gmail.com> #11
I ended up using a custom Painter. The painter is almost identical to BitmapPainter
, I have overwritten only DrawScope.onDraw
private val customPaint = Paint().apply {
asFrameworkPaint().apply {
this.isDither = false
this.isFilterBitmap = false
this.isAntiAlias = false
}
}
override fun DrawScope.onDraw() {
drawIntoCanvas {
it.drawImageRect(
image = image,
srcSize = srcSize,
srcOffset = srcOffset,
dstSize = IntSize(
this@onDraw.size.width.roundToInt(),
this@onDraw.size.height.roundToInt()
),
paint = customPaint
)
}
}
ap...@google.com <ap...@google.com> #12
Branch: androidx-main
commit 5df92271b6eac729464aea71f9691acd21983777
Author: Nader Jawad <njawad@google.com>
Date: Tue Jul 13 12:35:20 2021
Add support for FilterQuality in DrawScope
Relnote: "Updated DrawScope#drawImage method that
consumes source and destination rects
to consume an optional FilterQuality
parameter. This is useful for pixel
art that is intended to be pixelated
when scaled up for pixel based art.
Updated BitmapPainter + Image composable
to also consume an optional FilterQuality
parameter"
Fixes: 180311607
Test: Added various tests to DrawScopeTest,
BitmapPainterTest and ImageTest
Change-Id: Ie4fb04013701add0fba1c5c6bb9da2812d6436e7
M compose/foundation/foundation/api/current.ignore
M compose/foundation/foundation/api/current.txt
M compose/foundation/foundation/api/public_plus_experimental_current.txt
M compose/foundation/foundation/api/restricted_current.ignore
M compose/foundation/foundation/api/restricted_current.txt
M compose/foundation/foundation/src/androidAndroidTest/kotlin/androidx/compose/foundation/ImageTest.kt
M compose/foundation/foundation/src/commonMain/kotlin/androidx/compose/foundation/Image.kt
D compose/material/material/api/current.ignore
D compose/material/material/api/restricted_current.ignore
D compose/ui/ui-graphics/api/current.ignore
M compose/ui/ui-graphics/api/current.txt
M compose/ui/ui-graphics/api/public_plus_experimental_current.txt
D compose/ui/ui-graphics/api/restricted_current.ignore
M compose/ui/ui-graphics/api/restricted_current.txt
M compose/ui/ui-graphics/src/androidAndroidTest/kotlin/androidx/compose/ui/graphics/drawscope/DrawScopeTest.kt
M compose/ui/ui-graphics/src/androidAndroidTest/kotlin/androidx/compose/ui/graphics/painter/BitmapPainterTest.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Paint.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/CanvasDrawScope.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/painter/BitmapPainter.kt
D compose/ui/ui-text/api/current.ignore
D compose/ui/ui-text/api/restricted_current.ignore
Description
Jetpack Compose release version: 1.0.0-alpha12
I would like to ask to allow to disable the antialiasing when using the
Image
composable. Paint has an antialiasing property but it's not exposed by the painter object used to draw the image.There is currently no easy way to disable the antialiasing without creating a custom painter and using a Paint object that is not the one passed to the DrawScope of the painter.
With SwiftUi I can simply use
func antialiased(Bool) -> Image
that is an extension ofImage