Commit Graph

604 Commits

Author SHA1 Message Date
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
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
e420c7a3cb Fixed error not showing envoy icon in README.md 2020-06-25 13:02:04 +02:00
e4a8ef4210 Fixed small formatting error 2020-06-25 12:32:57 +02:00
29a667389d Apply suggestions from code review
Co-authored-by: CyB3RC0nN0R <CyB3RC0nN0R@users.noreply.github.com>
2020-06-25 11:19:59 +02:00
bbd5f61486 Apply suggestions from @CyB3RC0nN0R's code review 2020-06-25 11:17:25 +02:00
d80bc39221 Merge remote-tracking branch 'origin/develop' into f/enhanced_UI 2020-06-25 10:45:37 +02:00
9dc8ad5ca0 Merge pull request #153 from informatik-ag-ngl/b/annoying_registration
Make Registration less annoying
2020-06-25 08:42:34 +00: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
ba957e5f08 Fixed small bug making text of vertical scrollbar disappear 2020-06-23 23:40:18 +02:00
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
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
e347c2fae1 Merge remote-tracking branch 'origin/develop' into f/enhanced_UI 2020-06-23 17:27:02 +02:00
89539c3b93 Merge pull request #150 from informatik-ag-ngl/f/compatibility_verification
Shorten event names, compatibility verification
2020-06-23 06:47:46 +00: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
2e844ea688 Change envoy-common dependency back to the develop branch 2020-06-23 08:28:39 +02:00
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
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
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
19fe3a2830 Selected items will now be visually displayed 2020-06-21 17:36:08 +02:00
256a5ac210 Move user status color to CSS, refactor ContactListCell 2020-06-21 17:25:24 +02:00
b23ee61506 Moved remainingCharsLabel styling from code to CSS 2020-06-21 17:04:27 +02:00
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
f073b6e397 Fixed error caused by my own stupidity 2020-06-20 22:42:44 +02:00
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
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
d20d72f6e2 Fixed invisibility bug 2020-06-19 16:57:20 +02:00
cfd323725f Improved general appearance of Envoy 2020-06-18 22:20:34 +02:00
b1aeab06d1 Create CODEOWNERS 2020-06-15 12:16:25 +02:00
b8f0bba8a7 Merge branch 'develop' into b/postbutton_bug_and_logging 2020-06-14 16:18:02 +02:00
7744d382b1 Applying suggestions from code review 2 2020-06-14 16:11:46 +02:00
4071487048 Apply suggestions from code review
Co-authored-by: CyB3RC0nN0R <CyB3RC0nN0R@users.noreply.github.com>
2020-06-14 16:03:02 +02:00
db38d6f609 Merge pull request #145 from informatik-ag-ngl/f/read_status
Reading the current chat if it changes or a message is received
2020-06-14 14:18:44 +02:00
6dda2cce71 Fixed multiple bugs concerning enterToSend and the postButton 2020-06-13 22:38:49 +02:00
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
2261e3713c Merge pull request #143 from informatik-ag-ngl/f/groups
Group Creation and working MessageStatus delivery (NO READ)
2020-06-13 14:44:28 +02:00
a8b35418d3 Added ReceivedGroupMessageProcessor
Receiving groupMessages works now properly(only if online)
2020-06-13 10:40:47 +02:00
ee79ef1c66 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
02ca6960f7 Reading the current chat if it changes or a message is received
Closes #144
2020-06-12 10:54:55 +02:00
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
02d0917967 Adjusted pom.xml 2020-06-11 13:39:38 +02:00
5466602a33 Fixed issue reagarding missing chats 2020-06-11 13:21:16 +02:00