From e9df08aa303477d0202ceb79147c82c9bda9a7a3 Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Sat, 22 Jun 2019 11:17:56 -0400
Subject: [PATCH] Move View class to view package

---
 src/main/kotlin/net/shadowfacts/asmr/TestScreen.kt          | 2 +-
 src/main/kotlin/net/shadowfacts/shadowui/LayoutVariable.kt  | 1 +
 src/main/kotlin/net/shadowfacts/shadowui/Window.kt          | 1 +
 src/main/kotlin/net/shadowfacts/shadowui/view/Label.kt      | 1 -
 src/main/kotlin/net/shadowfacts/shadowui/{ => view}/View.kt | 3 ++-
 src/test/kotlin/net/shadowfacts/shadowui/WindowTests.kt     | 1 +
 6 files changed, 6 insertions(+), 3 deletions(-)
 rename src/main/kotlin/net/shadowfacts/shadowui/{ => view}/View.kt (97%)

diff --git a/src/main/kotlin/net/shadowfacts/asmr/TestScreen.kt b/src/main/kotlin/net/shadowfacts/asmr/TestScreen.kt
index 5d36f6d..1ffb9d6 100644
--- a/src/main/kotlin/net/shadowfacts/asmr/TestScreen.kt
+++ b/src/main/kotlin/net/shadowfacts/asmr/TestScreen.kt
@@ -2,7 +2,7 @@ package net.shadowfacts.asmr
 
 import net.shadowfacts.kiwidsl.dsl
 import net.shadowfacts.shadowui.Screen
-import net.shadowfacts.shadowui.View
+import net.shadowfacts.shadowui.view.View
 import net.shadowfacts.shadowui.Window
 import net.shadowfacts.shadowui.geometry.Size
 import net.shadowfacts.shadowui.util.Color
diff --git a/src/main/kotlin/net/shadowfacts/shadowui/LayoutVariable.kt b/src/main/kotlin/net/shadowfacts/shadowui/LayoutVariable.kt
index 5b024f9..1f724d7 100644
--- a/src/main/kotlin/net/shadowfacts/shadowui/LayoutVariable.kt
+++ b/src/main/kotlin/net/shadowfacts/shadowui/LayoutVariable.kt
@@ -1,5 +1,6 @@
 package net.shadowfacts.shadowui
 
+import net.shadowfacts.shadowui.view.View
 import no.birkett.kiwi.Variable
 
 /**
diff --git a/src/main/kotlin/net/shadowfacts/shadowui/Window.kt b/src/main/kotlin/net/shadowfacts/shadowui/Window.kt
index fdd10e0..1b0db95 100644
--- a/src/main/kotlin/net/shadowfacts/shadowui/Window.kt
+++ b/src/main/kotlin/net/shadowfacts/shadowui/Window.kt
@@ -1,6 +1,7 @@
 package net.shadowfacts.shadowui
 
 import net.shadowfacts.shadowui.geometry.Point
+import net.shadowfacts.shadowui.view.View
 import no.birkett.kiwi.Solver
 
 /**
diff --git a/src/main/kotlin/net/shadowfacts/shadowui/view/Label.kt b/src/main/kotlin/net/shadowfacts/shadowui/view/Label.kt
index 9e58aa0..6c48277 100644
--- a/src/main/kotlin/net/shadowfacts/shadowui/view/Label.kt
+++ b/src/main/kotlin/net/shadowfacts/shadowui/view/Label.kt
@@ -2,7 +2,6 @@ package net.shadowfacts.shadowui.view
 
 import net.minecraft.client.MinecraftClient
 import net.minecraft.client.font.TextRenderer
-import net.shadowfacts.shadowui.View
 import net.shadowfacts.shadowui.geometry.Size
 import net.shadowfacts.shadowui.util.Color
 
diff --git a/src/main/kotlin/net/shadowfacts/shadowui/View.kt b/src/main/kotlin/net/shadowfacts/shadowui/view/View.kt
similarity index 97%
rename from src/main/kotlin/net/shadowfacts/shadowui/View.kt
rename to src/main/kotlin/net/shadowfacts/shadowui/view/View.kt
index 03c8254..6412142 100644
--- a/src/main/kotlin/net/shadowfacts/shadowui/View.kt
+++ b/src/main/kotlin/net/shadowfacts/shadowui/view/View.kt
@@ -1,7 +1,8 @@
-package net.shadowfacts.shadowui
+package net.shadowfacts.shadowui.view
 
 import com.mojang.blaze3d.platform.GlStateManager
 import net.shadowfacts.kiwidsl.dsl
+import net.shadowfacts.shadowui.LayoutVariable
 import net.shadowfacts.shadowui.geometry.Rect
 import net.shadowfacts.shadowui.geometry.Size
 import net.shadowfacts.shadowui.util.Color
diff --git a/src/test/kotlin/net/shadowfacts/shadowui/WindowTests.kt b/src/test/kotlin/net/shadowfacts/shadowui/WindowTests.kt
index 34e7b55..5643029 100644
--- a/src/test/kotlin/net/shadowfacts/shadowui/WindowTests.kt
+++ b/src/test/kotlin/net/shadowfacts/shadowui/WindowTests.kt
@@ -2,6 +2,7 @@ package net.shadowfacts.shadowui
 
 import net.shadowfacts.kiwidsl.dsl
 import net.shadowfacts.shadowui.geometry.Size
+import net.shadowfacts.shadowui.view.View
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test