github
/
compose-jb
mirror of https://gitee.com/github-sync-mirror/compose-jb.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Use new Color API in benchmark-core and integration-core

902_DEPRECATE_OLD_COLOR_API
Shagen Ogandzhanian 3 years ago
parent
a222ee42f0
commit
6880bbafd1
6 changed files with 22 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      web/benchmark-core/src/jsMain/kotlin/com/sample/content/CodeSnippets.kt
  2. 4
      web/benchmark-core/src/jsMain/kotlin/com/sample/content/IntroSection.kt
  3. 4
      web/benchmark-core/src/jsMain/kotlin/com/sample/style/Stylesheet.kt
  4. 27
      web/benchmark-core/src/jsMain/kotlin/com/sample/style/WtCard.kt
  5. 22
      web/benchmark-core/src/jsMain/kotlin/com/sample/style/WtText.kt
  6. 2
      web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/EventsTests.kt

4
web/benchmark-core/src/jsMain/kotlin/com/sample/content/CodeSnippets.kt
Unescape View File

@ -47,7 +47,7 @@ private val DeclareAndUseStylesheet = CodeSnippetData(
source = """ source = """
object MyStyleSheet : StyleSheet() { object MyStyleSheet : StyleSheet() {
val container by style { /* define a class `container` */ val container by style { /* define a class `container` */
border(1.px, LineStyle.Solid, Color.RGB(255, 0, 0)) border(1.px, LineStyle.Solid, rgb(255, 0, 0))
} }
} }
@ -237,7 +237,7 @@ private fun TitledCodeSample(title: String, code: String) {
attrs = { attrs = {
classes(WtOffsets.wtTopOffset24) classes(WtOffsets.wtTopOffset24)
style { style {
backgroundColor(Color.RGBA(39, 40, 44, 0.05)) backgroundColor(rgba(39, 40, 44, 0.05))
borderRadius(8.px, 8.px, 8.px) borderRadius(8.px, 8.px, 8.px)
property("padding", "12px 16px") property("padding", "12px 16px")
} }

4
web/benchmark-core/src/jsMain/kotlin/com/sample/content/IntroSection.kt
Unescape View File

@ -117,7 +117,7 @@ private fun IntroCodeSample() {
Div(attrs = { Div(attrs = {
style { style {
marginTop(24.px) marginTop(24.px)
backgroundColor(Color.RGBA(39, 40, 44, 0.05)) backgroundColor(rgba(39, 40, 44, 0.05))
borderRadius(8.px) borderRadius(8.px)
property("font-family", "'JetBrains Mono', monospace") property("font-family", "'JetBrains Mono', monospace")
} }
@ -145,7 +145,7 @@ private fun IntroCodeSample() {
style { style {
height(1.px) height(1.px)
border(width = 0.px) border(width = 0.px)
backgroundColor(Color.RGBA(39, 40, 44, 0.15)) backgroundColor(rgba(39, 40, 44, 0.15))
} }
}) })

4
web/benchmark-core/src/jsMain/kotlin/com/sample/style/Stylesheet.kt
Unescape View File

@ -39,8 +39,8 @@ object AppStylesheet : StyleSheet() {
top((-32).px) top((-32).px)
marginLeft(8.px) marginLeft(8.px)
fontSize(15.px) fontSize(15.px)
backgroundColor(Color.RGBA(39, 40, 44, .05)) backgroundColor(rgba(39, 40, 44, .05))
color(Color.RGBA(39,40,44,.7)) color(rgba(39, 40, 44, .7))
borderRadius(4.px, 4.px, 4.px) borderRadius(4.px, 4.px, 4.px)
media(mediaMaxWidth(640.px)) { media(mediaMaxWidth(640.px)) {

27
web/benchmark-core/src/jsMain/kotlin/com/sample/style/WtCard.kt
Unescape View File

@ -1,25 +1,6 @@
package com.sample.style package com.sample.style
import org.jetbrains.compose.web.css.AlignItems import org.jetbrains.compose.web.css.*
import org.jetbrains.compose.web.css.Color
import org.jetbrains.compose.web.css.DisplayStyle
import org.jetbrains.compose.web.css.FlexDirection
import org.jetbrains.compose.web.css.LineStyle
import org.jetbrains.compose.web.css.Position
import org.jetbrains.compose.web.css.StyleSheet
import org.jetbrains.compose.web.css.alignItems
import org.jetbrains.compose.web.css.backgroundColor
import org.jetbrains.compose.web.css.border
import org.jetbrains.compose.web.css.color
import org.jetbrains.compose.web.css.display
import org.jetbrains.compose.web.css.flexDirection
import org.jetbrains.compose.web.css.flexGrow
import org.jetbrains.compose.web.css.mediaMaxWidth
import org.jetbrains.compose.web.css.media
import org.jetbrains.compose.web.css.padding
import org.jetbrains.compose.web.css.percent
import org.jetbrains.compose.web.css.position
import org.jetbrains.compose.web.css.px
object WtCards : StyleSheet(AppStylesheet) { object WtCards : StyleSheet(AppStylesheet) {
val wtCard by style { val wtCard by style {
@ -31,14 +12,14 @@ object WtCards : StyleSheet(AppStylesheet) {
} }
val wtCardThemeLight by style { val wtCardThemeLight by style {
border(color = Color.RGBA(39, 40, 44, .2)) border(color = rgba(39, 40, 44, .2))
color("#27282c") color("#27282c")
backgroundColor("white") backgroundColor("white")
} }
val wtCardThemeDark by style { val wtCardThemeDark by style {
backgroundColor(Color.RGBA(255, 255, 255, 0.05)) backgroundColor(rgba(255, 255, 255, 0.05))
color(Color.RGBA(255, 255, 255, 0.6)) color(rgba(255, 255, 255, 0.6))
border(0.px) border(0.px)
} }

22
web/benchmark-core/src/jsMain/kotlin/com/sample/style/WtText.kt
Unescape View File

@ -50,7 +50,7 @@ object WtTexts : StyleSheet(AppStylesheet) {
} }
val wtText1 by style { val wtText1 by style {
color(Color.RGBA(39, 40, 44, .7)) color(rgba(39, 40, 44, .7))
fontSize(18.px) fontSize(18.px)
property("letter-spacing", "normal") property("letter-spacing", "normal")
property("font-weight", 400) property("font-weight", 400)
@ -63,11 +63,11 @@ object WtTexts : StyleSheet(AppStylesheet) {
} }
val wtText1ThemeDark by style { val wtText1ThemeDark by style {
color(Color.RGBA(255, 255, 255, 0.6)) color(rgba(255, 255, 255, 0.6))
} }
val wtText2 by style { val wtText2 by style {
color(Color.RGBA(39, 40, 44, .7)) color(rgba(39, 40, 44, .7))
fontSize(15.px) fontSize(15.px)
property("letter-spacing", "normal") property("letter-spacing", "normal")
property("font-weight", 400) property("font-weight", 400)
@ -80,7 +80,7 @@ object WtTexts : StyleSheet(AppStylesheet) {
} }
val wtText3 by style { val wtText3 by style {
color(Color.RGBA(39, 40, 44, .7)) color(rgba(39, 40, 44, .7))
fontSize(12.px) fontSize(12.px)
property("letter-spacing", "normal") property("letter-spacing", "normal")
property("font-weight", 400) property("font-weight", 400)
@ -93,15 +93,15 @@ object WtTexts : StyleSheet(AppStylesheet) {
} }
val wtTextPale by style { val wtTextPale by style {
color(Color.RGBA(255, 255, 255, 0.30)) color(rgba(255, 255, 255, 0.30))
} }
val wtText2ThemeDark by style { val wtText2ThemeDark by style {
color(Color.RGBA(255, 255, 255, 0.6)) color(rgba(255, 255, 255, 0.6))
} }
val wtText3ThemeDark by style { val wtText3ThemeDark by style {
color(Color.RGBA(255, 255, 255, 0.6)) color(rgba(255, 255, 255, 0.6))
} }
val wtLink by style { val wtLink by style {
@ -172,7 +172,7 @@ object WtTexts : StyleSheet(AppStylesheet) {
property("width", "fit-content") property("width", "fit-content")
hover(self) style { hover(self) style {
backgroundColor(Color.RGBA(22, 125, 255, .8)) backgroundColor(rgba(22, 125, 255, .8))
} }
} }
@ -186,7 +186,7 @@ object WtTexts : StyleSheet(AppStylesheet) {
property("outline", "none") property("outline", "none")
hover(self) style { hover(self) style {
backgroundColor(Color.RGBA(255, 255, 255, 0.1)) backgroundColor(rgba(255, 255, 255, 0.1))
} }
} }
@ -195,7 +195,7 @@ object WtTexts : StyleSheet(AppStylesheet) {
backgroundColor("#27282c") backgroundColor("#27282c")
hover(self) style { hover(self) style {
backgroundColor(Color.RGBA(39, 40, 44, .7)) backgroundColor(rgba(39, 40, 44, .7))
} }
} }
@ -207,7 +207,7 @@ object WtTexts : StyleSheet(AppStylesheet) {
display(DisplayStyle.LegacyInlineFlex) display(DisplayStyle.LegacyInlineFlex)
hover(self) style { hover(self) style {
backgroundColor(Color.RGBA(255, 255, 255, 0.1)) backgroundColor(rgba(255, 255, 255, 0.1))
property("border-radius", 24.px) property("border-radius", 24.px)
} }

2
web/integration-core/src/jsMain/kotlin/androidx/compose/web/sample/tests/EventsTests.kt
Unescape View File

@ -73,7 +73,7 @@ class EventsTests {
style { style {
property("overflow-y", "scroll") property("overflow-y", "scroll")
height(200.px) height(200.px)
backgroundColor(Color.RGB(220, 220, 220)) backgroundColor(rgb(220, 220, 220))
} }
onScroll { onScroll {
state = "Scrolled" state = "Scrolled"

Write Preview
Loading…
Cancel
Save