From 6aa03bd3441dc8227dcec8264a15de508cf0098a Mon Sep 17 00:00:00 2001 From: Recrown Date: Fri, 24 Nov 2017 23:37:44 -0600 Subject: [PATCH] minor changes to aesthetics, added rated difficulty to selection screen --- android/assets/uiskin.png | Bin 11446 -> 11456 bytes .../graphics/ui/pages/MusicSelectionPage.java | 23 ++++++++++++------ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/android/assets/uiskin.png b/android/assets/uiskin.png index 5a6711b0142a7c39872c4503c950cf5efa608e7f..43c957641d18a0ffe74ec20af3276bc83ed65149 100755 GIT binary patch literal 11456 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 OfVrw7mvzO!?|%T*D1uD@ literal 11446 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 diff --git a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MusicSelectionPage.java b/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MusicSelectionPage.java index b9b6991..870e6ae 100755 --- a/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MusicSelectionPage.java +++ b/core/src/zero1hd/rhythmbullet/graphics/ui/pages/MusicSelectionPage.java @@ -43,18 +43,16 @@ public class MusicSelectionPage extends Page implements Observer { private ScrollPane musicTableScrollPane; private TextButton back; + private Table musicInfoTable; private ScrollText songTitle; private Label author; private Label songLength; private Label previousTop; - private Table musicInfoTable; + private Label ratedDifficulty; private Image albumCover; private MusicSelectable currentlySelected; - private FileHandle selectedMusic; - private SongInfo selectedMusicInfo; - private Skin skin; private AssetManager assets; @@ -115,7 +113,7 @@ public class MusicSelectionPage extends Page implements Observer { }); musicInfoTable = new Table(); - musicInfoTable.defaults().center().space(10f); + musicInfoTable.defaults().center().space(5f); musicInfoTable.setPosition(musicTableScrollPane.getWidth() + musicTableScrollPane.getX(), 0); musicInfoTable.setSize(getWidth()-musicTableScrollPane.getWidth(), getHeight()); addActor(musicInfoTable); @@ -124,6 +122,7 @@ public class MusicSelectionPage extends Page implements Observer { 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")); + ratedDifficulty = new Label(null, skin, "sub-font", skin.getColor("default")); albumCover = new Image(assetManager.get("defaultCover.png", Texture.class)); refresh(); @@ -167,11 +166,11 @@ public class MusicSelectionPage extends Page implements Observer { } public FileHandle getSelectedMusic() { - return selectedMusic; + return currentlySelected.getMusicFile(); } public SongInfo getSelectedMusicInfo() { - return selectedMusicInfo; + return currentlySelected.getAudioInfo(); } public void refresh() { @@ -204,7 +203,7 @@ public class MusicSelectionPage extends Page implements Observer { } extraInfoDone = true; - musicInfoTable.add(songTitle).width(musicInfoTable.getWidth()*0.7f); + musicInfoTable.add(songTitle).width(musicInfoTable.getWidth()*0.7f).spaceBottom(10f); musicInfoTable.row(); musicInfoTable.add(author); musicInfoTable.row(); @@ -212,6 +211,8 @@ public class MusicSelectionPage extends Page implements Observer { musicInfoTable.row(); musicInfoTable.add(previousTop); musicInfoTable.row(); + musicInfoTable.add(ratedDifficulty); + musicInfoTable.row(); musicInfoTable.add(albumCover).size(musicInfoTable.getWidth()/2f); if (currentlySelected != null) { updateInformation(); @@ -303,6 +304,12 @@ public class MusicSelectionPage extends Page implements Observer { songLength.setText("Length: " + min + ":" + sec); previousTop.setText("Highscore: " + currentlySelected.getAudioInfo().getPreviousTop()); + + String difficulty = (getSelectedMusicInfo().getRatedDifficulty() == -1 ? "N/A" : String.valueOf(getSelectedMusicInfo().getRatedDifficulty())); + ratedDifficulty.setText("Rated Difficulty: " + difficulty); + albumCover.setDrawable((new TextureRegionDrawable(new TextureRegion(currentlySelected.getAudioInfo().getAlbumCover())))); + + } }