fix: merge conflict with Notification.kt

Author: quiteboring

src/main/kotlin/org/cobalt/ui/notification/Notification.kt

@@ -4,9 +4,9 @@ import kotlin.time.Duration
 import org.cobalt.ui.UIComponent
 import org.cobalt.ui.animation.BounceAnimation
 import org.cobalt.ui.animation.EaseOutAnimation
-import org.cobalt.util.WindowUtils.windowWidth
-import org.cobalt.util.skia.Skia
-import org.cobalt.util.skia.helper.SkiaCorner
+import org.cobalt.util.client.WindowUtils.windowWidth
+import org.cobalt.util.render.SkiaRenderer
+import org.cobalt.util.render.skia.data.SkiaCorner
 
 class Notification(
   private val title: String,
@@ -60,7 +60,7 @@ class Notification(
     val resolvedY = targetY + slideDownAnim.get(previousY - targetY, 0f, false)
     updateBounds(resolvedX, resolvedY)
 
-    Skia.roundedRect(
+    SkiaRenderer.roundedRect(
       xPos, yPos, width, height,
       CORNER_RADIUS, theme.backgroundPrimary
     )
@@ -74,17 +74,17 @@ class Notification(
     val hasDescription = description.isNotBlank()
     val titleFontSize = if (hasDescription) TITLE_FONT_SIZE else TITLE_FONT_SIZE_ALONE
 
-    val titleHeight = Skia.wrappedTextHeight(Skia.boldFont, title, contentWidth, titleFontSize)
+    val titleHeight = SkiaRenderer.wrappedTextHeight(SkiaRenderer.boldFont, title, contentWidth, titleFontSize)
 
-    Skia.wrappedText(
-      Skia.boldFont, title,
+    SkiaRenderer.wrappedText(
+      SkiaRenderer.boldFont, title,
       xPos + CONTENT_PADDING, yPos + CONTENT_PADDING,
       contentWidth, titleFontSize, theme.textPrimary,
     )
 
     if (hasDescription) {
-      Skia.wrappedText(
-        Skia.boldFont, description,
+      SkiaRenderer.wrappedText(
+        SkiaRenderer.boldFont, description,
         xPos + CONTENT_PADDING, yPos + CONTENT_PADDING + titleHeight + TITLE_DESCRIPTION_GAP,
         contentWidth, DESCRIPTION_FONT_SIZE, theme.textSecondary,
       )
@@ -95,7 +95,7 @@ class Notification(
     val progress = calculateProgress(System.currentTimeMillis())
     val fillWidth = width * progress
 
-    Skia.roundedRect(
+    SkiaRenderer.roundedRect(
       xPos, yPos + height - PROGRESS_BAR_HEIGHT,
       width, PROGRESS_BAR_HEIGHT,
       CORNER_RADIUS,
@@ -104,7 +104,7 @@ class Notification(
     )
 
     if (fillWidth > 0f) {
-      Skia.roundedRect(
+      SkiaRenderer.roundedRect(
         xPos, yPos + height - PROGRESS_BAR_HEIGHT,
         fillWidth, PROGRESS_BAR_HEIGHT,
         CORNER_RADIUS,
@@ -146,17 +146,17 @@ class Notification(
     private fun calculateHeight(title: String, description: String): Float {
       val titleFontSize = if (description.isNotBlank()) TITLE_FONT_SIZE else TITLE_FONT_SIZE_ALONE
 
-      val titleHeight = Skia.wrappedTextHeight(
-        Skia.boldFont, title,
+      val titleHeight = SkiaRenderer.wrappedTextHeight(
+        SkiaRenderer.boldFont, title,
         DEFAULT_WIDTH - CONTENT_PADDING * 2,
         titleFontSize
       )
 
       var descHeight = 0f
 
       if (description.isNotBlank()) {
-        descHeight = Skia.wrappedTextHeight(
-          Skia.boldFont, description,
+        descHeight = SkiaRenderer.wrappedTextHeight(
+          SkiaRenderer.boldFont, description,
           DEFAULT_WIDTH - CONTENT_PADDING * 2,
           DESCRIPTION_FONT_SIZE
         )