sarsoo/fmframework
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

added percentages to more views

Browse Source
This commit is contained in:
aj 2018-04-03 00:28:01 -07:00
parent 096bf38365
commit 771db2a281
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fmframework/src/sarsoo/fmframework/gui/AlbumView.java
View File

@ -16,6 +16,8 @@ import javax.swing.SwingConstants;
import sarsoo.fmframework.music.Album;
import sarsoo.fmframework.net.Network;
import sarsoo.fmframework.util.Maths;
import sarsoo.fmframework.util.Reference;
public class AlbumView extends JFrame {
JPanel buttons = new JPanel();
@ -73,7 +75,7 @@ public class AlbumView extends JFrame {
playCount.setText(numberFormat.format(album.getPlayCount()) + " Scrobbles");
playCount.setHorizontalAlignment(SwingConstants.CENTER);
userPlayCount.setText(numberFormat.format(album.getUserPlayCount()) + " Your Scrobbles");
userPlayCount.setText(numberFormat.format(album.getUserPlayCount()) + String.format(" Your Scrobbles (%.2f%%)", Maths.getPercentListening(album, Reference.getUserName())));
userPlayCount.setHorizontalAlignment(SwingConstants.CENTER);
userPlayCount.setFont(sub);

4
fmframework/src/sarsoo/fmframework/gui/FMObjListView.java
View File

@ -92,14 +92,14 @@ public class FMObjListView extends JFrame {
info.add(totalScrobbles);
double percent = Maths.getPercentListening(objects, Reference.getUserName());
if (percent > 1) {
// if (percent > 1) {
JLabel percentLabel = new JLabel();
percentLabel.setHorizontalAlignment(SwingConstants.CENTER);
percentLabel.setText(String.format("%.2f%%", percent));
percentLabel.setFont(font);
info.add(percentLabel);
}
// }
add(info);
pack();

12
fmframework/src/sarsoo/fmframework/gui/FMObjView.java
View File

@ -1,6 +1,7 @@
package sarsoo.fmframework.gui;
import java.awt.FlowLayout;
import java.awt.Font;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@ -15,6 +16,8 @@ import javax.swing.SwingConstants;
import sarsoo.fmframework.music.FMObj;
import sarsoo.fmframework.net.Network;
import sarsoo.fmframework.util.Maths;
import sarsoo.fmframework.util.Reference;
public class FMObjView extends JFrame{
JPanel buttons = new JPanel();
@ -44,15 +47,20 @@ public class FMObjView extends JFrame{
buttons.add(musicBrainz);
NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.US);
Font title = new Font("Arial", Font.BOLD, 24);
Font sub = new Font("Arial", Font.PLAIN, 20);
name.setText(obj.getName());
name.setHorizontalAlignment(SwingConstants.CENTER);
name.setFont(title);
listeners.setText(numberFormat.format(obj.getListeners()) + " Listeners");
listeners.setHorizontalAlignment(SwingConstants.CENTER);
playCount.setText(numberFormat.format(obj.getPlayCount()) + " Scrobbles");
playCount.setHorizontalAlignment(SwingConstants.CENTER);
userPlayCount.setText(numberFormat.format(obj.getUserPlayCount()) + " Your Scrobbles");
userPlayCount.setText(numberFormat.format(obj.getUserPlayCount()) + String.format(" Your Scrobbles (%.2f%%)", Maths.getPercentListening(obj, Reference.getUserName())));
userPlayCount.setHorizontalAlignment(SwingConstants.CENTER);
userPlayCount.setFont(sub);
viewWiki.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
@ -70,9 +78,9 @@ public class FMObjView extends JFrame{
}
});
add(name);
add(userPlayCount);
add(listeners);
add(playCount);
add(userPlayCount);
// add(info);
add(buttons);