From 6d006a3cc7ed33854071d1cbb568c8d11a989213 Mon Sep 17 00:00:00 2001 From: exslims Date: Mon, 22 Jan 2018 23:51:28 +0400 Subject: [PATCH] support tab updated --- .../java/com/mercury/platform/core/MercuryConstants.java | 2 +- .../ui/components/panel/settings/page/SupportPagePanel.java | 2 ++ .../com/mercury/platform/ui/frame/titled/SettingsFrame.java | 6 +++--- app-ui/src/main/resources/notes/patch/patch-notes.json | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app-core/src/main/java/com/mercury/platform/core/MercuryConstants.java b/app-core/src/main/java/com/mercury/platform/core/MercuryConstants.java index e69a7cf5..d62bc304 100644 --- a/app-core/src/main/java/com/mercury/platform/core/MercuryConstants.java +++ b/app-core/src/main/java/com/mercury/platform/core/MercuryConstants.java @@ -1,7 +1,7 @@ package com.mercury.platform.core; public class MercuryConstants { - public static final String APP_VERSION = "1.0.3.1.0"; + public static final String APP_VERSION = "1.0.3.2.0"; public static final String SERVER_HOST = "exslims.ddns.net"; public static final int PORT = 5555; } diff --git a/app-ui/src/main/java/com/mercury/platform/ui/components/panel/settings/page/SupportPagePanel.java b/app-ui/src/main/java/com/mercury/platform/ui/components/panel/settings/page/SupportPagePanel.java index 0fb19467..35cbc1c4 100644 --- a/app-ui/src/main/java/com/mercury/platform/ui/components/panel/settings/page/SupportPagePanel.java +++ b/app-ui/src/main/java/com/mercury/platform/ui/components/panel/settings/page/SupportPagePanel.java @@ -105,6 +105,7 @@ public void mouseWheelMoved(MouseWheelEvent e) { private List getDonations() { List donations = new ArrayList<>(); + donations.add(new DonationPair("Sklifan", AppThemeColor.TEXT_DEFAULT)); donations.add(new DonationPair("222Craft", AppThemeColor.TEXT_DEFAULT)); donations.add(new DonationPair("Xagulz", AppThemeColor.TEXT_DEFAULT)); donations.add(new DonationPair("Taw", AppThemeColor.TEXT_DEFAULT)); @@ -112,6 +113,7 @@ private List getDonations() { donations.add(new DonationPair("Blightsand", AppThemeColor.TEXT_DEFAULT)); donations.add(new DonationPair("Mattc3303", AppThemeColor.TEXT_DEFAULT)); donations.add(new DonationPair("StubenZocker", AppThemeColor.TEXT_DEFAULT)); + donations.add(new DonationPair("Bjertsjö", AppThemeColor.TEXT_DEFAULT)); donations.add(new DonationPair("SirKultan", AppThemeColor.TEXT_DEFAULT)); return donations; } diff --git a/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/SettingsFrame.java b/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/SettingsFrame.java index b8ea4c10..7d9144f6 100644 --- a/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/SettingsFrame.java +++ b/app-ui/src/main/java/com/mercury/platform/ui/frame/titled/SettingsFrame.java @@ -80,11 +80,11 @@ private JPanel getBottomPanel() { AdrDurationComponentDescriptor donateDescriptor = new AdrProgressBarDescriptor(); donateDescriptor.setIconEnable(false); - donateDescriptor.setDuration(200d); + donateDescriptor.setDuration(50d); donateDescriptor.setSize(new Dimension(100, 20)); donateDescriptor.setType(AdrComponentType.PROGRESS_BAR); donateDescriptor.setCustomTextEnable(true); - donateDescriptor.setCustomText("0$"); + donateDescriptor.setCustomText("21$"); donateDescriptor.setFontSize(21); donateDescriptor.setLowValueTextColor(AppThemeColor.TEXT_DEFAULT); donateDescriptor.setMediumValueTextColor(AppThemeColor.TEXT_DEFAULT); @@ -93,7 +93,7 @@ private JPanel getBottomPanel() { donateDescriptor.setBackgroundColor(AppThemeColor.FRAME); donateDescriptor.setForegroundColor(AppThemeColor.BUTTON); MercuryTracker tracker = new MercuryTracker(donateDescriptor); - tracker.setValue(1000); + tracker.setValue(22 * 1000); tracker.setPreferredSize(donateDescriptor.getSize()); root.add(this.componentsFactory.getTextLabel("Monthly donations:", FontStyle.BOLD, 16), BorderLayout.LINE_START); root.add(this.componentsFactory.wrapToSlide(tracker, AppThemeColor.ADR_FOOTER_BG, 2, 2, 2, 1), BorderLayout.CENTER); diff --git a/app-ui/src/main/resources/notes/patch/patch-notes.json b/app-ui/src/main/resources/notes/patch/patch-notes.json index 4df9aa0f..6fde1e39 100644 --- a/app-ui/src/main/resources/notes/patch/patch-notes.json +++ b/app-ui/src/main/resources/notes/patch/patch-notes.json @@ -1,9 +1,9 @@ { - "version": "1.0.3.1.0", + "version": "1.0.3.2.0", "notes":[ { "title": "Update", - "text": "- Added /whois button to outgoing notification panel.\n- Fixed a bug when sometimes notification panel won't show orb icons.\n- Many backend improvements for rework \"History\" feature in next version.\n- Support tab updated.\n\nHappy new year! If you love MercuryTrade so much it has become your favourite application to play the game - show your appreciation by supporting it! Thanks!", + "text": "- Added /whois button to scanner notification panel. \n- Fixed a bug when chat scanner is not ignore nickname from chat.\n- Now notification panel works with french POE client.\n- Support tab updated.\n\nDon't forget to [support ](https://www.paypal.me/mercurytrade) the app, we really appreciate it! Thanks!", "image" : "", "layout" : "VERTICAL" }