diff --git a/app-core/pom.xml b/app-core/pom.xml index d1cafeae..93bd7f86 100644 --- a/app-core/pom.xml +++ b/app-core/pom.xml @@ -22,11 +22,6 @@ com.1stleg jnativehook - 2.0.2 - - - lc.kra.system - system-hook net.java.dev.jna diff --git a/app-core/src/main/java/com/mercury/platform/core/update/core/ClientChannelInitializer.java b/app-core/src/main/java/com/mercury/platform/core/update/core/ClientChannelInitializer.java index 1324bce2..0dcc9810 100644 --- a/app-core/src/main/java/com/mercury/platform/core/update/core/ClientChannelInitializer.java +++ b/app-core/src/main/java/com/mercury/platform/core/update/core/ClientChannelInitializer.java @@ -10,9 +10,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -/** - * Created by Frost on 14.01.2017. - */ public class ClientChannelInitializer extends ChannelInitializer { private static final Logger LOGGER = LogManager.getLogger(ClientChannelInitializer.class.getSimpleName()); diff --git a/app-core/src/main/java/com/mercury/platform/core/update/core/UpdaterClient.java b/app-core/src/main/java/com/mercury/platform/core/update/core/UpdaterClient.java index e2b1c9f9..46340b81 100644 --- a/app-core/src/main/java/com/mercury/platform/core/update/core/UpdaterClient.java +++ b/app-core/src/main/java/com/mercury/platform/core/update/core/UpdaterClient.java @@ -12,11 +12,9 @@ import org.apache.logging.log4j.Logger; import java.net.InetSocketAddress; +import java.util.Random; import java.util.concurrent.TimeUnit; -/** - * Created by Frost on 14.01.2017. - */ public class UpdaterClient { private static final Logger LOGGER = LogManager.getLogger(UpdaterClient.class.getSimpleName()); @@ -71,7 +69,7 @@ public void operationComplete(ChannelFuture future) throws Exception { future.channel().close(); future.channel().eventLoop().schedule(() -> { bootstrap.connect().addListener(this); - },3,TimeUnit.MINUTES); + },new Random().nextInt(5),TimeUnit.MINUTES); } else { channel = future.channel(); connectionEstablished = true; diff --git a/app-core/src/main/java/com/mercury/platform/core/utils/MessageFileHandler.java b/app-core/src/main/java/com/mercury/platform/core/utils/MessageFileHandler.java index c70a9a57..13e59383 100644 --- a/app-core/src/main/java/com/mercury/platform/core/utils/MessageFileHandler.java +++ b/app-core/src/main/java/com/mercury/platform/core/utils/MessageFileHandler.java @@ -68,9 +68,7 @@ public void parse() { .collect(Collectors.toList()); List resultMessages = filteredMessages.stream().filter(message -> { - message = StringUtils.substring(message, 0, 20); - Matcher matcher = datePattern.matcher(message); - if(matcher.find()) { + if(message.contains("2017") || message.contains("2018")) { //todo Date date = new Date(StringUtils.substring(message, 0, 20)); return date.after(lastMessageDate); }else { diff --git a/app-core/src/main/java/com/mercury/platform/shared/config/configration/impl/HotKeysConfigurationService.java b/app-core/src/main/java/com/mercury/platform/shared/config/configration/impl/HotKeysConfigurationService.java index 46a9dccb..6971f1b8 100644 --- a/app-core/src/main/java/com/mercury/platform/shared/config/configration/impl/HotKeysConfigurationService.java +++ b/app-core/src/main/java/com/mercury/platform/shared/config/configration/impl/HotKeysConfigurationService.java @@ -7,7 +7,6 @@ import com.mercury.platform.shared.config.descriptor.HotKeyType; import com.mercury.platform.shared.config.descriptor.ProfileDescriptor; import com.mercury.platform.shared.store.MercuryStoreCore; -import lc.kra.system.keyboard.event.GlobalKeyEvent; import org.jnativehook.keyboard.NativeKeyEvent; import java.util.HashMap; diff --git a/app-core/src/main/java/com/mercury/platform/shared/hotkey/HotKeyAdapter.java b/app-core/src/main/java/com/mercury/platform/shared/hotkey/HotKeyAdapter.java deleted file mode 100644 index f13fb8d1..00000000 --- a/app-core/src/main/java/com/mercury/platform/shared/hotkey/HotKeyAdapter.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.mercury.platform.shared.hotkey; - -import com.mercury.platform.shared.config.descriptor.HotKeyDescriptor; -import com.mercury.platform.shared.store.MercuryStoreCore; -import lc.kra.system.keyboard.event.GlobalKeyAdapter; -import lc.kra.system.keyboard.event.GlobalKeyEvent; - -public class HotKeyAdapter extends GlobalKeyAdapter { - @Override - public void keyPressed(GlobalKeyEvent event) { - MercuryStoreCore.hotKeySubject.onNext(this.convert(event)); - } - - private HotKeyDescriptor convert(GlobalKeyEvent event) { - HotKeyDescriptor descriptor = new HotKeyDescriptor(); - descriptor.setKeyChar(event.getKeyChar()); - descriptor.setVirtualKeyCode(event.getVirtualKeyCode()); - descriptor.setControlPressed(event.isControlPressed()); - descriptor.setMenuPressed(event.isMenuPressed()); - descriptor.setShiftPressed(event.isShiftPressed()); - return descriptor; - } -} diff --git a/app-core/src/main/java/com/mercury/platform/shared/store/MercuryStoreCore.java b/app-core/src/main/java/com/mercury/platform/shared/store/MercuryStoreCore.java index ebfae0fb..f2861114 100644 --- a/app-core/src/main/java/com/mercury/platform/shared/store/MercuryStoreCore.java +++ b/app-core/src/main/java/com/mercury/platform/shared/store/MercuryStoreCore.java @@ -9,7 +9,6 @@ import com.mercury.platform.shared.entity.message.MercuryError; import com.mercury.platform.shared.entity.message.Message; import com.mercury.platform.shared.config.descriptor.SoundDescriptor; -import lc.kra.system.keyboard.event.GlobalKeyEvent; import rx.subjects.PublishSubject; 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 cbb32087..b52eaa19 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 @@ -9,9 +9,12 @@ import com.mercury.platform.ui.manager.FramesManager; import com.mercury.platform.ui.misc.AppThemeColor; import com.mercury.platform.ui.misc.MercuryStoreUI; +import com.mercury.platform.ui.misc.note.Note; +import com.mercury.platform.ui.misc.note.NotesLoader; import javax.swing.*; import java.awt.*; +import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionAdapter; @@ -114,6 +117,23 @@ private JPanel getOperationsButtons(){ root.add(this.componentsFactory.wrapToSlide(openTutorial)); root.add(this.componentsFactory.wrapToSlide(checkUpdates)); root.add(this.componentsFactory.wrapToSlide(openTests)); + + JButton patchNotes = componentsFactory.getBorderedButton("Open patch notes"); + patchNotes.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + if(SwingUtilities.isLeftMouseButton(e)){ + NotesLoader notesLoader = new NotesLoader(); + java.util.List patchNotes = notesLoader.getPatchNotes(); + if(patchNotes.size() != 0){ + NotesFrame patchNotesFrame = new NotesFrame(patchNotes, NotesFrame.NotesType.PATCH); + patchNotesFrame.init(); + patchNotesFrame.showComponent(); + } + } + } + }); +// root.add(patchNotes); return root; } diff --git a/app-ui/src/main/resources/app/adr_readme_logo.png b/app-ui/src/main/resources/app/adr_readme_logo.png deleted file mode 100644 index a9b2db7a..00000000 Binary files a/app-ui/src/main/resources/app/adr_readme_logo.png and /dev/null differ diff --git a/app-ui/src/main/resources/app/adr_showcase_logo.png b/app-ui/src/main/resources/app/adr_showcase_logo.png deleted file mode 100644 index 692db0bf..00000000 Binary files a/app-ui/src/main/resources/app/adr_showcase_logo.png and /dev/null differ diff --git a/app-ui/src/main/resources/app/app-icon-donate.png b/app-ui/src/main/resources/app/app-icon-donate.png deleted file mode 100644 index fdc22731..00000000 Binary files a/app-ui/src/main/resources/app/app-icon-donate.png and /dev/null differ diff --git a/app-ui/src/main/resources/app/arrows/down-arrow.png b/app-ui/src/main/resources/app/arrows/down-arrow.png deleted file mode 100644 index 5aeff5d7..00000000 Binary files a/app-ui/src/main/resources/app/arrows/down-arrow.png and /dev/null differ diff --git a/app-ui/src/main/resources/app/arrows/left-arrow.png b/app-ui/src/main/resources/app/arrows/left-arrow.png deleted file mode 100644 index b5a19cec..00000000 Binary files a/app-ui/src/main/resources/app/arrows/left-arrow.png and /dev/null differ diff --git a/app-ui/src/main/resources/app/arrows/right-arrow.png b/app-ui/src/main/resources/app/arrows/right-arrow.png deleted file mode 100644 index b3540c23..00000000 Binary files a/app-ui/src/main/resources/app/arrows/right-arrow.png and /dev/null differ diff --git a/app-ui/src/main/resources/app/arrows/up-arrow.png b/app-ui/src/main/resources/app/arrows/up-arrow.png deleted file mode 100644 index aa747a8f..00000000 Binary files a/app-ui/src/main/resources/app/arrows/up-arrow.png and /dev/null differ diff --git a/app-ui/src/main/resources/app/chatFilter.png b/app-ui/src/main/resources/app/chatFilter.png deleted file mode 100644 index 044333c5..00000000 Binary files a/app-ui/src/main/resources/app/chatFilter.png and /dev/null differ diff --git a/app-ui/src/main/resources/app/clear-trades.png b/app-ui/src/main/resources/app/clear-trades.png deleted file mode 100644 index c94616d0..00000000 Binary files a/app-ui/src/main/resources/app/clear-trades.png and /dev/null differ diff --git a/app-ui/src/main/resources/app/clear_trades.pdn b/app-ui/src/main/resources/app/clear_trades.pdn deleted file mode 100644 index a5c3f652..00000000 Binary files a/app-ui/src/main/resources/app/clear_trades.pdn and /dev/null differ diff --git a/app-ui/src/main/resources/app/collapse.png b/app-ui/src/main/resources/app/collapse.png deleted file mode 100644 index da77da0c..00000000 Binary files a/app-ui/src/main/resources/app/collapse.png and /dev/null differ diff --git a/app-ui/src/main/resources/app/expand.png b/app-ui/src/main/resources/app/expand.png deleted file mode 100644 index 9824abc0..00000000 Binary files a/app-ui/src/main/resources/app/expand.png and /dev/null differ diff --git a/app-ui/src/main/resources/app/logo.png b/app-ui/src/main/resources/app/logo.png deleted file mode 100644 index e5ffb8ab..00000000 Binary files a/app-ui/src/main/resources/app/logo.png and /dev/null differ diff --git a/app-ui/src/main/resources/app/mercury_logo.pdn b/app-ui/src/main/resources/app/mercury_logo.pdn deleted file mode 100644 index 9290b5fd..00000000 Binary files a/app-ui/src/main/resources/app/mercury_logo.pdn and /dev/null differ diff --git a/app-ui/src/main/resources/app/paypal.png b/app-ui/src/main/resources/app/paypal.png index 2ee6b569..5d51eff7 100644 Binary files a/app-ui/src/main/resources/app/paypal.png and b/app-ui/src/main/resources/app/paypal.png differ diff --git a/app-ui/src/main/resources/app/reload.gif b/app-ui/src/main/resources/app/reload.gif deleted file mode 100644 index 9408387f..00000000 Binary files a/app-ui/src/main/resources/app/reload.gif and /dev/null differ diff --git a/app-ui/src/main/resources/app/rw-resize.png b/app-ui/src/main/resources/app/rw-resize.png deleted file mode 100644 index d7b22fe6..00000000 Binary files a/app-ui/src/main/resources/app/rw-resize.png and /dev/null differ diff --git a/app-ui/src/main/resources/app/standard-mode.png b/app-ui/src/main/resources/app/standard-mode.png deleted file mode 100644 index c7afdb88..00000000 Binary files a/app-ui/src/main/resources/app/standard-mode.png and /dev/null differ diff --git a/app-ui/src/main/resources/app/supertrade-mode.png b/app-ui/src/main/resources/app/supertrade-mode.png deleted file mode 100644 index ebbf1f60..00000000 Binary files a/app-ui/src/main/resources/app/supertrade-mode.png and /dev/null differ diff --git a/app-ui/src/main/resources/app/timer-pause.png b/app-ui/src/main/resources/app/timer-pause.png deleted file mode 100644 index e04474ef..00000000 Binary files a/app-ui/src/main/resources/app/timer-pause.png and /dev/null differ diff --git a/app-ui/src/main/resources/app/timer-play.png b/app-ui/src/main/resources/app/timer-play.png deleted file mode 100644 index b3461f7f..00000000 Binary files a/app-ui/src/main/resources/app/timer-play.png and /dev/null differ diff --git a/app-ui/src/main/resources/app/timer-reset.png b/app-ui/src/main/resources/app/timer-reset.png deleted file mode 100644 index eea401c0..00000000 Binary files a/app-ui/src/main/resources/app/timer-reset.png and /dev/null differ diff --git a/app-ui/src/main/resources/app/timer-stop.png b/app-ui/src/main/resources/app/timer-stop.png deleted file mode 100644 index 65d39f02..00000000 Binary files a/app-ui/src/main/resources/app/timer-stop.png and /dev/null differ diff --git a/app-ui/src/main/resources/app/timer.png b/app-ui/src/main/resources/app/timer.png deleted file mode 100644 index bceeb2cd..00000000 Binary files a/app-ui/src/main/resources/app/timer.png and /dev/null differ 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 e2572952..dc762584 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.1.6.1", + "version":"1.0.1.7.0", "notes":[ { - "title" : "Hotfix", - "text" : "Overseer:\n- Fixed a bug with tracker not working properly with multiple simultanious key presses.\n- Fixed a bug with components not being removed properly.\n- Improved the icon selection dialog performance.\n- Now you can bind left/midle/right mouse buttons as a hotkey.\n\nThanks for your fast feedback and support. New features are coming soon!", + "title" : "Update", + "text" : "More than 5000 unique users this week! Here is an update for you!\n-Completely reworked Settings GUI.\n-All the issues with non-English keyboard layouts should be gone. Also now you can bind absolutely any mouse / keyboard button you have.\n-Fixed an issue when you couldn't close Notification panel.\n-Now components are cleaned up properly on a profile switch.\nCheck out the Overseer channel on Discord - post your setups, share profiles and converse!\n\nStay with us as there are more mind-blowing features to come. And don't forget to support the app, judging from all the activity looks like it's probably worth some!", "image" : "", "layout" : "VERTICAL" } diff --git a/pom.xml b/pom.xml index b0d4db48..2c20f0eb 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ 1.0.0.5 - 3.1 + 2.0.2 4.4.0 2.5 4.12 @@ -42,16 +42,16 @@ - - lc.kra.system - system-hook - ${systemhook.version} - net.jodah expiringmap ${expiringmap.version} + + com.1stleg + jnativehook + ${jnativehook.version} + net.java.dev.jna jna @@ -144,16 +144,6 @@ - - - system-hook-mvn-repo - https://raw.github.com/kristian/system-hook/mvn-repo/ - - true - always - - -