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 d62bc304..1ffb6d63 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.2.0"; + public static final String APP_VERSION = "1.0.3.3.0"; public static final String SERVER_HOST = "exslims.ddns.net"; public static final int PORT = 5555; } diff --git a/app-core/src/main/java/com/mercury/platform/core/utils/interceptor/TradeIncMessagesInterceptor.java b/app-core/src/main/java/com/mercury/platform/core/utils/interceptor/TradeIncMessagesInterceptor.java index 3757376c..1d60b6f5 100644 --- a/app-core/src/main/java/com/mercury/platform/core/utils/interceptor/TradeIncMessagesInterceptor.java +++ b/app-core/src/main/java/com/mercury/platform/core/utils/interceptor/TradeIncMessagesInterceptor.java @@ -24,7 +24,7 @@ public TradeIncMessagesInterceptor() { this.clients.add(new ArabicInLocalizationMatcher()); this.clients.add(new BZIncLocalizationMatcher()); this.clients.add(new FrenchIncLocalizationMatcher()); - this.clients.add(new GermanIncLocalizationMatcher(); + this.clients.add(new GermanIncLocalizationMatcher()); } @Override @@ -127,7 +127,8 @@ public String trimString(String src) { return StringUtils.substringAfter(src, "@De"); } } -private class GermanIncLocalizationMatcher extends LocalizationMatcher { + + private class GermanIncLocalizationMatcher extends LocalizationMatcher { @Override public boolean isSuitableFor(String message) { return message.contains("@Von") && super.isSuitableFor(message); diff --git a/app-core/src/main/java/com/mercury/platform/shared/config/configration/impl/HotKeyConfigurationService.java b/app-core/src/main/java/com/mercury/platform/shared/config/configration/impl/HotKeyConfigurationService.java index 28095992..b681693c 100644 --- a/app-core/src/main/java/com/mercury/platform/shared/config/configration/impl/HotKeyConfigurationService.java +++ b/app-core/src/main/java/com/mercury/platform/shared/config/configration/impl/HotKeyConfigurationService.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; public class HotKeyConfigurationService extends BaseConfigurationService implements PlainConfigurationService { public HotKeyConfigurationService(ProfileDescriptor selectedProfile) { @@ -57,9 +58,22 @@ public void validate() { if (this.selectedProfile.getHotkeysSettingsDescriptor() == null) { this.selectedProfile.setHotkeysSettingsDescriptor(this.getDefault()); } + + this.selectedProfile.getHotkeysSettingsDescriptor() + .setOutNHotKeysList(this.removeNullTypesFrom( + this.selectedProfile.getHotkeysSettingsDescriptor().getOutNHotKeysList())); + + this.selectedProfile.getHotkeysSettingsDescriptor() + .setIncNHotKeysList(this.removeNullTypesFrom( + this.selectedProfile.getHotkeysSettingsDescriptor().getIncNHotKeysList())); + + this.selectedProfile.getHotkeysSettingsDescriptor() + .setScannerNHotKeysList(this.removeNullTypesFrom( + this.selectedProfile.getHotkeysSettingsDescriptor().getScannerNHotKeysList())); + if (this.selectedProfile.getHotkeysSettingsDescriptor() .getOutNHotKeysList().stream() - .filter(it -> it.getType().equals(HotKeyType.N_WHO_IS)) + .filter(it -> HotKeyType.N_WHO_IS.equals(it.getType())) .findAny().orElse(null) == null) { this.selectedProfile.getHotkeysSettingsDescriptor() .getOutNHotKeysList().add(new HotKeyPair(HotKeyType.N_WHO_IS, new HotKeyDescriptor())); @@ -67,7 +81,7 @@ public void validate() { if (this.selectedProfile.getHotkeysSettingsDescriptor() .getScannerNHotKeysList().stream() - .filter(it -> it.getType().equals(HotKeyType.N_WHO_IS)) + .filter(it -> HotKeyType.N_WHO_IS.equals(it.getType())) .findAny().orElse(null) == null) { this.selectedProfile.getHotkeysSettingsDescriptor() .getScannerNHotKeysList().add(new HotKeyPair(HotKeyType.N_WHO_IS, new HotKeyDescriptor())); @@ -83,4 +97,8 @@ public HotKeysSettingsDescriptor get() { public void set(HotKeysSettingsDescriptor descriptor) { this.selectedProfile.setHotkeysSettingsDescriptor(descriptor); } + + private List removeNullTypesFrom(List list) { + return list.stream().filter(it -> it.getType() != null).collect(Collectors.toList()); + } } 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 35cbc1c4..bd91f919 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("LiftingNerdBro", AppThemeColor.TEXT_DEFAULT)); donations.add(new DonationPair("Sklifan", AppThemeColor.TEXT_DEFAULT)); donations.add(new DonationPair("222Craft", AppThemeColor.TEXT_DEFAULT)); donations.add(new DonationPair("Xagulz", AppThemeColor.TEXT_DEFAULT)); 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 7d9144f6..f38c5585 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 @@ -84,7 +84,7 @@ private JPanel getBottomPanel() { donateDescriptor.setSize(new Dimension(100, 20)); donateDescriptor.setType(AdrComponentType.PROGRESS_BAR); donateDescriptor.setCustomTextEnable(true); - donateDescriptor.setCustomText("21$"); + donateDescriptor.setCustomText("31$"); 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(22 * 1000); + tracker.setValue(32 * 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 6fde1e39..5a4b58f3 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.2.0", + "version": "1.0.3.3.0", "notes":[ { "title": "Update", - "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!", + "text": "Hi, sorry for the long absence.\n\n- Fix critical bug when sometimes MT hangs on boot.\n- Fixed a bug when notification panel doesn't show up after altabing.\n- Now notification panel works with german POE client.\n- Support tab updated.\n\nDon't forget to support the app, we really appreciate it! Thanks!", "image" : "", "layout" : "VERTICAL" }