Reformat code

2021-05-11 17:26:08 +02:00
parent 2b725f6af2
commit c5ba12032d
72 changed files with 2501 additions and 1711 deletions
--- a/src/commonMain/kotlin/nl/astraeus/css/properties/AlignItems.kt
+++ b/src/commonMain/kotlin/nl/astraeus/css/properties/AlignItems.kt
@@ -2,7 +2,7 @@ package nl.astraeus.css.properties

 class AlignItems(
  value: String
-): CssProperty(value) {
+) : CssProperty(value) {

  companion object {
    val stretch = AlignItems("stretch")
--- a/src/commonMain/kotlin/nl/astraeus/css/properties/AlignSelf.kt
+++ b/src/commonMain/kotlin/nl/astraeus/css/properties/AlignSelf.kt
@@ -2,7 +2,7 @@ package nl.astraeus.css.properties

 class AlignSelf(
  value: String
-): CssProperty(value) {
+) : CssProperty(value) {

  companion object {
    val auto = AlignSelf("auto")
--- a/src/commonMain/kotlin/nl/astraeus/css/properties/All.kt
+++ b/src/commonMain/kotlin/nl/astraeus/css/properties/All.kt
@@ -2,7 +2,7 @@ package nl.astraeus.css.properties

 class All(
  value: String
-): CssProperty(value) {
+) : CssProperty(value) {

  companion object {
    val unset = All("unset")
--- a/src/commonMain/kotlin/nl/astraeus/css/properties/Animation.kt
+++ b/src/commonMain/kotlin/nl/astraeus/css/properties/Animation.kt
@@ -30,7 +30,7 @@ class AnimationFillMode(

 class AnimationFrame(
  value: String = ""
-): CssProperty(value) {
+) : CssProperty(value) {

  companion object {
    fun name(name: String) = AnimationFrame(name)
--- a/src/commonMain/kotlin/nl/astraeus/css/properties/Border.kt
+++ b/src/commonMain/kotlin/nl/astraeus/css/properties/Border.kt
@@ -2,7 +2,7 @@ package nl.astraeus.css.properties

 class BorderRadius(
  value: String
-): CssProperty(value) {
+) : CssProperty(value) {
  companion object {
    fun px(nr: Int) = BorderRadius("${nr}px")
    fun em(nr: Int) = BorderRadius("${nr}em")
@@ -20,7 +20,7 @@ class BorderRadius(

 class BorderStyle(
  value: String
-): CssProperty(value) {
+) : CssProperty(value) {

  companion object {
    val none = BorderStyle("none")
@@ -40,7 +40,7 @@ class BorderStyle(

 class BorderWidth(
  value: String
-): CssProperty(value) {
+) : CssProperty(value) {

  companion object {
    val thin = BorderWidth("thin")
@@ -53,7 +53,7 @@ class BorderWidth(

 class BorderCollapse(
  value: String
-): CssProperty(value) {
+) : CssProperty(value) {

  companion object {
    val separate = BorderCollapse("separate")
@@ -61,9 +61,9 @@ class BorderCollapse(
  }
 }

-class BorderImageWidth (
+class BorderImageWidth(
  value: String
-): CssProperty(value) {
+) : CssProperty(value) {

  companion object {
    fun px(nr: Int) = BorderImageWidth("${nr}px")
@@ -78,7 +78,7 @@ class BorderImageWidth (

 class BorderSpacing(
  value: String
-): CssProperty(value) {
+) : CssProperty(value) {

  companion object {
    fun px(nr: Int) = BorderSpacing("${nr}px")
--- a/src/commonMain/kotlin/nl/astraeus/css/properties/Box.kt
+++ b/src/commonMain/kotlin/nl/astraeus/css/properties/Box.kt
@@ -2,7 +2,7 @@ package nl.astraeus.css.properties

 class BoxDecorationBreak(
  value: String
-): CssProperty(value) {
+) : CssProperty(value) {

  companion object {
    val slice = BoxDecorationBreak("slice")
@@ -15,7 +15,7 @@ class BoxDecorationBreak(

 class BoxShadow(
  value: String
-): CssProperty(value) {
+) : CssProperty(value) {

  companion object {
    val none = BoxShadow("none")
@@ -29,7 +29,7 @@ class BoxShadow(

 class BoxSizing(
  value: String
-): CssProperty(value) {
+) : CssProperty(value) {

  companion object {
    val contextBox = BoxSizing("content-box")
--- a/src/commonMain/kotlin/nl/astraeus/css/properties/Break.kt
+++ b/src/commonMain/kotlin/nl/astraeus/css/properties/Break.kt
@@ -3,7 +3,7 @@ package nl.astraeus.css.properties

 class Break(
  value: String
-): CssProperty(value) {
+) : CssProperty(value) {

  companion object {
    val auto = Break("auto")
--- a/src/commonMain/kotlin/nl/astraeus/css/properties/Caption.kt
+++ b/src/commonMain/kotlin/nl/astraeus/css/properties/Caption.kt
@@ -2,7 +2,7 @@ package nl.astraeus.css.properties

 class CaptionSide(
  value: String
-): CssProperty(value) {
+) : CssProperty(value) {

  companion object {
    val top = CaptionSide("top")
--- a/src/commonMain/kotlin/nl/astraeus/css/properties/Clear.kt
+++ b/src/commonMain/kotlin/nl/astraeus/css/properties/Clear.kt
@@ -3,7 +3,7 @@ package nl.astraeus.css.properties

 class Clear(
  value: String
-): CssProperty(value) {
+) : CssProperty(value) {

  companion object {
    val none = Clear("none")
--- a/src/commonMain/kotlin/nl/astraeus/css/properties/Common.kt
+++ b/src/commonMain/kotlin/nl/astraeus/css/properties/Common.kt
@@ -2,7 +2,7 @@ package nl.astraeus.css.properties

 class Length(
  value: String
-): CssProperty(value) {
+) : CssProperty(value) {

  companion object {
    fun px(nr: Int) = Length("${nr}px")
--- a/src/commonMain/kotlin/nl/astraeus/css/properties/CssProperty.kt
+++ b/src/commonMain/kotlin/nl/astraeus/css/properties/CssProperty.kt
@@ -6,7 +6,7 @@ interface CssValue {

 open class CssProperty(
  var value: String
-): CssValue {
+) : CssValue {

  override fun css(): String = value

@@ -16,4 +16,4 @@ fun text(value: String) = TextProperty(value)

 class TextProperty(
  value: String
-): CssProperty(value)
+) : CssProperty(value)
--- a/src/commonMain/kotlin/nl/astraeus/css/properties/Measurement.kt
+++ b/src/commonMain/kotlin/nl/astraeus/css/properties/Measurement.kt
@@ -10,7 +10,12 @@ open class Measurement(
    val inherit = Measurement("inherit")
    val normal = Measurement("normal")

-        fun px(nr: Int) = if (nr == 0) { Measurement("0") } else { Measurement("${nr}px") }
+    fun px(nr: Int) = if (nr == 0) {
+      Measurement("0")
+    } else {
+      Measurement("${nr}px")
+    }
+
    fun px(nr: Double) = nr.px
    fun em(nr: Int) = nr.em
    fun em(nr: Double) = nr.em
@@ -24,17 +29,42 @@ open class Measurement(
 }

 val Int.px: Measurement
-    get() = Measurement("${this}${if (this == 0) { "" } else { "px"}}")
+  get() = Measurement(
+    "${this}${
+      if (this == 0) {
+        ""
+      } else {
+        "px"
+      }
+    }"
+  )
 val Int.em: Measurement
-    get() = Measurement("${this}${if (this == 0) { "" } else { "em"}}")
+  get() = Measurement(
+    "${this}${
+      if (this == 0) {
+        ""
+      } else {
+        "em"
+      }
+    }"
+  )
 val Int.rem: Measurement
-    get() = Measurement("${this}${if (this == 0) { "" } else { "rem"}}")
+  get() = Measurement(
+    "${this}${
+      if (this == 0) {
+        ""
+      } else {
+        "rem"
+      }
+    }"
+  )
 val Int.prc: Measurement
  get() = Measurement("${this}%")
 val Int.pc: Measurement
  get() = Measurement("${this}pc")
 val Int.cm: Measurement
  get() = Measurement("${this}cm")
+
 fun Int.px(): Measurement = Measurement.px(this)

 val Double.px: Measurement
@@ -49,6 +79,7 @@ val Double.pc: Measurement
  get() = Measurement("${this}pc")
 val Double.cm: Measurement
  get() = Measurement("${this}cm")
+
 fun Double.px(): Measurement = Measurement.px(this)

 open class LineHeight(value: String) : CssProperty(value) {
--- a/src/commonMain/kotlin/nl/astraeus/css/properties/TimingFunction.kt
+++ b/src/commonMain/kotlin/nl/astraeus/css/properties/TimingFunction.kt
@@ -15,7 +15,16 @@ class TimingFunction(
    val initial = TimingFunction("initial")
    val inherit = TimingFunction("inherit")

-        fun steps(steps: Int, start: Boolean) = TimingFunction("steps($steps, ${if (start) { "start" } else { "end" }}")
+    fun steps(steps: Int, start: Boolean) = TimingFunction(
+      "steps($steps, ${
+        if (start) {
+          "start"
+        } else {
+          "end"
+        }
+      }"
+    )
+
    fun cubicBezier(n1: Double, n2: Double, n3: Double, n4: Double) = TimingFunction("cubic-bezier($n1, $n2, $n3, $n4)")
  }

--- a/src/commonMain/kotlin/nl/astraeus/css/properties/Transform.kt
+++ b/src/commonMain/kotlin/nl/astraeus/css/properties/Transform.kt
@@ -17,6 +17,7 @@ class Transform(
      n5: Double,
      n6: Double
    ) = Transform("matrix($n1, $n2, $n3, $n4, $n5, $n6)")
+
    fun matrix3d(
      n01: Double, n02: Double, n03: Double, n04: Double,
      n05: Double, n06: Double, n07: Double, n08: Double,
@@ -25,6 +26,7 @@ class Transform(
    ) = Transform(
      "matrix3d($n01, $n02, $n03, $n04, $n05, $n06, $n07, $n08, $n09, $n10, $n11, $n12, $n13, $n14, $n15, $n16)"
    )
+
    fun translate(x: Double, y: Double) = Transform("translate($x, $y)")
    fun translate3d(x: Double, y: Double, z: Double) = Transform("translate3d($x, $y, $z)")
    fun translateX(x: Double) = Transform("translateX($x)")
--- a/src/commonMain/kotlin/nl/astraeus/css/style/FontFace.kt
+++ b/src/commonMain/kotlin/nl/astraeus/css/style/FontFace.kt
@@ -1,6 +1,10 @@
 package nl.astraeus.css.style

-import nl.astraeus.css.properties.*
+import nl.astraeus.css.properties.CssProperty
+import nl.astraeus.css.properties.FontSize
+import nl.astraeus.css.properties.FontStretch
+import nl.astraeus.css.properties.FontStyle
+import nl.astraeus.css.properties.FontWeight

@CssTagMarker
 open class FontFace : CssGenerator() {
--- a/src/commonMain/kotlin/nl/astraeus/css/style/Style.kt
+++ b/src/commonMain/kotlin/nl/astraeus/css/style/Style.kt
--- a/src/commonMain/kotlin/nl/astraeus/css/style/Validator.kt
+++ b/src/commonMain/kotlin/nl/astraeus/css/style/Validator.kt
@@ -12,7 +12,7 @@ abstract class Validator {

 class MaxCountValidator(
  val number: Int
-): Validator() {
+) : Validator() {

  override fun validate(property: List<CssProperty>): Boolean = property.size <= number

@@ -20,7 +20,7 @@ class MaxCountValidator(

 }

-class InitialInheritSingleValue: Validator() {
+class InitialInheritSingleValue : Validator() {

  override fun validate(properties: List<CssProperty>): Boolean {
    for (prop in properties) {
--- a/src/jsMain/kotlin/nl/astraeus/css/Test.kt
+++ b/src/jsMain/kotlin/nl/astraeus/css/Test.kt
@@ -1,6 +1,10 @@
 package nl.astraeus.css

-import nl.astraeus.css.properties.*
+import nl.astraeus.css.properties.AlignContent
+import nl.astraeus.css.properties.DelayDuration
+import nl.astraeus.css.properties.TimingFunction
+import nl.astraeus.css.properties.hex
+
 fun main() {
  val sd = style {
    select("#pipo") {