Uncomment androidx.annotation annotations in graphics common code [290950582]

Fixed

Bug

Status Update

No update yet.

Description

au...@google.com

created issue #1

Jul 12, 2023 06:05PM

Uncomment androidx.annotation annotations in graphics common code so developers get working lint checks:

ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Color.kt:fun Color(/*@ColorInt*/ color: Int): Color {
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Color.kt:    /*@IntRange(from = 0, to = 0xFF)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Color.kt:    /*@IntRange(from = 0, to = 0xFF)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Color.kt:    /*@IntRange(from = 0, to = 0xFF)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Color.kt:    /*@IntRange(from = 0, to = 0xFF)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Color.kt:fun lerp(start: Color, stop: Color, /*@FloatRange(from = 0.0, to = 1.0)*/ fraction: Float): Color {
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Color.kt:/*@Size(value = 4)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Outline.kt:    /*@FloatRange(from = 0.0, to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Outline.kt:    /*@FloatRange(from = 0.0, to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/PixelMap.kt:        /*@IntRange(from = 0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/PixelMap.kt:        /*@IntRange(from = 0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorModel.kt:    /*@IntRange(from = 1, to = 4)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpace.kt:        /*@IntRange(from = 1, to = 4)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpace.kt:    abstract fun getMinValue(/*@IntRange(from = 0, to = 3)*/ component: Int): Float
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpace.kt:    abstract fun getMaxValue(/*@IntRange(from = 0, to = 3)*/ component: Int): Float
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpace.kt:    /*@Size(3)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpace.kt:    /*@Size(min = 3)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpace.kt:    abstract fun toXyz(/*@Size(min = 3)*/ v: FloatArray): FloatArray
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpace.kt:    /*@Size(min = 3)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpace.kt:    /*@Size(min = 3)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpace.kt:    abstract fun fromXyz(/*@Size(min = 3)*/ v: FloatArray): FloatArray
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpaces.kt:        /*@Size(9)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Connector.kt:    /*@Size(3)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Connector.kt:    /*@Size(min = 3)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Connector.kt:    open fun transform(/*@Size(min = 3)*/ v: FloatArray): FloatArray {
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:    /*@Size(6)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:    /*@Size(9)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:    /*@Size(9)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(min = 1)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(9)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(min = 1)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(min = 6, max = 9)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(min = 1)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(9)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(min = 1)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(min = 6, max = 9)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(min = 1)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(9)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(min = 1)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:        /*@Size(min = 6, max = 9)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt:    /*@Size(min = 6)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/WhitePoint.kt:    /*@Size(3)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0,
 to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0,
 to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0,
 to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0,
 to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0,
 to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0,
 to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0,
 to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0, to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0, to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0, to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0, to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0, to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0, to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0, to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0, to = 1.0)*/
ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/drawscope/DrawScope.kt:        /*@FloatRange(from = 0.0, to = 1.0)*/

Comments

le...@google.com <le...@google.com> Jul 21, 2023 09:57PM

Assigned to nj...@google.com.

ap...@google.com <ap...@google.com> #2Aug 11, 2023 12:14AM

Marked as fixed.

Project: platform/frameworks/support
Branch: androidx-main

commit bf0b583f84df33e312244ab6ea3bb263837acdc5
Author: Nader Jawad <njawad@google.com>
Date: Thu Aug 10 14:47:16 2023

Uncomment androidx.annotation annotations in graphics code

Relnote: "Added androidx annotations to various graphics
APIs to specify ColorInt, FloatRange, IntRange, Size and more"

Fixes: 290950582
Test: ran compose tests
Change-Id: I70487409f64808e1f004e7ed05e8497fbf607a63

M compose/ui/ui-graphics/api/current.txt
M compose/ui/ui-graphics/api/restricted_current.txt
M compose/ui/ui-graphics/build.gradle
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Color.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Outline.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/PixelMap.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorModel.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpace.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpaces.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Connector.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/WhitePoint.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 wear/compose/integration-tests/navigation/build.gradle

https://android-review.googlesource.com/2703789

nj...@google.com <nj...@google.com> #3Aug 31, 2023 03:30AM

Status: Assigned (reopened)

Unfortunately we needed to revert this change as it currently includes a ToT dependency on the androidx.annotation module which breaks G3 drops. Once androidx.annotation version 1.7 goes live on September 6th we can re-land this CL.

ap...@google.com <ap...@google.com> #4Sep 8, 2023 10:19PM

Marked as fixed.

Project: platform/frameworks/support
Branch: androidx-main

commit 9ea54e83edfffd9403fc661ea4e65332522c5c1f
Author: Nader Jawad <njawad@google.com>
Date: Fri Sep 08 10:36:05 2023

Reland "Uncomment androidx.annotation annotations in graphics code""

This reverts commit c6880a2af26f1a0c2a6b601e99a60a5a3dcbe7b5.

Relanding this CL since the official 1.7 release of the annotations
module has been published. Updating the dependency to refer
to this pinned version rather than ToT.

Relnote: "Added androidx annotations to various graphics
APIs to specify ColorInt, FloatRange, IntRange, Size and more"

Fixes: 290950582
Test: re-ran compose tests
Change-Id: Id65c82355bc1859fb2b3683e69606a38779654a5

M compose/ui/ui-graphics/api/current.txt
M compose/ui/ui-graphics/api/restricted_current.txt
M compose/ui/ui-graphics/build.gradle
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Color.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/Outline.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/PixelMap.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorModel.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpace.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/ColorSpaces.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Connector.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/Rgb.kt
M compose/ui/ui-graphics/src/commonMain/kotlin/androidx/compose/ui/graphics/colorspace/WhitePoint.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 gradle/libs.versions.toml
M wear/compose/integration-tests/navigation/build.gradle

https://android-review.googlesource.com/2746055

na...@google.com <na...@google.com> #5Sep 20, 2023 07:16PM

The following release(s) address this bug.It is possible this bug has only been partially addressed:

androidx.compose.ui:ui-graphics:1.6.0-alpha06
androidx.compose.ui:ui-graphics-android:1.6.0-alpha06

Issue 290950582