From b4f84816cef98c2aced546a73f261e1ba174576d Mon Sep 17 00:00:00 2001 From: Recrown Date: Sun, 4 Feb 2018 23:00:31 -0600 Subject: [PATCH] minor cleaning --- .../src/zero1hd/rhythmbullet}/ui/components/ScrollText.java | 2 +- .../zero1hd/rhythmbullet}/ui/components/ShortenedTextLabel.java | 2 +- .../desktop/graphics/ui/components/MusicSelectable.java | 1 + .../rhythmbullet/desktop/graphics/ui/pages/MainPage.java | 2 +- .../desktop/graphics/ui/pages/MusicSelectionPage.java | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) rename {desktop/src/zero1hd/rhythmbullet/desktop/graphics => core/src/zero1hd/rhythmbullet}/ui/components/ScrollText.java (95%) rename {desktop/src/zero1hd/rhythmbullet/desktop/graphics => core/src/zero1hd/rhythmbullet}/ui/components/ShortenedTextLabel.java (92%) diff --git a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/ScrollText.java b/core/src/zero1hd/rhythmbullet/ui/components/ScrollText.java similarity index 95% rename from desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/ScrollText.java rename to core/src/zero1hd/rhythmbullet/ui/components/ScrollText.java index 541f528..5b847c1 100755 --- a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/ScrollText.java +++ b/core/src/zero1hd/rhythmbullet/ui/components/ScrollText.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.desktop.graphics.ui.components; +package zero1hd.rhythmbullet.ui.components; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g2d.Batch; diff --git a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/ShortenedTextLabel.java b/core/src/zero1hd/rhythmbullet/ui/components/ShortenedTextLabel.java similarity index 92% rename from desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/ShortenedTextLabel.java rename to core/src/zero1hd/rhythmbullet/ui/components/ShortenedTextLabel.java index 0772ae9..4cf3c14 100755 --- a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/ShortenedTextLabel.java +++ b/core/src/zero1hd/rhythmbullet/ui/components/ShortenedTextLabel.java @@ -1,4 +1,4 @@ -package zero1hd.rhythmbullet.desktop.graphics.ui.components; +package zero1hd.rhythmbullet.ui.components; import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.g2d.BitmapFont; diff --git a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/MusicSelectable.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/MusicSelectable.java index c113e71..f9ef3cd 100755 --- a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/MusicSelectable.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/components/MusicSelectable.java @@ -11,6 +11,7 @@ import com.badlogic.gdx.utils.Disposable; import zero1hd.rhythmbullet.audio.MusicInfo; import zero1hd.rhythmbullet.desktop.graphics.ui.pages.MusicSelectionPage; +import zero1hd.rhythmbullet.ui.components.ShortenedTextLabel; public class MusicSelectable extends WidgetGroup implements Disposable { private Table table; diff --git a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MainPage.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MainPage.java index 47a8ae2..5e0588a 100755 --- a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MainPage.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MainPage.java @@ -17,9 +17,9 @@ import zero1hd.rhythmbullet.RhythmBullet; import zero1hd.rhythmbullet.audio.MusicManager; import zero1hd.rhythmbullet.desktop.audio.MusicListController; import zero1hd.rhythmbullet.desktop.graphics.ui.components.MusicControls; -import zero1hd.rhythmbullet.desktop.graphics.ui.components.ScrollText; import zero1hd.rhythmbullet.desktop.graphics.ui.components.TitleBarVisualizer; import zero1hd.rhythmbullet.desktop.screens.MainMenuScreen; +import zero1hd.rhythmbullet.ui.components.ScrollText; public class MainPage extends Page implements Observer { private Label versionLabel; diff --git a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MusicSelectionPage.java b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MusicSelectionPage.java index 710f096..ff4a7bc 100755 --- a/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MusicSelectionPage.java +++ b/desktop/src/zero1hd/rhythmbullet/desktop/graphics/ui/pages/MusicSelectionPage.java @@ -30,7 +30,7 @@ import zero1hd.rhythmbullet.audio.MusicManager; import zero1hd.rhythmbullet.desktop.audio.MusicInfoController; import zero1hd.rhythmbullet.desktop.audio.MusicListController; import zero1hd.rhythmbullet.desktop.graphics.ui.components.MusicSelectable; -import zero1hd.rhythmbullet.desktop.graphics.ui.components.ScrollText; +import zero1hd.rhythmbullet.ui.components.ScrollText; public class MusicSelectionPage extends Page implements Observer { Preferences musicFileAnnotation;