fix(sdds-acore/theme-builder): compose gradients were fixed

salute-developers · Feb 21, 2025 · 667e66f · 667e66f
1 parent 186f153
commit 667e66f
Show file tree

Hide file tree

Showing 30 changed files with 10 additions and 57 deletions.
diff --git a/...plugin/themebuilder/internal/generator/theme/compose/ComposeGradientAttributeGenerator.kt b/...plugin/themebuilder/internal/generator/theme/compose/ComposeGradientAttributeGenerator.kt
@@ -424,8 +424,7 @@ internal class ComposeGradientAttributeGenerator(
                 ),
             ),
             body = listOf(
-                "return $LINEAR_GRADIENT_CLASS_NAME(colors, positions.toList(), " +
-                    "angleInDegrees = angle, useAsCssAngle = true)",
+                "return $LINEAR_GRADIENT_CLASS_NAME(colors, positions.toList(), angle)",
             ),
         )
     }

diff --git a/...re/plugin_theme_builder/src/main/resources/raw-kt-files/compose/ThmbldrLinearGradient.txt b/...re/plugin_theme_builder/src/main/resources/raw-kt-files/compose/ThmbldrLinearGradient.txt
@@ -21,22 +21,16 @@ import kotlin.math.sqrt
  * @param stops точки остановки цвета
  * @param tileMode определяет поведение на границах градиента
  * @param angleInDegrees угол в градусах
