Convert modules to objects

Author: JD557

core/src/main/scala/eu/joaocosta/interim/InterIm.scala

@@ -2,7 +2,7 @@ package eu.joaocosta.interim
 
 import eu.joaocosta.interim.TextLayout.*
 
-object InterIm extends api.Primitives with api.Layouts with api.Components with api.Constants:
+object InterIm:
   def window[T](inputState: InputState, uiState: UiState)(
       run: (inputState: InputState, uiState: UiState) ?=> T
   ): (List[RenderOp], T) =
@@ -17,3 +17,8 @@ object InterIm extends api.Primitives with api.Layouts with api.Components with
     if (!inputState.mouseDown) uiState.activeItem = None
     // return
     (uiState.ops.toList, res)
+
+  export api.Primitives.*
+  export api.Layouts.*
+  export api.Components.*
+  export api.Constants.*

core/src/main/scala/eu/joaocosta/interim/api/Components.scala

@@ -3,7 +3,7 @@ package eu.joaocosta.interim.api
 import eu.joaocosta.interim.*
 import eu.joaocosta.interim.skins.*
 
-trait Components:
+object Components:
 
   type Component[+T] = (inputState: InputState, uiState: UiState) ?=> T
 

core/src/main/scala/eu/joaocosta/interim/api/Constants.scala

@@ -2,7 +2,7 @@ package eu.joaocosta.interim.api
 
 import eu.joaocosta.interim.TextLayout.{HorizontalAlignment, VerticalAlignment}
 
-trait Constants:
+object Constants:
   final val alignLeft          = HorizontalAlignment.Left
   final val centerHorizontally = HorizontalAlignment.Center
   final val alignRight         = HorizontalAlignment.Right

core/src/main/scala/eu/joaocosta/interim/api/Layouts.scala

@@ -2,7 +2,7 @@ package eu.joaocosta.interim.api
 
 import eu.joaocosta.interim.Rect
 
-trait Layouts:
+object Layouts:
   def grid[T](area: Rect, numRows: Int, numColumns: Int, padding: Int)(body: Vector[Vector[Rect]] => T): T =
     body(rows(area, numRows, padding)(_.map(subArea => columns(subArea, numColumns, padding)(identity))))
 

core/src/main/scala/eu/joaocosta/interim/api/Primitives.scala

@@ -3,7 +3,7 @@ package eu.joaocosta.interim.api
 import eu.joaocosta.interim.TextLayout.{HorizontalAlignment, VerticalAlignment}
 import eu.joaocosta.interim.{Color, Rect, RenderOp, UiState}
 
-trait Primitives:
+object Primitives:
   def rectangle(area: Rect, color: Color)(implicit uiState: UiState): Unit =
     uiState.ops.addOne(RenderOp.DrawRect(area, color))
 

core/src/main/scala/eu/joaocosta/interim/skins/ButtonSkin.scala

@@ -2,6 +2,7 @@ package eu.joaocosta.interim.skins
 
 import eu.joaocosta.interim.TextLayout.*
 import eu.joaocosta.interim.*
+import eu.joaocosta.interim.api.Primitives.*
 
 trait ButtonSkin:
   def buttonArea(area: Rect): Rect
@@ -25,21 +26,21 @@ object ButtonSkin:
         uiState: UiState
     ): Unit =
       val buttonArea = this.buttonArea(area)
-      InterIm.rectangle(
+      rectangle(
         buttonArea.move(dx = shadowDelta, dy = shadowDelta),
         shadowColor
       ) // Shadow
       itemStatus match
         case UiState.ItemStatus(false, false) =>
-          InterIm.rectangle(buttonArea, inactiveColor)
-          InterIm.text(buttonArea, label, fontSize, textColor, HorizontalAlignment.Center, VerticalAlignment.Center)
+          rectangle(buttonArea, inactiveColor)
+          text(buttonArea, label, fontSize, textColor, HorizontalAlignment.Center, VerticalAlignment.Center)
         case UiState.ItemStatus(true, false) =>
-          InterIm.rectangle(buttonArea, hotColor)
-          InterIm.text(buttonArea, label, fontSize, textColor, HorizontalAlignment.Center, VerticalAlignment.Center)
+          rectangle(buttonArea, hotColor)
+          text(buttonArea, label, fontSize, textColor, HorizontalAlignment.Center, VerticalAlignment.Center)
         case UiState.ItemStatus(false, true) =>
-          InterIm.rectangle(buttonArea, activeColor)
-          InterIm.text(buttonArea, label, fontSize, textColor, HorizontalAlignment.Center, VerticalAlignment.Center)
+          rectangle(buttonArea, activeColor)
+          text(buttonArea, label, fontSize, textColor, HorizontalAlignment.Center, VerticalAlignment.Center)
         case UiState.ItemStatus(true, true) =>
           val clickedArea = buttonArea.move(dx = clickDelta, dy = clickDelta)
-          InterIm.rectangle(clickedArea, activeColor)
-          InterIm.text(clickedArea, label, fontSize, textColor, HorizontalAlignment.Center, VerticalAlignment.Center)
+          rectangle(clickedArea, activeColor)
+          text(clickedArea, label, fontSize, textColor, HorizontalAlignment.Center, VerticalAlignment.Center)

core/src/main/scala/eu/joaocosta/interim/skins/CheckboxSkin.scala

@@ -1,6 +1,7 @@
 package eu.joaocosta.interim.skins
 
 import eu.joaocosta.interim.*
+import eu.joaocosta.interim.api.Primitives.*
 
 trait CheckboxSkin:
   def checkboxArea(area: Rect): Rect
@@ -21,13 +22,13 @@ object CheckboxSkin:
       val checkboxArea = this.checkboxArea(area)
       itemStatus match
         case UiState.ItemStatus(false, false) =>
-          InterIm.rectangle(checkboxArea, inactiveColor)
+          rectangle(checkboxArea, inactiveColor)
         case UiState.ItemStatus(true, false) =>
-          InterIm.rectangle(checkboxArea, hotColor)
+          rectangle(checkboxArea, hotColor)
         case UiState.ItemStatus(_, true) =>
-          InterIm.rectangle(checkboxArea, activeColor)
+          rectangle(checkboxArea, activeColor)
       if (value)
-        InterIm.rectangle(
+        rectangle(
           checkboxArea.shrink(padding),
           checkColor
         )

core/src/main/scala/eu/joaocosta/interim/skins/SliderSkin.scala

@@ -1,6 +1,7 @@
 package eu.joaocosta.interim.skins
 
 import eu.joaocosta.interim.*
+import eu.joaocosta.interim.api.Primitives.*
 
 trait SliderSkin:
   def sliderSize: Int
@@ -33,11 +34,11 @@ object SliderSkin:
           val sliderFill = area.w - 2 * padding
           val pos        = (value - min) * (sliderArea.h - sliderSize) / (max - min)
           Rect(area.x + padding, area.y + padding + pos, sliderFill, sliderSize)
-      InterIm.rectangle(area, scrollbarColor) // Scrollbar
+      rectangle(area, scrollbarColor) // Scrollbar
       itemStatus match
         case UiState.ItemStatus(false, false) =>
-          InterIm.rectangle(sliderRect, inactiveColor)
+          rectangle(sliderRect, inactiveColor)
         case UiState.ItemStatus(true, false) =>
-          InterIm.rectangle(sliderRect, hotColor)
+          rectangle(sliderRect, hotColor)
         case _ =>
-          InterIm.rectangle(sliderRect, activeColor)
+          rectangle(sliderRect, activeColor)