From f9e432b0f959beea7fff8544e5aabc65c76ea574 Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Sat, 30 Apr 2022 18:57:04 -0400
Subject: [PATCH] Move screen classes into their own package

---
 core/src/com/redstrate/watersymbol/WaterSymbol.java       | 8 +++-----
 .../redstrate/watersymbol/{ => screens}/GameScreen.java   | 3 ++-
 .../watersymbol/{ => screens}/MainMenuScreen.java         | 5 +++--
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename core/src/com/redstrate/watersymbol/{ => screens}/GameScreen.java (93%)
 rename core/src/com/redstrate/watersymbol/{ => screens}/MainMenuScreen.java (91%)

diff --git a/core/src/com/redstrate/watersymbol/WaterSymbol.java b/core/src/com/redstrate/watersymbol/WaterSymbol.java
index d0a313b..04f26eb 100644
--- a/core/src/com/redstrate/watersymbol/WaterSymbol.java
+++ b/core/src/com/redstrate/watersymbol/WaterSymbol.java
@@ -1,15 +1,13 @@
 package com.redstrate.watersymbol;
 
-import com.badlogic.gdx.ApplicationAdapter;
 import com.badlogic.gdx.Game;
-import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-import com.badlogic.gdx.utils.ScreenUtils;
+import com.redstrate.watersymbol.screens.MainMenuScreen;
 
 public class WaterSymbol extends Game {
-	SpriteBatch batch;
-	BitmapFont font;
+	public SpriteBatch batch;
+	public BitmapFont font;
 	@Override
 	public void create () {
 		batch = new SpriteBatch();
diff --git a/core/src/com/redstrate/watersymbol/GameScreen.java b/core/src/com/redstrate/watersymbol/screens/GameScreen.java
similarity index 93%
rename from core/src/com/redstrate/watersymbol/GameScreen.java
rename to core/src/com/redstrate/watersymbol/screens/GameScreen.java
index b1c993f..6da3887 100644
--- a/core/src/com/redstrate/watersymbol/GameScreen.java
+++ b/core/src/com/redstrate/watersymbol/screens/GameScreen.java
@@ -1,4 +1,4 @@
-package com.redstrate.watersymbol;
+package com.redstrate.watersymbol.screens;
 
 import com.badlogic.gdx.Screen;
 import com.badlogic.gdx.graphics.OrthographicCamera;
@@ -7,6 +7,7 @@ import com.badlogic.gdx.maps.tiled.TiledMapRenderer;
 import com.badlogic.gdx.maps.tiled.TmxMapLoader;
 import com.badlogic.gdx.maps.tiled.renderers.OrthogonalTiledMapRenderer;
 import com.badlogic.gdx.utils.ScreenUtils;
+import com.redstrate.watersymbol.WaterSymbol;
 
 public class GameScreen implements Screen {
     private final WaterSymbol game;
diff --git a/core/src/com/redstrate/watersymbol/MainMenuScreen.java b/core/src/com/redstrate/watersymbol/screens/MainMenuScreen.java
similarity index 91%
rename from core/src/com/redstrate/watersymbol/MainMenuScreen.java
rename to core/src/com/redstrate/watersymbol/screens/MainMenuScreen.java
index 30104ee..5cda75b 100644
--- a/core/src/com/redstrate/watersymbol/MainMenuScreen.java
+++ b/core/src/com/redstrate/watersymbol/screens/MainMenuScreen.java
@@ -1,4 +1,4 @@
-package com.redstrate.watersymbol;
+package com.redstrate.watersymbol.screens;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input;
@@ -6,13 +6,14 @@ import com.badlogic.gdx.Screen;
 import com.badlogic.gdx.graphics.OrthographicCamera;
 import com.badlogic.gdx.graphics.g2d.GlyphLayout;
 import com.badlogic.gdx.utils.ScreenUtils;
+import com.redstrate.watersymbol.WaterSymbol;
 
 public class MainMenuScreen implements Screen {
     OrthographicCamera camera;
 
     GlyphLayout titleLayout;
 
-    MainMenuScreen(WaterSymbol game) {
+    public MainMenuScreen(WaterSymbol game) {
         this.game = game;
 
         camera = new OrthographicCamera();