From 27606f3c8fa09c1f87c381c874c94c7c1c263cb5 Mon Sep 17 00:00:00 2001 From: Recrown Date: Fri, 24 Nov 2017 13:44:00 -0600 Subject: [PATCH] aesthetic changes --- android/assets/uiskin.png | Bin 12105 -> 11446 bytes .../zero1hd/rhythmbullet/RhythmBullet.java | 2 +- .../audio/visualizer/BasicVisualizer.java | 2 +- .../ui/components/MusicSelectable.java | 5 +-- .../graphics/ui/pages/MusicSelectionPage.java | 33 +++--------------- 5 files changed, 9 insertions(+), 33 deletions(-) diff --git a/android/assets/uiskin.png b/android/assets/uiskin.png index 7dc20784483f412abe9f2c521c9acfa83e44072b..5a6711b0142a7c39872c4503c950cf5efa608e7f 100755 GIT binary patch literal 11446 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 literal 12105 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 O2WraNN;wLa{{ID^kRyfw diff --git a/core/src/zero1hd/rhythmbullet/RhythmBullet.java b/core/src/zero1hd/rhythmbullet/RhythmBullet.java index e737322..6d36991 100755 --- a/core/src/zero1hd/rhythmbullet/RhythmBullet.java +++ b/core/src/zero1hd/rhythmbullet/RhythmBullet.java @@ -212,7 +212,7 @@ public class RhythmBullet extends Game { })); getDefaultSkin().add("sub-font", default_fontGenerator.generateFont(new FreeTypeFontParameter() { { - size = fontScale(0.04f, height); + size = fontScale(0.05f, height); } })); getDefaultSkin().add("default-font", default_fontGenerator.generateFont(new FreeTypeFontParameter() { diff --git a/core/src/zero1hd/rhythmbullet/audio/visualizer/BasicVisualizer.java b/core/src/zero1hd/rhythmbullet/audio/visualizer/BasicVisualizer.java index 46c5d52..bd7bd1c 100755 --- a/core/src/zero1hd/rhythmbullet/audio/visualizer/BasicVisualizer.java +++ b/core/src/zero1hd/rhythmbullet/audio/visualizer/BasicVisualizer.java @@ -38,7 +38,7 @@ public class BasicVisualizer extends VisualizerCore { pixmap = new Pixmap(2, 2, Format.RGBA8888); pixmap.setColor(Color.WHITE); pixmap.fill(); - barCount = 50; + barCount = 75; smoothRange = 2; angleRot = new Vector2(MathUtils.cosDeg(rotation), MathUtils.sinDeg(rotation)); textures = new Texture[barCount]; diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/components/MusicSelectable.java b/core/src/zero1hd/rhythmbullet/graphics/ui/components/MusicSelectable.java index d1f59bb..35f355e 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/components/MusicSelectable.java +++ b/core/src/zero1hd/rhythmbullet/graphics/ui/components/MusicSelectable.java @@ -36,13 +36,14 @@ public class MusicSelectable extends WidgetGroup implements Disposable { private VerticalGroup vGroup; private MusicSelectionPage msp; + public MusicSelectable(FileHandle musicFile, Preferences musicAnnotation, Skin skin, Texture defaultAlbumC, MusicSelectionPage msp) { table = new Table(skin); table.setBackground("holo-pane"); vGroup = new VerticalGroup(); this.msp = msp; setName(musicFile.name()); - table.defaults().pad(10f); + table.defaults().pad(2f); this.albumCover = defaultAlbumC; this.musicFile = musicFile; @@ -63,7 +64,7 @@ public class MusicSelectable extends WidgetGroup implements Disposable { table.add(vGroup).expandX().fillX().center(); addActor(table); - + table.pack(); addListener(new ClickListener() { @Override public void clicked(InputEvent event, float x, float y) { diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MusicSelectionPage.java b/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MusicSelectionPage.java index fa505a5..db97575 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MusicSelectionPage.java +++ b/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MusicSelectionPage.java @@ -10,8 +10,6 @@ import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.Preferences; import com.badlogic.gdx.assets.AssetManager; import com.badlogic.gdx.files.FileHandle; -import com.badlogic.gdx.graphics.Pixmap; -import com.badlogic.gdx.graphics.Pixmap.Format; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.TextureAtlas; import com.badlogic.gdx.math.Vector3; @@ -57,19 +55,14 @@ public class MusicSelectionPage extends Page implements Observer { private Skin skin; private AssetManager assets; - private Image vertSplitBar; - private Image horSplitBar; - private Texture white; - private boolean down, up; private int musicSelectableIndex; private float scrollTimer, scrollDelay = 0.2f, scrollDelMod, songSelectionTimer; public MusicSelectionPage(Skin skin, MusicListController musicList, AssetManager assetManager, Vector3 cameraTarget) { - super("Select music", skin); songInfoTable = new Table(); - songTitle = new ScrollText("", null, skin, false, false); - author = new Label("", skin, "sub-font", skin.getColor("default")); + songTitle = new ScrollText("", null, skin, true, false); + author = new Label(null, skin, "sub-font", skin.getColor("default")); songLength = new Label(null, skin, "sub-font", skin.getColor("default")); previousTop = new Label(null, skin, "sub-font", skin.getColor("default")); albumCover = new Image(assetManager.get("defaultCover.png", Texture.class)); @@ -80,16 +73,15 @@ public class MusicSelectionPage extends Page implements Observer { musicFileAnnotation = Gdx.app.getPreferences("music_file_annotation"); this.assets = assetManager; musicTable = new Table(); - musicTable.defaults().spaceBottom(10f); scrollbar = new ScrollPane(musicTable, skin); - scrollbar.setSize(0.45f*getWidth(), getHeightBelowTitle()); + scrollbar.setSize(0.45f*getWidth(), getHeight()); scrollbar.setFadeScrollBars(false); scrollbar.setOverscroll(false, false); addActor(scrollbar); selectables = new Array<>(); back = new TextButton("Back", skin); back.setWidth(back.getWidth()+20f); - back.setPosition(getWidth()-back.getWidth()-15f, getHeightBelowTitle()); + back.setPosition(getWidth()-back.getWidth()-15f, getHeight() - back.getHeight() - 15f); back.addListener(new ChangeListener() { @Override public void changed(ChangeEvent event, Actor actor) { @@ -101,22 +93,6 @@ public class MusicSelectionPage extends Page implements Observer { back.toFront(); refresh(); - Pixmap pixmap = new Pixmap(2, 2, Format.RGBA8888); - pixmap.setColor(skin.getColor("default")); - pixmap.fill(); - white = new Texture(pixmap); - pixmap.dispose(); - - vertSplitBar = new Image(white); - vertSplitBar.setHeight(getHeight()); - vertSplitBar.setPosition(scrollbar.getWidth() + scrollbar.getX(), 0); - addActor(vertSplitBar); - - horSplitBar = new Image(white); - horSplitBar.setWidth(vertSplitBar.getX()); - horSplitBar.setPosition(0, getHeightBelowTitle()); - addActor(horSplitBar); - addListener(new InputListener() { @Override public boolean keyDown(InputEvent event, int keycode) { @@ -222,7 +198,6 @@ public class MusicSelectionPage extends Page implements Observer { @Override public void dispose() { - white.dispose(); super.dispose(); }