- * @param useAsCssAngle меняет режим отрисовки на
  */
 @Immutable
 internal class ThmbldrLinearGradient constructor(
     private val colors: List<Color>,
     private val stops: List<Float>? = null,
     angleInDegrees: Float = 0f,
-    useAsCssAngle: Boolean = false,
     private val tileMode: TileMode = TileMode.Clamp,
 ) : ShaderBrush() {
 
-    private val normalizedAngle: Float = if (useAsCssAngle) {
-        ((90 - angleInDegrees) % 360 + 360) % 360
-    } else {
-        (angleInDegrees % 360 + 360) % 360
-    }
+    private val normalizedAngle: Float = (angleInDegrees % 360 + 360) % 360
     private val angleInRadians: Float = Math.toRadians(normalizedAngle.toDouble()).toFloat()
 
     override fun createShader(size: Size): Shader {

diff --git a/sdds-core/plugin_theme_builder/src/test/resources/attrs-outputs/GradientsOutputKt.txt b/sdds-core/plugin_theme_builder/src/test/resources/attrs-outputs/GradientsOutputKt.txt
@@ -23,22 +23,16 @@ import kotlin.math.sqrt
  * @param stops точки остановки цвета
  * @param tileMode определяет поведение на границах градиента
  * @param angleInDegrees угол в градусах
- * @param useAsCssAngle меняет режим отрисовки на
  */
 @Immutable
 internal class ThmbldrLinearGradient constructor(
     private val colors: List<Color>,
     private val stops: List<Float>? = null,
     angleInDegrees: Float = 0f,
-    useAsCssAngle: Boolean = false,
     private val tileMode: TileMode = TileMode.Clamp,
 ) : ShaderBrush() {
 
-    private val normalizedAngle: Float = if (useAsCssAngle) {
-        ((90 - angleInDegrees) % 360 + 360) % 360
-    } else {
-        (angleInDegrees % 360 + 360) % 360
-    }
+    private val normalizedAngle: Float = (angleInDegrees % 360 + 360) % 360
     private val angleInRadians: Float = Math.toRadians(normalizedAngle.toDouble()).toFloat()
 
     override fun createShader(size: Size): Shader {
@@ -315,8 +309,7 @@ internal fun linearGradient(
     colors: List<Color>,
     positions: FloatArray,
     angle: Float,
-): ShaderBrush = ThmbldrLinearGradient(colors, positions.toList(), angleInDegrees = angle,
-        useAsCssAngle = true)
+): ShaderBrush = ThmbldrLinearGradient(colors, positions.toList(), angle)
 
 internal fun radialGradient(
     colors: List<Color>,

diff --git a/tokens/plasma.sd.service.compose/screenshots-compose/testAvatarGroupSizeS_dark.png b/tokens/plasma.sd.service.compose/screenshots-compose/testAvatarGroupSizeS_dark.png
diff --git a/...ns/plasma.sd.service.compose/screenshots-compose/testAvatarGroupSizeS_light.png b/...ns/plasma.sd.service.compose/screenshots-compose/testAvatarGroupSizeS_light.png
diff --git a/tokens/plasma.sd.service.compose/screenshots-compose/testAvatarSizeM_dark.png b/tokens/plasma.sd.service.compose/screenshots-compose/testAvatarSizeM_dark.png
diff --git a/tokens/plasma.sd.service.compose/screenshots-compose/testAvatarSizeM_light.png b/tokens/plasma.sd.service.compose/screenshots-compose/testAvatarSizeM_light.png
diff --git a/tokens/plasma.sd.service.compose/screenshots-compose/testAvatarSizeXxl_dark.png b/tokens/plasma.sd.service.compose/screenshots-compose/testAvatarSizeXxl_dark.png
diff --git a/...a.sd.service.compose/screenshots-compose/testProgressBarGradientAccent_dark.png b/...a.sd.service.compose/screenshots-compose/testProgressBarGradientAccent_dark.png
diff --git a/....sd.service.compose/screenshots-compose/testProgressBarGradientAccent_light.png b/....sd.service.compose/screenshots-compose/testProgressBarGradientAccent_light.png
diff --git a/...vice.compose/src/main/kotlin/com/sdds/plasma/sd/service/theme/PlasmaSdServiceGradients.kt b/...vice.compose/src/main/kotlin/com/sdds/plasma/sd/service/theme/PlasmaSdServiceGradients.kt
@@ -1649,12 +1649,7 @@ internal fun linearGradient(
     colors: List<Color>,
     positions: FloatArray,
     angle: Float,
-): ShaderBrush = ThmbldrLinearGradient(
-    colors,
-    positions.toList(),
-    angleInDegrees = angle,
-    useAsCssAngle = true,
-)
+): ShaderBrush = ThmbldrLinearGradient(colors, positions.toList(), angle)
 
 internal fun radialGradient(
     colors: List<Color>,

diff --git a/...service.compose/src/main/kotlin/com/sdds/plasma/sd/service/theme/ThmbldrLinearGradient.kt b/...service.compose/src/main/kotlin/com/sdds/plasma/sd/service/theme/ThmbldrLinearGradient.kt
@@ -23,22 +23,16 @@ import kotlin.math.sqrt
  * @param stops точки остановки цвета
  * @param tileMode определяет поведение на границах градиента
  * @param angleInDegrees угол в градусах
- * @param useAsCssAngle меняет режим отрисовки на
  */
 @Immutable
 internal class ThmbldrLinearGradient constructor(
     private val colors: List<Color>,
     private val stops: List<Float>? = null,
     angleInDegrees: Float = 0f,
-    useAsCssAngle: Boolean = false,
     private val tileMode: TileMode = TileMode.Clamp,
 ) : ShaderBrush() {
 
-    private val normalizedAngle: Float = if (useAsCssAngle) {
-        ((90 - angleInDegrees) % 360 + 360) % 360
-    } else {
-        (angleInDegrees % 360 + 360) % 360
-    }
+    private val normalizedAngle: Float = (angleInDegrees % 360 + 360) % 360
     private val angleInRadians: Float = Math.toRadians(normalizedAngle.toDouble()).toFloat()
 
     override fun createShader(size: Size): Shader {

diff --git a/tokens/sdds.serv.compose/screenshots-compose/testAvatarGroupSizeS_dark.png b/tokens/sdds.serv.compose/screenshots-compose/testAvatarGroupSizeS_dark.png
diff --git a/tokens/sdds.serv.compose/screenshots-compose/testAvatarGroupSizeS_light.png b/tokens/sdds.serv.compose/screenshots-compose/testAvatarGroupSizeS_light.png
diff --git a/tokens/sdds.serv.compose/screenshots-compose/testAvatarSizeM_dark.png b/tokens/sdds.serv.compose/screenshots-compose/testAvatarSizeM_dark.png
diff --git a/tokens/sdds.serv.compose/screenshots-compose/testAvatarSizeM_light.png b/tokens/sdds.serv.compose/screenshots-compose/testAvatarSizeM_light.png
diff --git a/...ns/sdds.serv.compose/screenshots-compose/testProgressBarGradientAccent_dark.png b/...ns/sdds.serv.compose/screenshots-compose/testProgressBarGradientAccent_dark.png
diff --git a/...s/sdds.serv.compose/screenshots-compose/testProgressBarGradientAccent_light.png b/...s/sdds.serv.compose/screenshots-compose/testProgressBarGradientAccent_light.png
diff --git a/tokens/sdds.serv.compose/src/main/kotlin/com/sdds/serv/theme/SddsServGradients.kt b/tokens/sdds.serv.compose/src/main/kotlin/com/sdds/serv/theme/SddsServGradients.kt
@@ -6699,12 +6699,7 @@ internal fun linearGradient(
     colors: List<Color>,
     positions: FloatArray,
     angle: Float,
-): ShaderBrush = ThmbldrLinearGradient(
-    colors,
-    positions.toList(),
-    angleInDegrees = angle,
-    useAsCssAngle = true,
-)
+): ShaderBrush = ThmbldrLinearGradient(colors, positions.toList(), angle)
 
 internal fun radialGradient(
     colors: List<Color>,

diff --git a/tokens/sdds.serv.compose/src/main/kotlin/com/sdds/serv/theme/ThmbldrLinearGradient.kt b/tokens/sdds.serv.compose/src/main/kotlin/com/sdds/serv/theme/ThmbldrLinearGradient.kt
@@ -23,22 +23,16 @@ import kotlin.math.sqrt
  * @param stops точки остановки цвета
  * @param tileMode определяет поведение на границах градиента
  * @param angleInDegrees угол в градусах
- * @param useAsCssAngle меняет режим отрисовки на
  */
 @Immutable
 internal class ThmbldrLinearGradient constructor(
     private val colors: List<Color>,
     private val stops: List<Float>? = null,
     angleInDegrees: Float = 0f,
-    useAsCssAngle: Boolean = false,
     private val tileMode: TileMode = TileMode.Clamp,
 ) : ShaderBrush() {
 
-    private val normalizedAngle: Float = if (useAsCssAngle) {
-        ((90 - angleInDegrees) % 360 + 360) % 360
-    } else {
-        (angleInDegrees % 360 + 360) % 360
-    }
+    private val normalizedAngle: Float = (angleInDegrees % 360 + 360) % 360
     private val angleInRadians: Float = Math.toRadians(normalizedAngle.toDouble()).toFloat()
 
     override fun createShader(size: Size): Shader {

diff --git a/tokens/stylessalute.compose/screenshots-compose/testAvatarGroupSizeS_dark.png b/tokens/stylessalute.compose/screenshots-compose/testAvatarGroupSizeS_dark.png
diff --git a/tokens/stylessalute.compose/screenshots-compose/testAvatarGroupSizeS_light.png b/tokens/stylessalute.compose/screenshots-compose/testAvatarGroupSizeS_light.png
diff --git a/tokens/stylessalute.compose/screenshots-compose/testAvatarSizeM_dark.png b/tokens/stylessalute.compose/screenshots-compose/testAvatarSizeM_dark.png
diff --git a/tokens/stylessalute.compose/screenshots-compose/testAvatarSizeM_light.png b/tokens/stylessalute.compose/screenshots-compose/testAvatarSizeM_light.png
diff --git a/tokens/stylessalute.compose/screenshots-compose/testAvatarSizeXxl_dark.png b/tokens/stylessalute.compose/screenshots-compose/testAvatarSizeXxl_dark.png
diff --git a/tokens/stylessalute.compose/screenshots-compose/testAvatarSizeXxl_light.png b/tokens/stylessalute.compose/screenshots-compose/testAvatarSizeXxl_light.png
diff --git a/...stylessalute.compose/screenshots-compose/testProgressBarGradientAccent_dark.png b/...stylessalute.compose/screenshots-compose/testProgressBarGradientAccent_dark.png
diff --git a/...tylessalute.compose/screenshots-compose/testProgressBarGradientAccent_light.png b/...tylessalute.compose/screenshots-compose/testProgressBarGradientAccent_light.png
diff --git a/...stylessalute.compose/src/main/kotlin/com/sdds/stylessalute/theme/StylesSaluteGradients.kt b/...stylessalute.compose/src/main/kotlin/com/sdds/stylessalute/theme/StylesSaluteGradients.kt
@@ -9411,12 +9411,7 @@ internal fun linearGradient(
     colors: List<Color>,
     positions: FloatArray,
     angle: Float,
-): ShaderBrush = ThmbldrLinearGradient(
-    colors,
-    positions.toList(),
-    angleInDegrees = angle,
-    useAsCssAngle = true,
-)
+): ShaderBrush = ThmbldrLinearGradient(colors, positions.toList(), angle)
 
 internal fun radialGradient(
     colors: List<Color>,

diff --git a/...stylessalute.compose/src/main/kotlin/com/sdds/stylessalute/theme/ThmbldrLinearGradient.kt b/...stylessalute.compose/src/main/kotlin/com/sdds/stylessalute/theme/ThmbldrLinearGradient.kt
@@ -23,22 +23,16 @@ import kotlin.math.sqrt
  * @param stops точки остановки цвета
  * @param tileMode определяет поведение на границах градиента
  * @param angleInDegrees угол в градусах
- * @param useAsCssAngle меняет режим отрисовки на
  */
 @Immutable
 internal class ThmbldrLinearGradient constructor(
     private val colors: List<Color>,
     private val stops: List<Float>? = null,
     angleInDegrees: Float = 0f,
-    useAsCssAngle: Boolean = false,
     private val tileMode: TileMode = TileMode.Clamp,
 ) : ShaderBrush() {
 
-    private val normalizedAngle: Float = if (useAsCssAngle) {
-        ((90 - angleInDegrees) % 360 + 360) % 360
-    } else {
-        (angleInDegrees % 360 + 360) % 360
-    }
+    private val normalizedAngle: Float = (angleInDegrees % 360 + 360) % 360
     private val angleInRadians: Float = Math.toRadians(normalizedAngle.toDouble()).toFloat()
 
     override fun createShader(size: Size): Shader {