vergnet/clavardator
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

feat: use Message class in chat and improve modularity

Browse source
This commit is contained in:
Arnaud Vergnet 2020-12-02 10:54:43 +01:00
parent 93266eb429
commit 811537dec8
8 changed files with 175 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/fr/insa/clavardator/chat/Message.java
View file

@ -1,5 +1,6 @@
package fr.insa.clavardator.chat;
import fr.insa.clavardator.users.CurrentUser;
import fr.insa.clavardator.users.User;
import java.io.Serializable;
@ -22,4 +23,8 @@ public class Message implements Serializable {
public String getText() {
return text;
}
public User getSender() {
return sender;
}
}

54
src/main/java/fr/insa/clavardator/ui/chat/ChatController.java
View file

@ -1,7 +1,10 @@
package fr.insa.clavardator.ui.chat;
import fr.insa.clavardator.chat.Message;
import fr.insa.clavardator.ui.ButtonPressEvent;
import fr.insa.clavardator.ui.NoSelectionModel;
import fr.insa.clavardator.users.CurrentUser;
import fr.insa.clavardator.users.PeerUser;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.fxml.FXML;
@ -9,54 +12,57 @@ import javafx.fxml.Initializable;
import javafx.scene.control.ListView;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.ResourceBundle;
public class ChatController implements Initializable {
@FXML
private ListView<String> messageList;
private ListView<Message> messageList;
@FXML
private ChatFooterController chatFooterController;
@FXML
private ChatHeaderController chatHeaderController;
private List<ButtonPressEvent> attachmentListeners;
private List<ButtonPressEvent> sendListeners;
private List<ButtonPressEvent> editListeners;
private CurrentUser currentUser;
private PeerUser remoteUser;
public void addAttachmentListener(ButtonPressEvent listener) {
attachmentListeners.add(listener);
chatFooterController.addAttachmentListener(listener);
}
public void addSendListener(ButtonPressEvent listener) {
sendListeners.add(listener);
chatFooterController.addSendListener(listener);
}
public void addEditListener(ButtonPressEvent listener) {
editListeners.add(listener);
chatHeaderController.addEditListener(listener);
}
public void onAttachmentPress() {
attachmentListeners.forEach(ButtonPressEvent::onPress);
public void setCurrentUser(CurrentUser currentUser) {
this.currentUser = currentUser;
}
public void onSendPress() {
sendListeners.forEach(ButtonPressEvent::onPress);
public void setRemoteUser(PeerUser remoteUser) {
this.remoteUser = remoteUser;
loadMessageList();
}
public void onEditPress() {
editListeners.forEach(ButtonPressEvent::onPress);
private void loadMessageList() {
ObservableList<Message> messages = FXCollections.observableArrayList(
new Message(remoteUser, currentUser, "Messsssage 1"),
new Message(remoteUser, currentUser, "Messsssage 2"),
new Message(currentUser, remoteUser, "Messsssage 3"),
new Message(remoteUser, currentUser, "Messsssage 4")
);
messageList.setItems(messages);
messageList.scrollTo(messageList.getItems().size() - 1);
}
@Override
public void initialize(URL url, ResourceBundle rb) {
attachmentListeners = new ArrayList<>();
sendListeners = new ArrayList<>();
editListeners = new ArrayList<>();
ObservableList<String> messages = FXCollections.observableArrayList(
"test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "test", "no", "no", "test", "no", "no", "test", "no", "test");
messageList.setItems(messages);
messageList.scrollTo(messageList.getItems().size() - 1);
messageList.setSelectionModel(new NoSelectionModel());
messageList.setItems(null);
messageList.setSelectionModel(new NoSelectionModel<Message>());
messageList.setCellFactory(listView -> new MessageListItemCell());
}

35
src/main/java/fr/insa/clavardator/ui/chat/ChatFooterController.java Normal file
View file

@ -0,0 +1,35 @@
package fr.insa.clavardator.ui.chat;
import fr.insa.clavardator.ui.ButtonPressEvent;
import javafx.fxml.Initializable;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.ResourceBundle;
public class ChatFooterController implements Initializable {
private List<ButtonPressEvent> attachmentListeners;
private List<ButtonPressEvent> sendListeners;
public void addAttachmentListener(ButtonPressEvent listener) {
attachmentListeners.add(listener);
}
public void addSendListener(ButtonPressEvent listener) {
sendListeners.add(listener);
}
public void onAttachmentPress() {
attachmentListeners.forEach(ButtonPressEvent::onPress);
}
public void onSendPress() {
sendListeners.forEach(ButtonPressEvent::onPress);
}
@Override
public void initialize(URL location, ResourceBundle resources) {
attachmentListeners = new ArrayList<>();
sendListeners = new ArrayList<>();
}
}

30
src/main/java/fr/insa/clavardator/ui/chat/ChatHeaderController.java Normal file
View file

@ -0,0 +1,30 @@
package fr.insa.clavardator.ui.chat;
import fr.insa.clavardator.ui.ButtonPressEvent;
import javafx.fxml.Initializable;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import java.util.ResourceBundle;
public class ChatHeaderController implements Initializable {
private List<ButtonPressEvent> editListeners;
public void addEditListener(ButtonPressEvent listener) {
editListeners.add(listener);
}
public void onEditPress() {
editListeners.forEach(ButtonPressEvent::onPress);
}
public void onAboutPress() {
}
@Override
public void initialize(URL location, ResourceBundle resources) {
editListeners = new ArrayList<>();
}
}

12
src/main/java/fr/insa/clavardator/ui/chat/MessageListItemCell.java
View file

@ -1,22 +1,26 @@
package fr.insa.clavardator.ui.chat;
import fr.insa.clavardator.chat.Message;
import fr.insa.clavardator.users.CurrentUser;
import fr.insa.clavardator.users.User;
import javafx.fxml.FXMLLoader;
import javafx.scene.control.ListCell;
import java.io.IOException;
public class MessageListItemCell extends ListCell<String> {
public class MessageListItemCell extends ListCell<Message> {
public MessageListItemCell() {
setStyle("-fx-padding: 0px");
}
@Override
protected void updateItem(String item, boolean empty) {
protected void updateItem(Message item, boolean empty) {
super.updateItem(item, empty);
if (item != null) {
FXMLLoader cellLoader;
if (item.equals("test")) {
final User sender = item.getSender();
if (sender instanceof CurrentUser) {
cellLoader = new FXMLLoader(getClass().getResource("messageListItemSelf.fxml"));
} else {
cellLoader = new FXMLLoader(getClass().getResource("messageListItemOther.fxml"));
@ -24,7 +28,7 @@ public class MessageListItemCell extends ListCell<String> {
try {
setGraphic(cellLoader.load());
final MessageListItemController userListItemController = cellLoader.getController();
userListItemController.setMessage(item);
userListItemController.setMessage(item.getText());
} catch (IOException e) {
e.printStackTrace();
}

49
src/main/resources/fr/insa/clavardator/ui/chat/chat.fxml
View file

@ -1,58 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import com.jfoenix.controls.*?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.ListView?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.shape.Circle?>
<?import org.kordamp.ikonli.javafx.FontIcon?>
<!--suppress JavaFxUnresolvedFxIdReference -->
<AnchorPane xmlns="http://javafx.com/javafx/11.0.1"
xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.insa.clavardator.ui.chat.ChatController"
stylesheets="@../styles.css" styleClass="container">
<VBox AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<HBox alignment="CENTER_LEFT" prefHeight="64.0" spacing="10">
<padding>
<Insets left="20" right="20"/>
</padding>
<Label text="Connecté en tant que : "/>
<Label text="&lt;USERNAME&gt;"/>
<JFXButton mnemonicParsing="false" onMouseClicked="#onEditPress">
<graphic>
<FontIcon iconLiteral="fas-user-edit" iconSize="24"/>
</graphic>
</JFXButton>
<Pane HBox.hgrow="ALWAYS"/>
<JFXButton mnemonicParsing="false" onMouseClicked="#onEditPress">
<graphic>
<FontIcon iconLiteral="fas-info" iconSize="24"/>
</graphic>
</JFXButton>
</HBox>
<HBox alignment="CENTER_LEFT" spacing="5" prefHeight="45">
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
</padding>
<Circle radius="7.0" styleClass="active-user-dot"/>
<Label text="USER NAME" styleClass="current-user"/>
</HBox>
<fx:include source="chatHeader.fxml" fx:id="chatHeader"/>
<ListView fx:id="messageList" VBox.vgrow="ALWAYS"/>
<HBox alignment="CENTER" spacing="10.0">
<padding>
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0"/>
</padding>
<JFXTextField HBox.hgrow="ALWAYS"/>
<JFXButton mnemonicParsing="false" onMouseClicked="#onAttachmentPress">
<graphic>
<FontIcon iconLiteral="fas-paperclip" iconSize="24"/>
</graphic>
</JFXButton>
<JFXButton mnemonicParsing="false" text="Envoyer" onMouseClicked="#onSendPress">
<graphic>
<FontIcon iconLiteral="fas-paper-plane" iconSize="24"/>
</graphic>
</JFXButton>
</HBox>
<fx:include source="chatFooter.fxml" fx:id="chatFooter"/>
</VBox>
</AnchorPane>

26
src/main/resources/fr/insa/clavardator/ui/chat/chatFooter.fxml Normal file
View file

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import com.jfoenix.controls.JFXButton?>
<?import com.jfoenix.controls.JFXTextField?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.layout.HBox?>
<?import org.kordamp.ikonli.javafx.FontIcon?>
<HBox xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="fr.insa.clavardator.ui.chat.ChatFooterController"
stylesheets="@../styles.css" styleClass="container" alignment="CENTER" spacing="10.0">
<padding>
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0"/>
</padding>
<JFXTextField HBox.hgrow="ALWAYS"/>
<JFXButton mnemonicParsing="false" onMouseClicked="#onAttachmentPress">
<graphic>
<FontIcon iconLiteral="fas-paperclip" iconSize="24"/>
</graphic>
</JFXButton>
<JFXButton mnemonicParsing="false" text="Envoyer" onMouseClicked="#onSendPress">
<graphic>
<FontIcon iconLiteral="fas-paper-plane" iconSize="24"/>
</graphic>
</JFXButton>
</HBox>

38
src/main/resources/fr/insa/clavardator/ui/chat/chatHeader.fxml Normal file
View file

@ -0,0 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import com.jfoenix.controls.JFXButton?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.shape.Circle?>
<?import org.kordamp.ikonli.javafx.FontIcon?>
<VBox xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="fr.insa.clavardator.ui.chat.ChatHeaderController"
stylesheets="@../styles.css" styleClass="container">
<HBox alignment="CENTER_LEFT" prefHeight="64.0" spacing="10">
<padding>
<Insets left="20" right="20"/>
</padding>
<Label text="Connecté en tant que : "/>
<Label text="&lt;USERNAME&gt;"/>
<JFXButton mnemonicParsing="false" onMouseClicked="#onEditPress">
<graphic>
<FontIcon iconLiteral="fas-user-edit" iconSize="24"/>
</graphic>
</JFXButton>
<Pane HBox.hgrow="ALWAYS"/>
<JFXButton mnemonicParsing="false" onMouseClicked="#onAboutPress">
<graphic>
<FontIcon iconLiteral="fas-info" iconSize="24"/>
</graphic>
</JFXButton>
</HBox>
<HBox alignment="CENTER_LEFT" spacing="5" prefHeight="45">
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0"/>
</padding>
<Circle radius="7.0" styleClass="active-user-dot"/>
<Label text="USER NAME" styleClass="current-user"/>
</HBox>
</VBox>