1.0.1.9 release commit

app-core/src/main/java/com/mercury/platform/shared/config/configration/impl/FramesConfigurationServiceImpl.java

@@ -82,7 +82,7 @@ private void initMinimumMap() {
 
     private void initDefaultMap() {
         defaultFramesSettings.put("TaskBarFrame", new FrameDescriptor(new Point(400, 500), new Dimension(109, 20)));
-        defaultFramesSettings.put("NotificationFrame", new FrameDescriptor(new Point(700, 600), new Dimension(350, 0)));
+        defaultFramesSettings.put("NotificationFrame", new FrameDescriptor(new Point(700, 600), new Dimension(450, 0)));
         defaultFramesSettings.put("OutMessageFrame", new FrameDescriptor(new Point(200, 500), new Dimension(280, 115)));
         defaultFramesSettings.put("TestCasesFrame", new FrameDescriptor(new Point(1400, 500), new Dimension(400, 100)));
         defaultFramesSettings.put("SettingsFrame", new FrameDescriptor(new Point(600, 600), new Dimension(800, 600)));

app-core/src/main/java/com/mercury/platform/shared/config/descriptor/NotificationSettingsDescriptor.java

@@ -16,7 +16,7 @@ public class NotificationSettingsDescriptor implements Serializable {
     private int unfoldCount = 2;
     private FlowDirections flowDirections = FlowDirections.DOWNWARDS;
     private boolean dismissAfterKick = true;
-    private boolean dismissAfterLeave = true;
+    private boolean dismissAfterLeave = false;
     private boolean showLeague;
     private List<ResponseButtonDescriptor> buttons = new ArrayList<>();
     private List<ResponseButtonDescriptor> outButtons = new ArrayList<>();

app-ui/src/main/java/com/mercury/platform/ui/frame/titled/NotesFrame.java

@@ -24,8 +24,6 @@ public class NotesFrame extends AbstractTitledComponentFrame {
     private ProgressBarFrame progressBarFrame;
     private boolean lastNote = false;
 
-    private JCheckBox showOnStartUp;
-
     public NotesFrame(List<Note> notes, NotesType type) {
         super();
         this.currentNotes = notes;
@@ -52,20 +50,6 @@ public void onViewInit() {
         this.contentPanel = new ContentPanel();
         rootPanel.add(contentPanel, BorderLayout.CENTER);
         JPanel miscPanel = componentsFactory.getTransparentPanel(new BorderLayout());
-
-        this.showOnStartUp = new JCheckBox();
-        this.showOnStartUp.setBackground(AppThemeColor.TRANSPARENT);
-        this.showOnStartUp.setSelected(this.applicationConfig.get().isShowOnStartUp());
-        this.showOnStartUp.addActionListener(action -> {
-            this.applicationConfig.get().setShowOnStartUp(showOnStartUp.isSelected());
-        });
-
-        JPanel showOnStartPanel = componentsFactory.getTransparentPanel(new FlowLayout(FlowLayout.LEFT));
-        showOnStartPanel.add(showOnStartUp);
-        showOnStartPanel.add(componentsFactory.getTextLabel(FontStyle.REGULAR, AppThemeColor.TEXT_DEFAULT, TextAlignment.LEFTOP, 15f, "Show on StartUp"));
-        if (type.equals(NotesType.INFO)) {
-            miscPanel.add(showOnStartPanel, BorderLayout.CENTER);
-        }
         miscPanel.add(getNavBar(), BorderLayout.PAGE_END);
         rootPanel.add(miscPanel, BorderLayout.PAGE_END);
         this.add(rootPanel, BorderLayout.CENTER);

app-ui/src/main/java/com/mercury/platform/ui/frame/titled/SettingsFrame.java

@@ -157,8 +157,8 @@ private JPanel getOperationsButtons() {
         JButton openTests = this.getOperationButton("Open tests", "app/open-tests.png");
         openTests.addActionListener(action -> {
             FramesManager.INSTANCE.hideFrame(SettingsFrame.class);
-            FramesManager.INSTANCE.showFrame(TestCasesFrame.class);
-//            FramesManager.INSTANCE.preShowFrame(TestCasesFrame.class);
+//            FramesManager.INSTANCE.showFrame(TestCasesFrame.class);
+            FramesManager.INSTANCE.preShowFrame(TestCasesFrame.class);
         });
         root.add(this.componentsFactory.wrapToSlide(openTutorial));
         root.add(this.componentsFactory.wrapToSlide(checkUpdates));

app-ui/src/main/java/com/mercury/platform/ui/manager/routing/SettingsRoutManager.java

@@ -1,6 +1,7 @@
 package com.mercury.platform.ui.manager.routing;
 
 import com.mercury.platform.shared.AsSubscriber;
+import com.mercury.platform.shared.config.Configuration;
 import com.mercury.platform.shared.store.MercuryStoreCore;
 import com.mercury.platform.ui.components.panel.settings.page.*;
 import com.mercury.platform.ui.frame.titled.SettingsFrame;
@@ -20,6 +21,10 @@ public class SettingsRoutManager implements AsSubscriber {
     public SettingsRoutManager(SettingsFrame settingsFrame) {
         this.settingsFrame = settingsFrame;
 
+        if (Configuration.get().applicationConfiguration().get().isShowOnStartUp()) {
+            Configuration.get().applicationConfiguration().get().setShowOnStartUp(false);
+        }
+
         this.generalSettings = new GeneralSettingsPagePanel();
         this.soundSettings = new SoundSettingsPagePanel();
         this.generalSettings = new GeneralSettingsPagePanel();

app-ui/src/main/resources/notes/patch/patch-notes.json

@@ -2,8 +2,8 @@
   "version": "1.0.1.9.0",
   "notes":[
     {
-      "title" : "Hotfix",
-      "text" : "Hotfixes for the recent big update (check github/reddit):\n\n1. Now \"Escape\" is not a viable hotkey (lmao), will clear the hotkey instead.\n2. Fixed a bug with Item Grid boxes not being removed properly.\n3. Fixed a bug with panel resizing not working.\n4. Fixed Notification's Upwards Flow Direction option is not working properly.",
+      "title": "Update",
+      "text": "- Improved all trade notification layouts - now way cooler.\n- Now outgoing notifications will be automatically discarded if DND/AFK/NotOnline has been detected.\n- Player proximity status is now working again (when a buyer visits your h/o).\n- The Ignore Item thing now works for currency trades as well.\n- Reworked the History-with-this-guy window - now opens a subwindow with a scroll.\n- Fixed Upwards flow direction not working.\nA full listing of fixes you can find on the github page.\n\nDo your part and support MercuryTrade! More features soon!",
       "image" : "",
       "layout" : "VERTICAL"
     }