Commit Graph

525 Commits

Author SHA1 Message Date
3bcd40d49e Merge pull request #169 from informatik-ag-ngl/f/message_order
Fix message order with insertion method
2020-07-02 06:06:39 +00:00
7f536eacc6 Fix insertion of oldest message 2020-07-01 08:58:02 +02:00
c54e7085ce Fix message insertion into empty list and from sender 2020-07-01 08:45:39 +02:00
26a8650353 Fix message order with insertion method
Fixes #168
2020-07-01 08:36:21 +02:00
781dd3e68a Merge pull request #164 from informatik-ag-ngl/f/message_list
Wrap Text in ListCells
2020-06-27 18:20:01 +00:00
delvh
dee66458d9 Wrapped text in userList
(as suggested by @CyB3RC0nN0R)
It is nice to see that JavaFX is less prone to shittyness than Swing is.
2020-06-27 18:44:57 +02:00
delvh
08e5fad42b Fixed padding of status icon and implemented Tooltip
Additionally added commentary in MessageListCell.
2020-06-27 18:27:13 +02:00
1361c29d4f Bind message list cell width to message list width
Fixes #156
2020-06-27 17:36:42 +02:00
ad83d6d2d4 Display status for own messages instead of received ones 2020-06-27 17:14:07 +02:00
delvh
6754465aff Merge pull request #161 from informatik-ag-ngl/f/notify_user_of_empty_IDGenerator
Notify user of empty IDGenerators
Added:
    automatically disabled user of posting after that condition is reached
    an infoLabel used to communicate some events with the user
    (in parts) a new UI design
    cleaned up Envoy client: no more <br><br>, is now <p>
    deleted annoying alert notifying me that I'm offline
2020-06-27 11:31:56 +02:00
delvh
3aace6d255 Merge branch 'develop' into f/notify_user_of_empty_IDGenerator 2020-06-27 11:25:49 +02:00
5eea90ce68 Merge pull request #160 from informatik-ag-ngl/b/user_name_validation
Contact Name Validation
2020-06-27 09:22:03 +00:00
f5526aad43 Merge pull request #162 from informatik-ag-ngl/b/unnecessary_IOException
Removed unnecessary IOException in IconUtil
2020-06-27 09:12:18 +00:00
delvh
5c086630f6 Removed unnecessary IOException in IconUtil
This is a normal @CyB3RC0nN0R commit: Adding functionality by deleting
code.
2020-06-27 11:03:30 +02:00
c1a1030864 Rename groupNameBar to groupNameField 2020-06-27 09:48:41 +02:00
743ef8ab45 Validate group name and size on creation 2020-06-27 09:36:59 +02:00
delvh
78b560cddd Made postingPermanentlyDisabled further idiot-proof
Additionally deleted annoying alert notifying me that I'm offline.
2020-06-27 09:34:30 +02:00
55066f2cb8 Validate user name during login and registration 2020-06-27 08:25:37 +02:00
delvh
3e4e7a1a40 Cleaned up Envoy client: no more <br><br>, is now <p>
...and some other funny mistakes found in Javadoc
2020-06-26 23:36:14 +02:00
delvh
90df627831 Implemented notification of user if he can no longer send messages
This only occurs when he is in offline mode and runs out of messageIDs
to use.
Additionally implemented:
- automatically disabled user of posting after that condition is reached
- an infoLabel used to commjunicate some events with the user
- (in parts) a new UI design
2020-06-26 23:16:03 +02:00
delvh
961527e663 Merge pull request #154 from informatik-ag-ngl/f/enhanced_UI
added:
    - alignment and coloring of messages according to sender
    - context menu for userList messageList and postButton (partially without function currently) -> implemented copying as well as "CopyAndSend" capability
    - hid horizontal scrollbars (they are still present, but cannot be seen)
    - displayed settings icon in ChatScene
2020-06-26 20:20:37 +02:00
delvh
f68412a752 Merge branch 'develop' into f/enhanced_UI 2020-06-26 20:18:00 +02:00
06b29cea43 Merge pull request #159 from informatik-ag-ngl/b/online_status
Fixed two bugs regarding status changes
2020-06-26 18:16:28 +00:00
delvh
d11b1363f9 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
487cac77fb Added display of settings-icon for the settings button
additionally modified margin of elements in ChatScene
2020-06-26 17:33:32 +02:00
0dda75cb09 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
66eddab143 Fix double status increment on cached message relay 2020-06-26 09:28:48 +02:00
35f4ca2a1a Display correct contact status on startup
Fixes #152
2020-06-26 09:08:41 +02:00
delvh
2b59f59006 Fixed error not showing envoy icon in README.md 2020-06-25 13:02:04 +02:00
delvh
de2af7b1a9 Fixed small formatting error 2020-06-25 12:32:57 +02:00
delvh
36ea72954c Apply suggestions from code review
Co-authored-by: CyB3RC0nN0R <CyB3RC0nN0R@users.noreply.github.com>
2020-06-25 11:19:59 +02:00
delvh
374f23c3c3 Apply suggestions from @CyB3RC0nN0R's code review 2020-06-25 11:17:25 +02:00
delvh
c2b4ddaea9 Merge remote-tracking branch 'origin/develop' into f/enhanced_UI 2020-06-25 10:45:37 +02:00
c814492533 Merge pull request #153 from informatik-ag-ngl/b/annoying_registration
Make Registration less annoying
2020-06-25 08:42:34 +00:00
3ce9c03f8b Clear repeat password field when unequal passwords are entered 2020-06-25 10:21:27 +02:00
8291223532 Stop clearing password fields, remove prompt text 2020-06-25 07:49:45 +02:00
delvh
c519f5ec24 Fixed small bug making text of vertical scrollbar disappear 2020-06-23 23:40:18 +02:00
delvh
da52e9a5ae 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
cb0ff03072 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
4d81b741bb Merge remote-tracking branch 'origin/develop' into f/enhanced_UI 2020-06-23 17:27:02 +02:00
74aceb91e4 Merge pull request #150 from informatik-ag-ngl/f/compatibility_verification
Shorten event names, compatibility verification
2020-06-23 06:47:46 +00:00
0bbade44a7 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
d7e5a56902 Change envoy-common dependency back to the develop branch 2020-06-23 08:28:39 +02:00
delvh
df3edb72e1 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
51b0e06e80 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
1387a3f81c 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
delvh
43d7f33ca0 Selected items will now be visually displayed 2020-06-21 17:36:08 +02:00
bb81ec6042 Move user status color to CSS, refactor ContactListCell 2020-06-21 17:25:24 +02:00
delvh
d389637259 Moved remainingCharsLabel styling from code to CSS 2020-06-21 17:04:27 +02:00
delvh
8b27857db1 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