Commit Graph

398 Commits

Author SHA1 Message Date
delvh
c529e8df9e
Merge branch 'develop' into f/enhanced_UI 2020-06-26 20:18:00 +02:00
delvh
a57f14aca3 Merge branch 'f/enhanced_UI' of git@github.com:informatik-ag-ngl/envoy-client.git into f/enhanced_UI 2020-06-26 17:33:49 +02:00
delvh
86e8b4b139 Added display of settings-icon for the settings button
additionally modified margin of elements in ChatScene
2020-06-26 17:33:32 +02:00
c2309fe171 Prevent groups from being stored in the user database
This only affects top-level map entries. Groups that are contacts of the
client user are still persisted.
2020-06-26 16:37:00 +02:00
dad05449cf Fix double status increment on cached message relay 2020-06-26 09:28:48 +02:00
295e2a8596 Display correct contact status on startup
Fixes #152
2020-06-26 09:08:41 +02:00
delvh
e4a8ef4210
Fixed small formatting error 2020-06-25 12:32:57 +02:00
delvh
29a667389d
Apply suggestions from code review
Co-authored-by: CyB3RC0nN0R <CyB3RC0nN0R@users.noreply.github.com>
2020-06-25 11:19:59 +02:00
delvh
bbd5f61486 Apply suggestions from @CyB3RC0nN0R's code review 2020-06-25 11:17:25 +02:00
delvh
d80bc39221 Merge remote-tracking branch 'origin/develop' into f/enhanced_UI 2020-06-25 10:45:37 +02:00
4e9702a691 Clear repeat password field when unequal passwords are entered 2020-06-25 10:21:27 +02:00
cde91a77ef Stop clearing password fields, remove prompt text 2020-06-25 07:49:45 +02:00
delvh
a823029c07 Improved message coloring, messageStatus display only for own messages
additionally loaded the message status icons smaller and (visually) hid
the vertical scrollbars (they can still be used, but cannot be seen).
Lastly checked all context menu functions for a NullPointerException, as
also no element can be selected when the context menu is created.
2020-06-23 23:32:31 +02:00
delvh
4ad61e3152 Added "Copy and Send" capability
additionally added context menu to delete a contact, currently without
function
2020-06-23 18:32:34 +02:00
delvh
e347c2fae1 Merge remote-tracking branch 'origin/develop' into f/enhanced_UI 2020-06-23 17:27:02 +02:00
743a7a1c34 Merge branch 'develop' into f/compatibility_verification
Conflicts:
	src/main/java/envoy/client/net/Client.java
	src/main/java/envoy/client/net/MessageStatusChangeEventProcessor.java
	src/main/java/envoy/client/ui/Startup.java
	src/main/java/envoy/client/ui/controller/ChatScene.java
	src/main/java/envoy/client/ui/controller/ContactSearchScene.java
	src/main/java/envoy/client/ui/controller/GroupCreationScene.java
	src/main/java/envoy/client/ui/controller/LoginScene.java
2020-06-23 08:43:20 +02:00
delvh
d47a99d637 Added a context menu to the message list and ability to copy a message
context menu contains a few menu items that will be populated with
functionality later on.
2020-06-22 22:51:10 +02:00
delvh
9e886c3f45 Added alignment and coloring of messages according to who is the sender
additionally added:
- the label on top of the ChatScene now displays the own users name
- the messageList now scrolls to the bottom when a message is
created/received
2020-06-22 20:53:44 +02:00
delvh
6eb91244cc
Merge pull request #149 from informatik-ag-ngl/f/visually_pleasing_experience
Improved general appearance of Envoy, both in FXML and CSS
2020-06-21 17:40:57 +02:00
256a5ac210 Move user status color to CSS, refactor ContactListCell 2020-06-21 17:25:24 +02:00
delvh
b23ee61506 Moved remainingCharsLabel styling from code to CSS 2020-06-21 17:04:27 +02:00
delvh
e6745da7d8
Merge pull request #147 from informatik-ag-ngl/b/postbutton_bug_and_logging
Fixed postButton - bug and improved logging
2020-06-21 16:25:45 +02:00
c916c3c22c
Merge pull request #146 from informatik-ag-ngl/f/single_file_local_db
Store user specific local database information inside a single file
2020-06-21 07:12:23 +00:00
delvh
f073b6e397
Fixed error caused by my own stupidity 2020-06-20 22:42:44 +02:00
delvh
549198f242
Apply suggestions from code review
Reworded the suggestions slightly
2020-06-20 22:29:32 +02:00
0b28424bd4 Shorten event names, compatibility verification 2020-06-20 11:00:58 +02:00
delvh
dda9e8ee25 Fixed incorrect logger statement
No one needs redundancy in a logging statement, right?

Co-authored-by: CyB3RC0nN0R <CyB3RC0nN0R@users.noreply.github.com>
2020-06-19 17:07:33 +02:00
delvh
cfd323725f Improved general appearance of Envoy 2020-06-18 22:20:34 +02:00
delvh
b8f0bba8a7
Merge branch 'develop' into b/postbutton_bug_and_logging 2020-06-14 16:18:02 +02:00
delvh
7744d382b1 Applying suggestions from code review 2 2020-06-14 16:11:46 +02:00
delvh
4071487048
Apply suggestions from code review
Co-authored-by: CyB3RC0nN0R <CyB3RC0nN0R@users.noreply.github.com>
2020-06-14 16:03:02 +02:00
delvh
6dda2cce71 Fixed multiple bugs concerning enterToSend and the postButton 2020-06-13 22:38:49 +02:00
delvh
753791e8c9 Added improved logging capabilities 2020-06-13 22:36:52 +02:00
deff9d642b Store user specific local database information inside a single file
Closes #141
2020-06-13 18:46:41 +02:00
2a26ce0cad
Reformat a logger statement
Co-authored-by: delvh <dev.lh@web.de>
2020-06-13 17:00:44 +02:00
02ca6960f7 Reading the current chat if it changes or a message is received
Closes #144
2020-06-12 10:54:55 +02:00
DieGurke
40a38e77dd
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
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