Commit Graph

474 Commits

Author SHA1 Message Date
delvh
c162376589 Merge branch 'develop' into b/postbutton_bug_and_logging 2020-06-14 16:18:02 +02:00
delvh
092caaef9f Applying suggestions from code review 2 2020-06-14 16:11:46 +02:00
delvh
2653ec5fee Apply suggestions from code review
Co-authored-by: CyB3RC0nN0R <CyB3RC0nN0R@users.noreply.github.com>
2020-06-14 16:03:02 +02:00
delvh
3960f955d8 Fixed multiple bugs concerning enterToSend and the postButton 2020-06-13 22:38:49 +02:00
delvh
9bf28acfcb Added improved logging capabilities 2020-06-13 22:36:52 +02:00
c87ab7c9e1 Store user specific local database information inside a single file
Closes #141
2020-06-13 18:46:41 +02:00
ec923b5620 Reformat a logger statement
Co-authored-by: delvh <dev.lh@web.de>
2020-06-13 17:00:44 +02:00
DieGurke
7a11b556d9 Added ReceivedGroupMessageProcessor
Receiving groupMessages works now properly(only if online)
2020-06-13 10:40:47 +02:00
DieGurke
8826d0c3d3 Added support for sending groupMessages
* Implemented distinguishing between regular messages and groupMessages
when sending messages to the server (and sends the right object
obviously)
2020-06-12 23:50:52 +02:00
6c7a80c708 Reading the current chat if it changes or a message is received
Closes #144
2020-06-12 10:54:55 +02:00
DieGurke
1a8c7dcfea Update src/main/java/envoy/client/ui/controller/GroupCreationScene.java
Co-authored-by: CyB3RC0nN0R <CyB3RC0nN0R@users.noreply.github.com>
2020-06-11 15:06:59 +02:00
DieGurke
7025cabd2f Fixed issue reagarding missing chats 2020-06-11 13:21:16 +02:00
DieGurke
c2a627529a MessageStatusChangeEventCache
Added a cache storing all messageStatusChangeEvents received during
handshake just like the already existing cache for received messages
during the handshake
This new cache is needed because the functionality regarding the pending
messages (and now messageStatusChanges as well) has changed!
2020-06-10 22:50:09 +02:00
DieGurke
3439aee112 Merged branch 'develop' into f/groups
Contains several bug fixes
2020-06-10 22:23:59 +02:00
f876f4e05c Add received messages to their chat 2020-06-10 13:05:44 +02:00
d14cc47365 Properly override updateItem method of list cells 2020-06-10 11:33:49 +02:00
8a3ffec859 Replace UserStatusChangeProcessor with inline code in ChatScene 2020-06-10 11:22:36 +02:00
c228519d4b Adjust stage size after changing the scene 2020-06-10 10:05:25 +02:00
delvh
d6e12df076 Fixed visual issues as per @delvh 's request 2020-06-09 22:24:09 +02:00
DieGurke
54bbed4a54 Added Group Creation Functionality
* Implemented new group creation scene (fxml)
* Added group creation controller
* Adjusted contact search scene (fxml)
2020-06-09 21:22:45 +02:00
delvh
3e0b73ef12 Added (currently useless) comboBox to change your status 2020-06-09 21:03:19 +02:00
delvh
77f3db0ba3 Added color display of user statuses 2020-06-09 20:42:17 +02:00
delvh
9a6214eb82 Fixed bug automatically sending a message when ctrl is being pressed 2020-06-09 17:11:17 +02:00
fc4fb4cdae Process ContactOperationEvent 2020-06-09 17:06:40 +02:00
4835cc68fb Rename UserListCell to ContactListCell 2020-06-09 15:49:11 +02:00
3d71cda884 Ask user before adding a contact 2020-06-09 15:41:01 +02:00
bec49ff9e8 Implemented contact removal operation (untested) 2020-06-09 14:21:11 +02:00
ab626d3226 Fix user list in offline mode 2020-06-09 14:12:27 +02:00
cb3913d95d Display message date and status 2020-06-09 11:36:38 +02:00
c694247a4c Merge branch 'f/javafx' of https://github.com/informatik-ag-ngl/envoy-client.git into f/javafx 2020-06-08 12:00:17 +02:00
933232e2a4 Converted the login dialog into a scene 2020-06-08 11:58:57 +02:00
delvh
7b480bbbc8 Fixed bug invalidating enterToSend option 2020-06-08 10:48:33 +02:00
e576877943 Move scene controllers to separate package 2020-06-08 10:36:30 +02:00
1761044e9e Add theme selection in settings 2020-06-08 10:02:39 +02:00
5e73334e35 Remove Theme class and code related to it
This is a preparation for loading themes from CSS files.
2020-06-08 09:14:57 +02:00
6974d44958 Fix minor error when popping the last scene 2020-06-08 08:45:15 +02:00
delvh
a3add72838 Added elegant way of displaying remaining characters for a message
additionally FOUND (not fixed) a bug automatically posting a message
when ctrl is no longer pressed
2020-06-07 23:28:25 +02:00
delvh
a0e11d99ca Implemented ContactSearchScene completely
additionally added default keyboard shortcuts for all buttons
2020-06-07 20:46:04 +02:00
33abd461a5 Add offline mode check box and connection label to login dialog 2020-06-07 17:03:02 +02:00
2409c5b2f7 Fix offline mode and local DB initialization 2020-06-07 16:26:54 +02:00
delvh
9e7bde1d4d Improved visual appearance of ChatScene
Additionally added minimum height of application and basic
ContactSearchScene.fxml file.
2020-06-06 18:33:24 +02:00
ec72b6fc67 Externalized scene loading and management into SceneContext 2020-06-06 18:30:09 +02:00
4c79141e29 Fix condition for posting messages 2020-06-06 15:29:29 +02:00
5fd6fc77e1 Cleanup and Reformatting 2020-06-06 15:03:43 +02:00
16ae619f7d Load JavaFX Images in IconUtil, display Envoy logo 2020-06-06 12:27:10 +02:00
ca9b72b1de Add proper layout to ChatWindow, fix user field selection in LoginDialog 2020-06-06 12:27:10 +02:00
delvh
fa42516c6f Added ability to load CSS files 2020-06-06 12:27:10 +02:00
50a9026b01 Remove ui.primary package 2020-06-06 12:27:10 +02:00
delvh
067cbbdcf8 added fundamental css files, theoretically added css support 2020-05-09 10:57:30 +02:00
delvh
37dd1dc02c Merge branch 'f/javafx' into f/settings 2020-04-19 22:24:37 +02:00
delvh
5c4356f1e7 Readded enterToSend-Capability, ToggleButtons display current value
additionally added developer comments (most important feature of
v0.1-beta!).
2020-04-19 22:22:13 +02:00
delvh
aba51abc10 created ui.settings package 2020-04-19 19:57:40 +02:00
55bea0d846 Fixed settings pane selection 2020-04-18 21:37:44 +02:00
delvh
970f190389 added inelegant capability to switch scenes 2020-04-18 19:46:04 +02:00
e4e903b8bf Added SettingsToggleButton 2020-04-18 16:04:47 +02:00
2cba9352df Added GeneralSettingsPane, added JavaFX support in SettingsItem
Also removed the old settings ui components.
2020-04-18 12:03:32 +02:00
f18525476e Added SettingsScene selection infrastructure 2020-04-18 11:03:06 +02:00
delvh
00edd59f97 Fixed bug duplicating messages 2020-04-18 10:34:03 +02:00
09f7f5482e Replaced TimeLimitExceededException by TimeoutException
This allows the removal of the java.naming module dependency.
2020-04-10 21:57:05 +02:00
935ee58c4b Added a rudimentary settings scene with an empty controller 2020-04-10 21:52:19 +02:00
3d1eec4ee0 Moved all FXML files to the resource folder 2020-04-10 21:26:24 +02:00
ee4fa78f38 Grouping JavaFX package import statements 2020-04-10 21:05:08 +02:00
b38700500e Merge pull request #132 from informatik-ag-ngl/f/login_dialog
JavaFX LoginDialog
2020-04-10 20:44:46 +02:00
873e2437c6 Implemented review recommendations 2020-04-10 20:42:20 +02:00
1e0722ac94 Using dialog buttons instead of custom ones 2020-04-10 17:07:27 +02:00
fb2f379dfc Completed LoginDialog implementation except for closing the dialog 2020-04-10 16:18:01 +02:00
7285375447 Moved the LoginDialogController class inside the LoginDialog class 2020-04-10 11:01:03 +02:00
delvh
de00601a2c Performed updating of the UI on the UI thread 2020-04-09 22:30:24 +02:00
delvh
d61cd8a36e slightly adapted some logging messages 2020-04-06 22:55:59 +02:00
840ec53277 Added JavaFX login dialog scene 2020-04-06 15:08:00 +02:00
delvh
5d76bbbcb0 restored compatibility with envoy common (and envoy server standalone) 2020-04-02 22:03:43 +02:00
delvh
487c6a6573 Added BASIC group capability (#128)
* Changed serialVersionUID everywhere to 0L

* Added support for GroupResizeEvents and NameChangeEvents

Co-authored-by: CyB3RC0nN0R <kske@outlook.de>
2020-04-02 09:23:47 +02:00
c12eac1cbc Removed most Swing components 2020-03-31 21:54:56 +02:00
b5fd690f43 Wrapping data into ObservableList instances instead of copying it 2020-03-30 21:27:07 +02:00
a29608c627 Copied event listeners from ChatWindow to ChatSceneController 2020-03-29 22:15:05 +02:00
67433275bd Fixed chat loading from LocalDB into messagList 2020-03-29 09:16:29 +02:00
bd0da338a7 Added user and message loading and message posting 2020-03-28 15:32:24 +01:00
a68a01b455 Added custom list cells for the user and message list views 2020-03-28 10:39:15 +01:00
0403729a63 Started moving Startup contents into the new Startup class 2020-03-27 21:14:49 +01:00
6e0b95384b Set Envoy logo as stage icon 2020-03-26 21:01:42 +01:00
c6d074b84a Prepare JavaFX integration
* Added JavaFX and FXML dependencies to pom.xml and module-info.java
* Added Startup Application
* Added ChatScene with ChatSceneController
2020-03-26 20:23:25 +01:00
delvh
364ec6f04e Renamed every identifier according to new convention 2020-03-26 16:06:18 +01:00
delvh
5c2abe7c1c Renamed classes with a two-letter initialism according to convention 2020-03-24 18:38:47 +01:00
86d437760d Normalized since tags to fit envoy-common and envoy-server
Envoy vXXX -> Envoy Client vXXX
2020-03-23 21:52:59 +01:00
delvh
3dd9884cd9 Added theme support for ContextMenu 2020-03-23 21:35:55 +01:00
31f9d5bcef Finalized forwarding UI 2020-03-23 21:28:00 +01:00
delvh
1dbc818019 Added renderer to ContactsChooserDialog 2020-03-23 21:04:32 +01:00
delvh
376c026b2a Added disabling of postButton while String.isBlank() returns true 2020-03-22 17:20:05 +01:00
delvh
f08a7a6f5e Fixes #121 (first displayed theme is current theme)
Additionally removed okButton from SettingsScreen
2020-03-22 17:05:28 +01:00
delvh
e4eaf7239c ContactsChooserDialog is now centered around a parent component
additionally:
* fixed bug not updating date color when changing themes
* improved style of forwardMessage-Methoden
2020-03-22 16:51:44 +01:00
delvh
08f6ee62ca Fixed bug adding a line break when sending via enter
* additionally merged full input of f/enhanced_component_list with the
current working state of f/forward_messages:
* implemented setting of colors (theming) for ContextMenu
* renamed messageTextColor to textColor
2020-03-21 19:26:11 +01:00
0a81273860 Revised the rendering and selection mechanism in ComponentList 2020-03-21 16:10:59 +01:00
a5e43db8de Extracted MessageComponent from MessageListRenderer 2020-03-21 13:20:45 +01:00
10f498ca03 Adjusted ChatWindow and ContactsChooserDialog to new interface 2020-03-20 18:32:57 +01:00
4c70702d02 Added SelectionMode enum to ComponentList, prepared integration
These changes are not ready to build yet, as ChatWindow and
ContactsChooserDialog have to be adjusted first.
2020-03-19 22:16:31 +01:00
0258e04612 Unrelated cleanup in UserComponentListRenderer 2020-03-19 21:52:06 +01:00
delvh
480961370c added missing merge content,mnemonics support(ContextMenu)and Nullchecks 2020-03-18 22:13:58 +01:00
delvh
24ce40c24a Merged current working status of f/icon_util into f/forward__messages
* added ContextMenu
* added ContactsChooserDialog
2020-03-18 08:03:35 +01:00
8bc8507feb Added Javadoc to IconUtil 2020-03-17 12:45:50 +01:00
1e11948e10 Fixed message list dimension 2020-03-17 12:35:31 +01:00
DieGurke
5b6f6bf058 Changed bgc of testArea and played on pref size of list and scrollPane 2020-03-17 12:11:59 +01:00
DieGurke
bb1cb6658e Minimum size of application and added forward and settings icons 2020-03-17 11:20:45 +01:00
a6865a5399 Cleanup 2020-03-17 11:08:58 +01:00
29d2eeaa7e Fixed horizontal message placement
This commit contains potentially unstable changes to ComponentList. If
the ListCellRenderer is not set, the class might behave in an unexpected
way.
2020-03-17 10:08:58 +01:00
461a395439 Working on message scaling 2020-03-17 09:37:19 +01:00
011e85c18e Working on line wrapping and message height (borders currently broken) 2020-03-16 21:49:02 +01:00
DieGurke
c9c2cd9f4d Message displaying
Implemented message status icons and revised message displaying
(unfinished)
2020-03-16 19:08:26 +01:00
e93cd8761f Added IconUtil utility class 2020-03-16 14:30:14 +01:00
delvh
2127018b58 fixed minor inconveniences 2020-03-16 11:21:41 +01:00
delvh
d0fded868e implemented UserComponentListRenderer 2020-03-15 19:11:02 +01:00
delvh
9ef9282432 Added multiple selection capability to the component list 2020-03-15 18:55:07 +01:00
delvh
b4e8a67b93 Implemented method to forward a message 2020-03-14 22:44:03 +01:00
delvh
9eaa9dc9d2 Created packages ui.renderer and ui.primary 2020-03-14 21:34:17 +01:00
delvh
4c94686172 added newline at EOF for any file not having one at its end 2020-03-14 19:59:37 +01:00
00e6d6c8a1 Fixed NullPointerException caused by ComponentListModel 2020-03-14 17:10:11 +01:00
delvh
b23c506d77 fixed typo 2020-03-14 17:04:51 +01:00
7f2c4d0519 Fixed state errors in offline mode (#116)
* Display all contacts as offline while in offline mode

* Update message status to sent after relaying message cache
2020-03-14 16:58:19 +01:00
delvh
349ffeaa25 Added the display of multi-line messages (#115)
* Added multi-line messages

* Added shutdown method for LoginDialog

* Fixed login bug in LoginDialog

* Added a maximum length for messages

* Implemented update of component list elements on resizing

* Improved visual appearance of some files
2020-03-14 11:17:43 +01:00
delvh
9896339f92 Changed compiler compliance to 11, modularized all packages (#114)
* added module- and package-info.java, changed JRE from 8 to 11

* updated maven from Java 1.8 to 11

Co-authored-by: CyB3RC0nN0R <kske@outlook.de>
2020-03-07 19:38:06 +01:00
930d1cebe1 Migrated configuration and logging to Envoy Common (#113)
* Moved client specific configuration to ClientConfig

* Finished ClientConfig integration, checking init state in EnvoyLog

* Migrated Config, ConfigItem and EnvoyLog to envoy-common

* Updated envoy-common dependency to develop-SNAPSHOT
2020-03-05 14:27:40 +01:00
69537d843d Added selection capability to ComponentList (#112)
* Fixed Javadoc error in EnvoyLog

* Added selection support to ComponentList using MouseListener injection

* Added selection support to MessageListRenderer

* Clearing selection when reselecting an already selected element
2020-02-22 19:01:47 +01:00
aaa6044ade Adjusted logging locations and levels 2020-02-18 16:34:14 +01:00
9c73289bda Updated Javadoc in EnvoyLog 2020-02-18 16:10:33 +01:00
c692fe25ff Adder EnvoyLog#attach(String) method to log specific packages 2020-02-18 08:14:04 +01:00
5f9ebd4c43 Fixed logger level configuration, using logger hierarchy
Loggers are now created with a class object
2020-02-18 07:16:35 +01:00
1b3ef2a712 Appended timestamp to log file names 2020-02-16 21:53:10 +01:00
18c693a6d6 Fixed error message layout in LoginDialog
Updated envoy-common dependency to v0.2-alpha in pom.xml
2020-02-13 10:11:25 +01:00
8c1cfedb2e Fixed entering offline mode 2020-02-12 22:22:29 +01:00
8714c8fe0e Performing handshake and online init in LoginDialog 2020-02-12 17:31:20 +01:00
17eeed0bfb Split Client#onlineInit method up into performHandshake and initReceiver 2020-02-12 07:53:24 +01:00
c697b099ee Clean-up, moved Settings and SettingsItem into the data package 2020-02-12 07:12:22 +01:00
c5389a6af4 Merge branch 'develop' into f/invalid_login 2020-02-12 06:41:02 +01:00
84e350c02e Removed event handler casts, simplified logging statements 2020-02-12 06:12:04 +01:00
48e1d791c6 Cleanup, fixed offline cache relay when starting in offline mode 2020-02-11 19:35:23 +01:00
DieGurke
577ee6364d Implemented contact list update 2020-02-11 18:15:15 +01:00
8a6f729abf Adjusted to event system refactoring 2020-02-11 17:17:22 +01:00
39d4cbd8ba Merge branch 'develop' into f/contacts 2020-02-11 10:06:06 +01:00
DieGurke
73ba6b0456 Small improvements
* Resettings the searchField after adding a contact and clearing the
contactsModel after adding a contact.

* Revised LoginDialoge UI
2020-02-10 23:21:06 +01:00
c90bbbc262 Refactored to the new contact related classes in envoy-common 2020-02-10 22:31:40 +01:00
DieGurke
128d5bec4a Updated client
* Updated ContactsRequest constructor to work with new versin of this
event.
*Implemented LocalDB updates when adding a contact and display it
immediately, so you can chat directly.
2020-02-10 19:51:50 +01:00
DieGurke
48a64b08f9 Commented out the localDb client update stuff (temporary) 2020-02-09 22:15:15 +01:00
delvh
d663f3ff8f fixed Javadoc error. Current implementation is NOT working! 2020-02-09 20:48:08 +01:00
delvh
d37ab53275 Added handling of incorrect logins 2020-02-09 20:43:12 +01:00
DieGurke
e8062be346 Adding contacts technical aspects
* Contact SearchResult from server is now getting processed and
correctly displayed.
* Sending a AddContact event to server, if button is pressed.
* Added several interface objects
2020-02-09 16:26:36 +01:00
DieGurke
90409c1d90 Implemented ContactRenderer and built a properScrollPane with list, etc. 2020-02-08 11:43:37 +01:00
e6c4139b4d Fixed threading issue when receiving unread messages 2020-02-08 11:43:02 +01:00
delvh
337c74ded1 Redesigned UserStatusChangeProcessor to please @CyB3RC0nN0R s wishes 2020-02-07 15:57:41 +01:00
delvh
f28d4e2e55 added newline at the end of UserStatusChangeProcessor file 2020-02-07 15:43:33 +01:00
delvh
278e7a8a0a added newline at the end of Client file 2020-02-07 15:41:17 +01:00
delvh
0aba82fd9f Added the UserStatusChangeProcessor and its implementation
this commit serves as solution to the merge conflict between
f/user_status_change_processor and develop
2020-02-07 15:27:26 +01:00