Skip to content

Commit

Permalink
Release 1.1.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Morph21 committed Oct 31, 2020
1 parent 9a38751 commit 4a0988b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public void onViewInit() {


JTextArea donateText = componentsFactory.getSimpleTextArea("We aimed to create a convenience tool in form of an easy-to-use application, primarily for trading purposes. If MercuryTrade successfully managed to save your time or improve your experience, you can thank us by donating or telling your friends. If you want your name to be featured in our in-app Hall of Fame please provide this information within the transaction!");
donateText.setPreferredSize(new Dimension(300, 150));
donateText.setPreferredSize(new Dimension(300, 450));
JPanel donateButtonPanel = componentsFactory.getTransparentPanel(new FlowLayout(FlowLayout.CENTER));
donateButtonPanel.setBorder(BorderFactory.createEmptyBorder(60, 0, 0, 0));
donatePanel.add(donateButtonPanel);
Expand Down Expand Up @@ -82,6 +82,7 @@ public void mouseWheelMoved(MouseWheelEvent e) {

private List<DonationPair> getDonations() {
List<DonationPair> donations = new ArrayList<>();
donations.add(new DonationPair("SmoofBrane", AppThemeColor.TEXT_NICKNAME));
donations.add(new DonationPair("LiftingNerdBro", AppThemeColor.TEXT_DEFAULT));
donations.add(new DonationPair("Sklifan", AppThemeColor.TEXT_DEFAULT));
donations.add(new DonationPair("222Craft", AppThemeColor.TEXT_DEFAULT));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,21 @@ private JPanel getSaveButtonPanel() {
MercuryStoreUI.settingsRestoreSubject.onNext(true);
});

JButton donate = componentsFactory.getIconButton("app/paypal.png", 70f, AppThemeColor.ADR_FOOTER_BG, "Donate");
donate.addMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent e) {
try {
Desktop.getDesktop().browse(new URI("https://www.paypal.me/Morph21MT"));
} catch (Exception e1) {
e1.printStackTrace();
}
}
});

saveButton.setPreferredSize(new Dimension(110, 26));
cancelButton.setPreferredSize(new Dimension(110, 26));
root.add(this.componentsFactory.wrapToSlide(donate, AppThemeColor.HEADER, 2, 2, 2, 2));
root.add(this.componentsFactory.wrapToSlide(cancelButton, AppThemeColor.HEADER, 2, 2, 2, 2));
root.add(this.componentsFactory.wrapToSlide(saveButton, AppThemeColor.HEADER, 2, 2, 2, 2));
return root;
Expand Down
Binary file added app-ui/src/main/resources/currency/alch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 4a0988b

Please sign in to comment.