Commit Graph

580 Commits

Author SHA1 Message Date
delvh
07cdbab097 Added (currently useless) message-info menuItem
additionally:
 - moved MessageListCell and ContactListCell into
envoy.client.ui.listcell
 - edited editable property of ClearableTextField
2020-06-30 21:20:54 +02:00
delvh
d168f57d2b
Merge branch 'develop' into f/clearable_textfield 2020-06-28 22:48:35 +02:00
delvh
589353a927 Finished implementing ClearableTextField (IMPORTANT! read description)
in order to use SceneBuilder further, you have to import the attached
JAR "CustomComponents.jar" into the SceneBuilder. If you don't do this,
Scenebuilder no longer can load FXML files that depend on a custom
component. If you are implementing another custom component, feel free
to add it to the jar.
Note however that SceneBuilder cannot load any components that rely on
libraries other than the standard Java library or the JavaFX standard.
Meaning that even if you are referencing another Envoy file, the
component will not be importable. Because of this, the
ClearableTextField is also present only in a slimmed down version, as
SceneBuilder additionally has problems when dealing with loading
resources.
2020-06-28 22:44:34 +02:00
delvh
28fe5cdb27 Updated UI (again) 2020-06-28 22:30:14 +02:00
DieGurke
21ad87d97d Implemented pendingMessage processing using an extra cache 2020-06-28 13:20:10 +02:00
4fbec0af11
Merge pull request #164 from informatik-ag-ngl/f/message_list
Wrap Text in ListCells
2020-06-27 18:20:01 +00:00
delvh
18819a873f 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
e6ac95ac14 Fixed padding of status icon and implemented Tooltip
Additionally added commentary in MessageListCell.
2020-06-27 18:27:13 +02:00
25b9103e23 Bind message list cell width to message list width
Fixes #156
2020-06-27 17:36:42 +02:00
c6e28aba10 Display status for own messages instead of received ones 2020-06-27 17:14:07 +02:00
delvh
406036c029 Added working ClearableTextField
additionally designed the clear button icon both in black and white
2020-06-27 15:35:35 +02:00
3446e24043 Merge branch 'develop' into f/groupMessages
Conflicts:
	src/main/java/envoy/client/ui/controller/ChatScene.java
2020-06-27 11:34:51 +02:00
delvh
8092971e89
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
17a9de64f2
Merge branch 'develop' into f/notify_user_of_empty_IDGenerator 2020-06-27 11:25:49 +02:00
adfeb64845
Merge pull request #160 from informatik-ag-ngl/b/user_name_validation
Contact Name Validation
2020-06-27 09:22:03 +00:00
23e22db85c
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
b5fc80709e Removed unnecessary IOException in IconUtil
This is a normal @CyB3RC0nN0R commit: Adding functionality by deleting
code.
2020-06-27 11:03:30 +02:00
920c83c4d1 Rename groupNameBar to groupNameField 2020-06-27 09:48:41 +02:00
3d6a38e354 Validate group name and size on creation 2020-06-27 09:36:59 +02:00
delvh
5a933fab4e Made postingPermanentlyDisabled further idiot-proof
Additionally deleted annoying alert notifying me that I'm offline.
2020-06-27 09:34:30 +02:00
d5fa0d17a1 Validate user name during login and registration 2020-06-27 08:25:37 +02:00
delvh
bc230575f4 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
f61561d4b2 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
5fc341ad53
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
c529e8df9e
Merge branch 'develop' into f/enhanced_UI 2020-06-26 20:18:00 +02:00
733c263f84
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
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
e420c7a3cb
Fixed error not showing envoy icon in README.md 2020-06-25 13:02:04 +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
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
delvh
ba957e5f08 Fixed small bug making text of vertical scrollbar disappear 2020-06-23 23:40:18 +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
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
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
delvh
19fe3a2830 Selected items will now be visually displayed 2020-06-21 17:36:08 +02:00