Commit Graph

463 Commits

Author SHA1 Message Date
DieGurke
5466602a33 Fixed issue reagarding missing chats 2020-06-11 13:21:16 +02:00
DieGurke
b8e001bf54 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
4e2e47600b Merged branch 'develop' into f/groups
Contains several bug fixes
2020-06-10 22:23:59 +02:00
c839ef01ba Add received messages to their chat 2020-06-10 13:05:44 +02:00
9dade2cf77 Properly override updateItem method of list cells 2020-06-10 11:33:49 +02:00
367a690dc8 Replace UserStatusChangeProcessor with inline code in ChatScene 2020-06-10 11:22:36 +02:00
46f8b1e767 Adjust stage size after changing the scene 2020-06-10 10:05:25 +02:00
delvh
8ba718f7b1 Fixed visual issues as per @delvh 's request 2020-06-09 22:24:09 +02:00
DieGurke
a4cc753d85 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
b953586859 Added (currently useless) comboBox to change your status 2020-06-09 21:03:19 +02:00
delvh
d0d86fc0d4 Added color display of user statuses 2020-06-09 20:42:17 +02:00
delvh
0661838c38 Fixed bug automatically sending a message when ctrl is being pressed 2020-06-09 17:11:17 +02:00
ebb7a48e8e Process ContactOperationEvent 2020-06-09 17:06:40 +02:00
0efd57f2ef Rename UserListCell to ContactListCell 2020-06-09 15:49:11 +02:00
bc17203367 Ask user before adding a contact 2020-06-09 15:41:01 +02:00
d03bbb6f5e Implemented contact removal operation (untested) 2020-06-09 14:21:11 +02:00
72354b3678 Fix user list in offline mode 2020-06-09 14:12:27 +02:00
7f6f538849 Display message date and status 2020-06-09 11:36:38 +02:00
ca029d9e13 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
c0d814ed38 Converted the login dialog into a scene 2020-06-08 11:58:57 +02:00
delvh
4d20e97f25 Fixed bug invalidating enterToSend option 2020-06-08 10:48:33 +02:00
232439a564 Move scene controllers to separate package 2020-06-08 10:36:30 +02:00
0372c1393e Add theme selection in settings 2020-06-08 10:02:39 +02:00
4123abf24f 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
0ba46f6d46 Fix minor error when popping the last scene 2020-06-08 08:45:15 +02:00
delvh
63dc01534d 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
eda6ea8cd2 Implemented ContactSearchScene completely
additionally added default keyboard shortcuts for all buttons
2020-06-07 20:46:04 +02:00
9d7cad5a3b Add offline mode check box and connection label to login dialog 2020-06-07 17:03:02 +02:00
1689896f42 Fix offline mode and local DB initialization 2020-06-07 16:26:54 +02:00
delvh
778a05bdda Improved visual appearance of ChatScene
Additionally added minimum height of application and basic
ContactSearchScene.fxml file.
2020-06-06 18:33:24 +02:00
4bcc79535a Externalized scene loading and management into SceneContext 2020-06-06 18:30:09 +02:00
c52982e196 Fix condition for posting messages 2020-06-06 15:29:29 +02:00
f0a8b303d5 Cleanup and Reformatting 2020-06-06 15:03:43 +02:00
6ffa144daf Load JavaFX Images in IconUtil, display Envoy logo 2020-06-06 12:27:10 +02:00
0dece66542 Add proper layout to ChatWindow, fix user field selection in LoginDialog 2020-06-06 12:27:10 +02:00
delvh
11314f9ba9 Added ability to load CSS files 2020-06-06 12:27:10 +02:00
df47a2ca48 Remove ui.primary package 2020-06-06 12:27:10 +02:00
delvh
ff9dbee2f0 added fundamental css files, theoretically added css support 2020-05-09 10:57:30 +02:00
delvh
7d8b242099
Merge branch 'f/javafx' into f/settings 2020-04-19 22:24:37 +02:00
delvh
0b3a1a5e58 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
ee6e408499 created ui.settings package 2020-04-19 19:57:40 +02:00
f3ab609d97 Fixed settings pane selection 2020-04-18 21:37:44 +02:00
delvh
828673d00c added inelegant capability to switch scenes 2020-04-18 19:46:04 +02:00
621d07a300 Added SettingsToggleButton 2020-04-18 16:04:47 +02:00
0e75bdd057 Added GeneralSettingsPane, added JavaFX support in SettingsItem
Also removed the old settings ui components.
2020-04-18 12:03:32 +02:00
7023562add Added SettingsScene selection infrastructure 2020-04-18 11:03:06 +02:00
delvh
13a7a38deb Fixed bug duplicating messages 2020-04-18 10:34:03 +02:00
eb55e8e86b Replaced TimeLimitExceededException by TimeoutException
This allows the removal of the java.naming module dependency.
2020-04-10 21:57:05 +02:00
225fa0de2e Added a rudimentary settings scene with an empty controller 2020-04-10 21:52:19 +02:00
78f14ffcb4 Moved all FXML files to the resource folder 2020-04-10 21:26:24 +02:00
01a5a95adf Grouping JavaFX package import statements 2020-04-10 21:05:08 +02:00
488d878a0c
Merge pull request #132 from informatik-ag-ngl/f/login_dialog
JavaFX LoginDialog
2020-04-10 20:44:46 +02:00
c7e52c91ba Implemented review recommendations 2020-04-10 20:42:20 +02:00
a0004e53c6 Using dialog buttons instead of custom ones 2020-04-10 17:07:27 +02:00
647aae72c6 Completed LoginDialog implementation except for closing the dialog 2020-04-10 16:18:01 +02:00
2b09a2dbde Moved the LoginDialogController class inside the LoginDialog class 2020-04-10 11:01:03 +02:00
delvh
0c5b74b976 Performed updating of the UI on the UI thread 2020-04-09 22:30:24 +02:00
delvh
6643cbeb3f slightly adapted some logging messages 2020-04-06 22:55:59 +02:00
0b05d54953 Added JavaFX login dialog scene 2020-04-06 15:08:00 +02:00
delvh
ba67af613d restored compatibility with envoy common (and envoy server standalone) 2020-04-02 22:03:43 +02:00
delvh
9460b224b9
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
5314a12ff3 Removed most Swing components 2020-03-31 21:54:56 +02:00
94dbf0481b Wrapping data into ObservableList instances instead of copying it 2020-03-30 21:27:07 +02:00
dbf944b5cb Copied event listeners from ChatWindow to ChatSceneController 2020-03-29 22:15:05 +02:00
00ce296812 Fixed chat loading from LocalDB into messagList 2020-03-29 09:16:29 +02:00
561222ac29 Added user and message loading and message posting 2020-03-28 15:32:24 +01:00
cace49bd68 Added custom list cells for the user and message list views 2020-03-28 10:39:15 +01:00
31b032eb08 Started moving Startup contents into the new Startup class 2020-03-27 21:14:49 +01:00
3a9fa365b4 Set Envoy logo as stage icon 2020-03-26 21:01:42 +01:00
5cd5d516c0 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
2df220f6c3 Renamed every identifier according to new convention 2020-03-26 16:06:18 +01:00
delvh
c5a6978a85 Renamed classes with a two-letter initialism according to convention 2020-03-24 18:38:47 +01:00
37f5a1c549 Normalized since tags to fit envoy-common and envoy-server
Envoy vXXX -> Envoy Client vXXX
2020-03-23 21:52:59 +01:00
delvh
3e48d58628 Added theme support for ContextMenu 2020-03-23 21:35:55 +01:00
ec341e8518 Finalized forwarding UI 2020-03-23 21:28:00 +01:00
delvh
930da62b79 Added renderer to ContactsChooserDialog 2020-03-23 21:04:32 +01:00
delvh
ceb50cd01c Added disabling of postButton while String.isBlank() returns true 2020-03-22 17:20:05 +01:00
delvh
156beaf44b Fixes #121 (first displayed theme is current theme)
Additionally removed okButton from SettingsScreen
2020-03-22 17:05:28 +01:00
delvh
68c7344137 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
8c55f67eb0 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
2eefaaf862 Revised the rendering and selection mechanism in ComponentList 2020-03-21 16:10:59 +01:00
bc30e5cb38 Extracted MessageComponent from MessageListRenderer 2020-03-21 13:20:45 +01:00
7dfeab5835 Adjusted ChatWindow and ContactsChooserDialog to new interface 2020-03-20 18:32:57 +01:00
f5ddadf4d0 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
6d6397cfd4 Unrelated cleanup in UserComponentListRenderer 2020-03-19 21:52:06 +01:00
delvh
ad59fe0958 added missing merge content,mnemonics support(ContextMenu)and Nullchecks 2020-03-18 22:13:58 +01:00
delvh
a6b6a68a56 Merged current working status of f/icon_util into f/forward__messages
* added ContextMenu
* added ContactsChooserDialog
2020-03-18 08:03:35 +01:00
0007caa6f0 Added Javadoc to IconUtil 2020-03-17 12:45:50 +01:00
f10556ac44 Fixed message list dimension 2020-03-17 12:35:31 +01:00
DieGurke
ea75636e7f Changed bgc of testArea and played on pref size of list and scrollPane 2020-03-17 12:11:59 +01:00
DieGurke
2de64956e4 Minimum size of application and added forward and settings icons 2020-03-17 11:20:45 +01:00
5f2b05dcce Cleanup 2020-03-17 11:08:58 +01:00
ba222deec9 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
6a2cb38bd2 Working on message scaling 2020-03-17 09:37:19 +01:00
42feefdbd5 Working on line wrapping and message height (borders currently broken) 2020-03-16 21:49:02 +01:00
DieGurke
561f16f261 Message displaying
Implemented message status icons and revised message displaying
(unfinished)
2020-03-16 19:08:26 +01:00
6873c136c3 Added IconUtil utility class 2020-03-16 14:30:14 +01:00
delvh
98b82d74d0 fixed minor inconveniences 2020-03-16 11:21:41 +01:00
delvh
1fb4ddaa47 implemented UserComponentListRenderer 2020-03-15 19:11:02 +01:00
delvh
432a58330b Added multiple selection capability to the component list 2020-03-15 18:55:07 +01:00
delvh
819f0ec4f2 Implemented method to forward a message 2020-03-14 22:44:03 +01:00
delvh
384329d00d Created packages ui.renderer and ui.primary 2020-03-14 21:34:17 +01:00
delvh
99441b770f added newline at EOF for any file not having one at its end 2020-03-14 19:59:37 +01:00
b46bfd1181 Fixed NullPointerException caused by ComponentListModel 2020-03-14 17:10:11 +01:00
delvh
1fef10769f fixed typo 2020-03-14 17:04:51 +01:00
bd1563b439
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
198e81608b
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
9a81fc5b06
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
6ffec1a3e3
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
db0894dce9
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
531b35f6b7 Adjusted logging locations and levels 2020-02-18 16:34:14 +01:00
353a6dd646 Updated Javadoc in EnvoyLog 2020-02-18 16:10:33 +01:00
6dd1b40130 Adder EnvoyLog#attach(String) method to log specific packages 2020-02-18 08:14:04 +01:00
a7e9c70cfc Fixed logger level configuration, using logger hierarchy
Loggers are now created with a class object
2020-02-18 07:16:35 +01:00
7129e82038 Appended timestamp to log file names 2020-02-16 21:53:10 +01:00
6e211a01a1 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
84fd222956 Fixed entering offline mode 2020-02-12 22:22:29 +01:00
b3101e2418 Performing handshake and online init in LoginDialog 2020-02-12 17:31:20 +01:00
9498bf216d Split Client#onlineInit method up into performHandshake and initReceiver 2020-02-12 07:53:24 +01:00
511146c98e Clean-up, moved Settings and SettingsItem into the data package 2020-02-12 07:12:22 +01:00
001b847155
Merge branch 'develop' into f/invalid_login 2020-02-12 06:41:02 +01:00
836f0c39b8 Removed event handler casts, simplified logging statements 2020-02-12 06:12:04 +01:00
8667409413 Cleanup, fixed offline cache relay when starting in offline mode 2020-02-11 19:35:23 +01:00
DieGurke
5a718aa1c9 Implemented contact list update 2020-02-11 18:15:15 +01:00
c0954036a5 Adjusted to event system refactoring 2020-02-11 17:17:22 +01:00
84fb28cb34
Merge branch 'develop' into f/contacts 2020-02-11 10:06:06 +01:00
DieGurke
fa4cc8d6d9 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
78d8c08573 Refactored to the new contact related classes in envoy-common 2020-02-10 22:31:40 +01:00
DieGurke
a93539ea06 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
eb00c1f389 Commented out the localDb client update stuff (temporary) 2020-02-09 22:15:15 +01:00
delvh
0257db8449 fixed Javadoc error. Current implementation is NOT working! 2020-02-09 20:48:08 +01:00
delvh
6582e88a02 Added handling of incorrect logins 2020-02-09 20:43:12 +01:00
DieGurke
7a2544bab6 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
79da5e6979 Implemented ContactRenderer and built a properScrollPane with list, etc. 2020-02-08 11:43:37 +01:00
1fc85fe4fa Fixed threading issue when receiving unread messages 2020-02-08 11:43:02 +01:00
delvh
8b9b0d63c7 Redesigned UserStatusChangeProcessor to please @CyB3RC0nN0R s wishes 2020-02-07 15:57:41 +01:00
delvh
f9ce464aaa
added newline at the end of UserStatusChangeProcessor file 2020-02-07 15:43:33 +01:00
delvh
778e76faa7
added newline at the end of Client file 2020-02-07 15:41:17 +01:00
delvh
ead2eab5a0 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
fc57e39c8f
Fixed Javadoc errors 2020-02-07 13:44:09 +01:00
581f2d9cdf Added logging statement to WriteProxy#flushCache() 2020-02-07 09:39:15 +01:00
DieGurke
5ed8c162bb Implemented advanced UI 2020-02-06 22:19:33 +01:00
abd02b2c6f Implemented login through command line arguments
* Moved Config and ConfigItem to data package
* Added mandatory property to ConfigItem
* Added user and password ConfigItems to Config
2020-02-06 22:17:14 +01:00
fe6cc9f464 Persisting cache in PersistentLocalDb 2020-02-06 21:42:17 +01:00
3f7544cea3 Integrated WriteProxy into the sending process 2020-02-06 21:28:02 +01:00
0646445d3c Added WriteProxy with creation method in Client, added caches to LocalDb 2020-02-06 21:03:08 +01:00
6bbd6936e0 Replaced MessageCache by Cache<T>
This class will be used to implement the offline cache for both messages
and events.
2020-02-06 18:35:05 +01:00
f80fd5069c Renamed database package to data, moved Chat to data package 2020-02-05 20:58:30 +01:00
19fafc4c38 Fixed UI update after message status changes 2020-02-05 20:08:24 +01:00
DieGurke
9e024ede09 Reading current chat when a new message is received 2020-02-05 17:23:30 +01:00