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

Compare commits

base: vergnet:20001fae9cb225901275fcc03f7ae68d9f0366f4
Branches Tags
vergnet:master
vergnet:subprojects
..
compare: vergnet:0e8ded05c9ae55546200bc19b7278b7f72181d64
Branches Tags
vergnet:master
vergnet:subprojects

No commits in common. "20001fae9cb225901275fcc03f7ae68d9f0366f4" and "0e8ded05c9ae55546200bc19b7278b7f72181d64" have entirely different histories.
20001fae9c ... 0e8ded05c9

9 changed files with 80 additions and 494 deletions
Show stats Expand all files Collapse all files

2
.idea/misc.xml
View file

@ -9,7 +9,7 @@
<component name="FrameworkDetectionExcludesConfiguration"> <component name="FrameworkDetectionExcludesConfiguration">
<file type="web" url="file://$PROJECT_DIR$" /> <file type="web" url="file://$PROJECT_DIR$" />
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_14" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>

40
src/main/java/fr/insa/clavardator/ui/MainController.java
View file

@ -1,57 +1,23 @@
package fr.insa.clavardator.ui; package fr.insa.clavardator.ui;
import com.jfoenix.controls.JFXSnackbar;
import fr.insa.clavardator.ui.chat.ChatController; import fr.insa.clavardator.ui.chat.ChatController;
import fr.insa.clavardator.ui.dialogs.EditUsernameDialogController;
import fr.insa.clavardator.ui.dialogs.SnackbarController;
import fr.insa.clavardator.ui.users.UserListController; import fr.insa.clavardator.ui.users.UserListController;
import fr.insa.clavardator.users.CurrentUser; import fr.insa.clavardator.users.CurrentUser;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.fxml.Initializable; import javafx.fxml.Initializable;
import javafx.scene.control.Label;
import javafx.scene.layout.StackPane;
import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.util.ResourceBundle; import java.util.ResourceBundle;
public class MainController implements Initializable { public class MainController implements Initializable {
@FXML
private StackPane root;
@FXML
private EditUsernameDialogController editUserDialogController;
@FXML @FXML
private UserListController userListController; private UserListController userListController;
@FXML @FXML
private ChatController chatController; private ChatController chatController;
private JFXSnackbar snackbar;
private void openEditUsernameDialog() throws IOException {
editUserDialogController.setMode(EditUsernameDialogController.Mode.EDIT);
editUserDialogController.setOnSuccessListener(() -> {
System.out.println("success");
try {
final FXMLLoader loader = new FXMLLoader(getClass().getResource("dialogs/snackbar.fxml"));
snackbar.enqueue(new JFXSnackbar.SnackbarEvent(
loader.load()
));
final SnackbarController controller = loader.getController();
controller.setText("Nom d'utilisateur changé !");
controller.setMode(SnackbarController.Mode.SUCCESS);
} catch (IOException e) {
e.printStackTrace();
}
});
editUserDialogController.show(root);
}
@Override @Override
public void initialize(URL url, ResourceBundle rb) { public void initialize(URL url, ResourceBundle rb) {
snackbar = new JFXSnackbar(root);
chatController.setCurrentUser(CurrentUser.getInstance()); chatController.setCurrentUser(CurrentUser.getInstance());
userListController.addRefreshUserListener(() -> { userListController.addRefreshUserListener(() -> {
System.out.println("refresh event"); System.out.println("refresh event");
@ -67,11 +33,7 @@ public class MainController implements Initializable {
System.out.println("send event"); System.out.println("send event");
}); });
chatController.addEditListener(() -> { chatController.addEditListener(() -> {
try { System.out.println("edit event");
openEditUsernameDialog();
} catch (IOException e) {
e.printStackTrace();
}
}); });
} }
} }

149
src/main/java/fr/insa/clavardator/ui/dialogs/EditUsernameDialogController.java
View file

@ -1,149 +0,0 @@
package fr.insa.clavardator.ui.dialogs;
import com.jfoenix.controls.JFXButton;
import com.jfoenix.controls.JFXDialog;
import com.jfoenix.controls.JFXTextField;
import com.jfoenix.validation.RequiredFieldValidator;
import com.jfoenix.validation.base.ValidatorBase;
import fr.insa.clavardator.ui.ButtonPressEvent;
import javafx.beans.property.ReadOnlyBooleanWrapper;
import javafx.beans.value.ObservableValue;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import javafx.scene.control.Label;
import javafx.scene.layout.StackPane;
import java.net.URL;
import java.util.ResourceBundle;
import java.util.Timer;
import java.util.TimerTask;
public class EditUsernameDialogController implements Initializable {
enum State {
VALID,
INVALID,
NETWORK
}
@FXML
private Label titleLabel;
@FXML
private Label descriptionLabel;
@FXML
private JFXDialog dialog;
@FXML
private JFXTextField textField;
@FXML
private JFXButton confirmButton;
@FXML
private JFXButton cancelButton;
private State currentState;
private Validator validator;
private ButtonPressEvent successListener;
public void setOnSuccessListener(ButtonPressEvent listener) {
this.successListener = listener;
}
public void show(StackPane root) {
setLocked(false);
setFieldError(State.VALID);
textField.setText("");
dialog.show(root);
}
public void hide() {
dialog.close();
}
public void onCancel() {
hide();
}
private void setLocked(boolean state) {
confirmButton.setDisable(state);
cancelButton.setDisable(state);
dialog.setOverlayClose(!state);
textField.setDisable(state);
}
private void onSuccess() {
setFieldError(State.VALID);
setLocked(false);
hide();
successListener.onPress();
}
private void onError() {
validator.setMessage("Nom d'utilisateur invalide");
setFieldError(State.INVALID);
setLocked(false);
}
private void setFieldError(State state) {
currentState = state;
textField.validate();
}
public void onConfirm() {
setLocked(true);
// TODO replace by network call
Timer t = new Timer();
t.schedule(new TimerTask() {
@Override
public void run() {
// onError();
onSuccess();
}
}, 1000);
}
public void onUsernameChange(ObservableValue<? extends String> observable, String oldText, String newText) {
setFieldError(State.VALID);
confirmButton.setDisable(newText.isEmpty());
}
public void setMode(Mode mode) {
switch (mode) {
case INITIAL:
titleLabel.setText("Nom d'utilisateur");
descriptionLabel.setText("Choisissez votre nom d'utilisateur. Vous pourrez le changer plus tard");
break;
case ERROR:
titleLabel.setText("Nom d'utilisateur expiré");
descriptionLabel.setText("Votre nom d'utilisateur n'est plus valide, merci d'en choisir un autre.");
break;
case EDIT:
titleLabel.setText("Changer le nom d'utilisateur");
descriptionLabel.setText("Entrez votre nouveau nom d'utilisateur");
break;
}
}
@Override
public void initialize(URL location, ResourceBundle resources) {
validator = new Validator();
currentState = State.VALID;
setMode(Mode.INITIAL);
confirmButton.setDisable(true);
textField.textProperty().addListener(this::onUsernameChange);
textField.getValidators().add(validator);
}
public enum Mode {
INITIAL,
ERROR,
EDIT
}
class Validator extends ValidatorBase {
@Override
protected void eval() {
this.hasErrors = new ReadOnlyBooleanWrapper(currentState != State.VALID);
}
}
}

64
src/main/java/fr/insa/clavardator/ui/dialogs/SnackbarController.java
View file

@ -1,64 +0,0 @@
package fr.insa.clavardator.ui.dialogs;
import com.jfoenix.effects.JFXDepthManager;
import javafx.collections.ObservableList;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import javafx.scene.control.Label;
import javafx.scene.layout.HBox;
import org.kordamp.ikonli.javafx.FontIcon;
import java.net.URL;
import java.util.Arrays;
import java.util.ResourceBundle;
public class SnackbarController implements Initializable {
@FXML
public Label label;
@FXML
public FontIcon icon;
@FXML
public HBox container;
public void setText(String text) {
label.setText(text);
}
public void setMode(Mode mode) {
ObservableList<String> styleClasses = container.getStyleClass();
styleClasses.clear();
styleClasses.add("snackbar-container");
switch (mode) {
case INFO:
styleClasses.add("snackbar-container-info");
icon.setIconLiteral("fas-info-circle");
break;
case WARNING:
styleClasses.add("snackbar-container-warning");
icon.setIconLiteral("fas-exclamation-triangle");
break;
case ERROR:
styleClasses.add("snackbar-container-danger");
icon.setIconLiteral("fas-times-circle");
break;
case SUCCESS:
styleClasses.add("snackbar-container-success");
icon.setIconLiteral("fas-check-circle");
break;
}
}
@Override
public void initialize(URL location, ResourceBundle resources) {
setMode(Mode.INFO);
JFXDepthManager.setDepth(container, 1);
}
public enum Mode {
INFO,
WARNING,
ERROR,
SUCCESS
}
}

17
src/main/java/fr/insa/clavardator/ui/users/UserListController.java
View file

@ -51,16 +51,15 @@ public class UserListController implements Initializable {
@Override @Override
public void initialize(URL url, ResourceBundle rb) { public void initialize(URL url, ResourceBundle rb) {
ObservableList<PeerUser> activeList = FXCollections.observableArrayList( ObservableList<PeerUser> activeList = FXCollections.observableArrayList(
new PeerUser(0, "Dodo0"), new PeerUser(1, "Dodo0"),
new PeerUser(1, "Dodo3"), new PeerUser(2, "Dodo3"),
new PeerUser(2, "Dodo2"), new PeerUser(3, "Dodo2"),
new PeerUser(3, "Coucou0"), // new ActiveUser(4, "Coucou0", InetAddress.getLocalHost()),
new PeerUser(4, "Coucou1"), // new ActiveUser(5, "Coucou1", InetAddress.getLocalHost()),
new PeerUser(5, "Coucou3"), // new ActiveUser(6, "Coucou3", InetAddress.getLocalHost()),
new PeerUser(6, "Dodo1"), new PeerUser(7, "Dodo1")
new PeerUser(7, "Coucou2") // new ActiveUser(8, "Coucou2", InetAddress.getLocalHost())
); );
activeList.sort(null); activeList.sort(null);
userList.setItems(activeList); userList.setItems(activeList);
userList.setCellFactory(listView -> { userList.setCellFactory(listView -> {

46
src/main/resources/fr/insa/clavardator/ui/dialogs/editUsernameDialog.fxml
View file

@ -1,46 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import com.jfoenix.controls.JFXButton?>
<?import com.jfoenix.controls.JFXDialog?>
<?import com.jfoenix.controls.JFXTextField?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.*?>
<?import org.kordamp.ikonli.javafx.FontIcon?>
<JFXDialog xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/javafx"
fx:controller="fr.insa.clavardator.ui.dialogs.EditUsernameDialogController"
stylesheets="@../styles.css" fx:id="dialog">
<AnchorPane
prefWidth="600"
prefHeight="400" styleClass="container">
<VBox AnchorPane.topAnchor="0" AnchorPane.rightAnchor="0" AnchorPane.leftAnchor="0" AnchorPane.bottomAnchor="0">
<padding>
<Insets left="10" right="10" bottom="10" top="10"/>
</padding>
<VBox VBox.vgrow="ALWAYS" spacing="10">
<padding>
<Insets bottom="10"/>
</padding>
<Label styleClass="dialog-title" fx:id="titleLabel">TITLE</Label>
<VBox VBox.vgrow="ALWAYS" alignment="CENTER" spacing="30">
<Label VBox.vgrow="ALWAYS" fx:id="descriptionLabel">DESCRIPTION</Label>
<JFXTextField HBox.hgrow="ALWAYS" fx:id="textField" promptText="Nom d'utilisateur" labelFloat="true"/>
</VBox>
</VBox>
<HBox spacing="50" alignment="CENTER">
<JFXButton text="Annuler" styleClass="background-danger" fx:id="cancelButton" onAction="#onCancel">
<graphic>
<FontIcon iconLiteral="fas-times"/>
</graphic>
</JFXButton>
<JFXButton text="Valider" styleClass="background-success" fx:id="confirmButton" onAction="#onConfirm">
<graphic>
<FontIcon iconLiteral="fas-check"/>
</graphic>
</JFXButton>
</HBox>
</VBox>
</AnchorPane>
</JFXDialog>

25
src/main/resources/fr/insa/clavardator/ui/dialogs/snackbar.fxml
View file

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
<?import org.kordamp.ikonli.javafx.FontIcon?>
<?import javafx.geometry.Insets?>
<AnchorPane xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/javafx"
fx:controller="fr.insa.clavardator.ui.dialogs.SnackbarController"
stylesheets="@../styles.css">
<HBox fx:id="container" alignment="CENTER_LEFT" prefHeight="50.0" prefWidth="400" AnchorPane.rightAnchor="0"
AnchorPane.leftAnchor="0" AnchorPane.topAnchor="0" AnchorPane.bottomAnchor="100"
styleClass="snackbar-container">
<padding>
<Insets left="10" right="10" top="10" bottom="10"/>
</padding>
<Label HBox.hgrow="ALWAYS" fx:id="label">
<graphic>
<FontIcon fx:id="icon"/>
</graphic>
TEXT
</Label>
</HBox>
</AnchorPane>

13
src/main/resources/fr/insa/clavardator/ui/scene.fxml
View file

@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.layout.*?>
<!--suppress JavaFxUnresolvedFxIdReference --> <!--suppress JavaFxUnresolvedFxIdReference -->
<?import javafx.scene.layout.HBox?> <AnchorPane xmlns="http://javafx.com/javafx/11.0.1"
<?import javafx.scene.layout.StackPane?> xmlns:fx="http://javafx.com/fxml/1" fx:controller="fr.insa.clavardator.ui.MainController">
<StackPane xmlns:fx="http://javafx.com/fxml/1" <HBox AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
xmlns="http://javafx.com/javafx/11.0.1" fx:controller="fr.insa.clavardator.ui.MainController" fx:id="root"> AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<fx:include source="dialogs/editUsernameDialog.fxml" fx:id="editUserDialog"/>
<HBox>
<fx:include source="users/userList.fxml" fx:id="userList"/> <fx:include source="users/userList.fxml" fx:id="userList"/>
<fx:include source="chat/chat.fxml" fx:id="chat" HBox.hgrow="ALWAYS"/> <fx:include source="chat/chat.fxml" fx:id="chat" HBox.hgrow="ALWAYS"/>
</HBox> </HBox>
</StackPane> </AnchorPane>

218
src/main/resources/fr/insa/clavardator/ui/styles.css
View file

@ -1,218 +1,128 @@
/********************************************************
THEME
*********************************************************/
* {
-primary: #296ba4;
-text: #EAEAEA;
-caption: #c9c9c9;
-background: #33333B;
-background-light: #36383E;
-background-lighter: #3e4046;
-background-alert: #dfdfdf;
-success: #32b612;
-warn: #c4980a;
-danger: #b62424;
}
/********************************************************
STYLE
*********************************************************/
.label, .button, .jfx-text-field { .label, .button, .jfx-text-field {
-fx-text-fill: #EAEAEA;
-fx-font-size: 20; -fx-font-size: 20;
-fx-text-fill: -text;
} }
.ikonli-font-icon { .ikonli-font-icon {
-fx-icon-color: -text; -fx-icon-color: #EAEAEA;
}
.jfx-button {
-fx-background-color: -primary;
-fx-background-radius: 5;
-jfx-button-type: "RAISED";
-fx-cursor: "hand";
}
.jfx-text-field {
-jfx-focus-color: -primary;
} }
.container { .container {
-fx-background-color: -background; -fx-background-color: #33333B;
} }
.inner, .list-cell:empty { .inner {
-fx-background-color: -background-light; -fx-background-color: #36383E;
}
.jfx-button {
-fx-background-color: #32338F;
}
.active-user-item {
-fx-background-color: #3e4046;
}
.inactive-user-item {
-fx-background-color: #36383E;
}
.selected-user-item {
-fx-background-color: #32338F;
} }
.active-user-dot { .active-user-dot {
-fx-fill: -success; -fx-fill: #32b612;
} }
.inactive-user-dot { .inactive-user-dot {
-fx-fill: -background-lighter; -fx-fill: #5b5b5b;
} }
.background-success { .message-self, .message-other {
-fx-background-color: -success; -fx-font-size: 18;
} }
.background-danger { .message-self {
-fx-background-color: -danger; -fx-background-color: #347dbd;
} }
.background-warning { .message-other {
-fx-background-color: -warn; -fx-background-color: #555555;
}
.timestamp {
-fx-text-fill: #c9c9c9;
-fx-font-size: 12;
} }
.current-user { .current-user {
-fx-font-size: 25; -fx-font-size: 25;
} }
.dialog-title {
-fx-font-size: 30;
}
.timestamp {
-fx-text-fill: -caption;
-fx-font-size: 12;
}
.message-self, .message-other {
-fx-background-radius: 20;
-fx-font-size: 18;
}
.message-other {
-fx-background-color: -background-lighter;
}
.message-self {
-fx-background-color: -primary;
}
.selected-user-item, .active-user-item, .inactive-user-item {
-fx-background-radius: 0 20 20 0;
-jfx-button-type: "FLAT";
}
.active-user-item {
-fx-background-color: -background-lighter;
}
.inactive-user-item {
-fx-background-color: -background-light;
}
.selected-user-item {
-fx-background-color: -primary;
}
.list-view { .list-view {
-fx-background-color: -background-light;
-fx-padding: 0; -fx-padding: 0;
-fx-background-color: #36383E;
} }
.snackbar-container { .list-cell:empty {
-fx-background-color: -background-alert; -fx-background-color: #36383E;
-fx-border-radius: 10;
-fx-background-radius: 10;
-fx-border-width: 0.5;
} }
.snackbar-container-info { .jfx-text-field {
-fx-text-fill: -primary; -jfx-focus-color: #32338F;
-fx-border-color: -primary;
} }
.snackbar-container-info * {
-fx-text-fill: -primary;
-fx-icon-color: -primary;
}
.snackbar-container-success {
-fx-border-color: -success;
}
.snackbar-container-success * {
-fx-text-fill: -success;
-fx-icon-color: -success;
}
.snackbar-container-warning {
-fx-border-color: -warn;
}
.snackbar-container-warning * {
-fx-text-fill: -warn;
-fx-icon-color: -warn;
}
.snackbar-container-danger {
-fx-border-color: -danger;
}
.snackbar-container-danger * {
-fx-text-fill: -danger;
-fx-icon-color: -danger;
}
/******************************************************** /********************************************************
SCROLLBARS SCROLLBARS
*********************************************************/ *********************************************************/
.scroll-bar:horizontal .track, .scroll-bar:horizontal .track,
.scroll-bar:vertical .track { .scroll-bar:vertical .track{
-fx-background-color: #33333B; -fx-background-color : #33333B;
-fx-border-color: transparent; -fx-border-color :transparent;
-fx-background-radius: 0.0em; -fx-background-radius : 0.0em;
-fx-border-radius: 2.0em; -fx-border-radius :2.0em;
} }
.scroll-bar:horizontal .increment-button, .scroll-bar:horizontal .increment-button ,
.scroll-bar:horizontal .decrement-button { .scroll-bar:horizontal .decrement-button {
-fx-background-color: transparent; -fx-background-color :transparent;
-fx-background-radius: 0.0em; -fx-background-radius : 0.0em;
-fx-padding: 0.0 0.0 10.0 0.0; -fx-padding :0.0 0.0 10.0 0.0;
} }
.scroll-bar:vertical .increment-button, .scroll-bar:vertical .increment-button ,
.scroll-bar:vertical .decrement-button { .scroll-bar:vertical .decrement-button {
-fx-background-color: transparent; -fx-background-color :transparent;
-fx-background-radius: 0.0em; -fx-background-radius : 0.0em;
-fx-padding: 0.0 10.0 0.0 0.0; -fx-padding :0.0 10.0 0.0 0.0;
} }
.scroll-bar .increment-arrow, .scroll-bar .increment-arrow,
.scroll-bar .decrement-arrow { .scroll-bar .decrement-arrow{
-fx-shape: " "; -fx-shape : " ";
-fx-padding: 0.15em 0.0; -fx-padding :0.15em 0.0;
} }
.scroll-bar:vertical .increment-arrow, .scroll-bar:vertical .increment-arrow,
.scroll-bar:vertical .decrement-arrow { .scroll-bar:vertical .decrement-arrow{
-fx-shape: " "; -fx-shape : " ";
-fx-padding: 0.0 0.15em; -fx-padding :0.0 0.15em;
} }
.scroll-bar:horizontal .thumb, .scroll-bar:horizontal .thumb,
.scroll-bar:vertical .thumb { .scroll-bar:vertical .thumb {
-fx-background-color: derive(#33333B, 50.0%); -fx-background-color :derive(#33333B,50.0%);
-fx-background-insets: 2.0, 0.0, 0.0; -fx-background-insets : 2.0, 0.0, 0.0;
-fx-background-radius: 1.0em; -fx-background-radius : 1.0em;
} }
.scroll-bar:horizontal .thumb:hover, .scroll-bar:horizontal .thumb:hover,
.scroll-bar:vertical .thumb:hover { .scroll-bar:vertical .thumb:hover {
-fx-background-color: derive(#33333B, 80.0%); -fx-background-color :derive(#33333B,80.0%);
-fx-background-insets: 2.0, 0.0, 0.0; -fx-background-insets : 2.0, 0.0, 0.0;
-fx-background-radius: 1.0em; -fx-background-radius : 1.0em;
} }