zdm/envoy
zdm/envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

unified id variable names to kebab-case

Browse Source
This commit is contained in:
Maximilian P. Käfer 2020-08-26 15:50:46 +02:00
parent 15265d2b7c
commit e7d85bd968
10 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/main/java/envoy/client/ui/listcell/AbstractListCell.java
View File

@ -29,7 +29,7 @@ public abstract class AbstractListCell<T, U extends Node> extends ListCell<T> {
public AbstractListCell(ListView<? extends T> listView) {
this.listView = listView;
setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
getStyleClass().add("listElement");
getStyleClass().add("list-element");
}
@Override

4
client/src/main/java/envoy/client/ui/listcell/ChatControl.java
View File

@ -61,10 +61,10 @@ public class ChatControl extends HBox {
final var vBox2 = new VBox();
vBox2.setAlignment(Pos.CENTER_RIGHT);
unreadMessagesLabel.setAlignment(Pos.CENTER);
unreadMessagesLabel.getStyleClass().add("unreadMessagesAmount");
unreadMessagesLabel.getStyleClass().add("unread-messages-amount");
vBox2.getChildren().add(unreadMessagesLabel);
getChildren().add(vBox2);
}
getStyleClass().add("listElement");
getStyleClass().add("list-element");
}
}

2
client/src/main/java/envoy/client/ui/listcell/ContactControl.java
View File

@ -39,6 +39,6 @@ public class ContactControl extends VBox {
} else {
getChildren().add(new Label(contact.getContacts().size() + " members"));
}
getStyleClass().add("listElement");
getStyleClass().add("list-element");
}
}

2
client/src/main/java/envoy/client/ui/listcell/MessageControl.java
View File

@ -67,7 +67,7 @@ public class MessageControl extends Label {
if (message.getSenderID() != localDB.getUser().getID() && message instanceof GroupMessage) {
// Displaying the name of the sender in a group
final var label = new Label();
label.getStyleClass().add("groupMemberNames");
label.getStyleClass().add("group-member-names");
label.setText(localDB.getUsers()
.values()
.stream()

20
client/src/main/resources/css/base.css
View File

@ -8,11 +8,11 @@
-fx-background-color: transparent;
}
#textEnterContainer, #contact-search-enter-container {
#text-enter-container, #contact-search-enter-container {
-fx-background-radius: 5.0em;
}
#roundButton {
#round-button {
-fx-background-radius: 5.0em;
}
@ -80,29 +80,29 @@
-fx-text-alignment: left;
}
.unreadMessagesAmount {
.unread-messages-amount {
-fx-alignment: center;
-fx-background-color: orange;
-fx-background-radius: 4.0em;
-fx-text-alignment: center;
}
#loginButton {
#login-button {
-fx-background-radius: 1.0em;
}
#registerSwitch {
#register-switch {
-fx-background-color: transparent;
-fx-text-fill: orange;
}
#loginInputField {
#login-input-field {
-fx-background-color: transparent;
-fx-border: solid;
-fx-border-width: 0.0 0.0 1.0 0.0;
}
#remainingCharsLabel {
#remaining-chars-label {
-fx-text-fill: #00FF00;
-fx-background-color: transparent;
}
@ -123,15 +123,15 @@
-fx-text-fill: red;
}
#transparentBackground {
#transparent-background {
-fx-background-color: transparent;
}
#profilePic {
#profile-pic {
-fx-radius: 1.0em;
}
.listElement {
.list-element {
-fx-background-color: transparent;
}

14
client/src/main/resources/css/dark.css
View File

@ -18,7 +18,7 @@
-fx-background-color: lightgray;
}
#messageList, .text-field, .password-field, .tooltip, .pane, .pane .content, .vbox, .titled-pane > .title, .titled-pane > *.content, .context-menu, .menu-item {
#message-list, .text-field, .password-field, .tooltip, .pane, .pane .content, .vbox, .titled-pane > .title, .titled-pane > *.content, .context-menu, .menu-item {
-fx-background-color: #222222;
}
@ -38,19 +38,19 @@
-fx-background-color: black;
}
#loginInputField {
#login-input-field {
-fx-border-color: white;
}
#loginBackground {
#login-background {
-fx-background-color: rgb(25, 25, 25);
}
#chatList, #topBar, #search-panel, #note-background {
#chat-list, #top-bar, #search-panel, #note-background {
-fx-background-color: #303030;
}
#textEnterContainer {
#text-enter-container {
-fx-background-color: #363636;
}
@ -64,7 +64,7 @@
-fx-border-color: #202020;
}
.groupMemberNames {
.group-member-names {
-fx-text-fill: rgb(105.0,0.0,153.0);
-fx-font-weight: bold;
}
@ -83,7 +83,7 @@
-fx-background-radius : 2.0em;
}
#proceedButton {
#proceed-button {
-fx-text-fill: white;
-fx-background-color: transparent;
}

34
client/src/main/resources/fxml/ChatScene.fxml
View File

@ -45,7 +45,7 @@
<children>
<Label id="contact-search-enter-container" maxHeight="30.0" minHeight="30.0" prefHeight="30.0" prefWidth="325.0">
<graphic>
<TextArea id="contactSearchInput" fx:id="contactSearch" focusTraversable="false" maxHeight="30.0" minHeight="30.0" onInputMethodTextChanged="#searchContacts" onKeyTyped="#searchContacts" prefHeight="30.0" prefWidth="200.0" promptText="Search Contacts">
<TextArea id="contact-search-input" fx:id="contactSearch" focusTraversable="false" maxHeight="30.0" minHeight="30.0" onInputMethodTextChanged="#searchContacts" onKeyTyped="#searchContacts" prefHeight="30.0" prefWidth="200.0" promptText="Search Contacts">
<font>
<Font size="14.0" />
</font>
@ -86,7 +86,7 @@
</HBox>
</children>
</VBox>
<ListView id="chatList" fx:id="chatList" focusTraversable="false" onMouseClicked="#chatListClicked" prefWidth="316.0" VBox.vgrow="ALWAYS">
<ListView id="chat-list" fx:id="chatList" focusTraversable="false" onMouseClicked="#chatListClicked" prefWidth="316.0" VBox.vgrow="ALWAYS">
<contextMenu>
<ContextMenu anchorLocation="CONTENT_TOP_LEFT">
<items>
@ -114,14 +114,14 @@
<Insets right="1.0" />
</GridPane.margin>
</TabPane>
<HBox id="topBar" alignment="CENTER_LEFT" prefHeight="100.0">
<HBox id="top-bar" alignment="CENTER_LEFT" prefHeight="100.0">
<children>
<ImageView id="profilePic" fx:id="clientProfilePic" fitHeight="43.0" fitWidth="43.0" pickOnBounds="true" preserveRatio="true">
<ImageView id="profile-pic" fx:id="clientProfilePic" fitHeight="43.0" fitWidth="43.0" pickOnBounds="true" preserveRatio="true">
<HBox.margin>
<Insets left="15.0" top="5.0" />
</HBox.margin>
</ImageView>
<Label id="transparentBackground" fx:id="contactLabel" prefHeight="27.0" prefWidth="134.0">
<Label id="transparent-background" fx:id="contactLabel" prefHeight="27.0" prefWidth="134.0">
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding>
@ -132,8 +132,8 @@
<Insets left="10.0" top="5.0" />
</HBox.margin>
</Label>
<Region id="transparentBackground" prefHeight="77.0" prefWidth="115.0" />
<VBox id="transparentBackground" alignment="CENTER_RIGHT" prefHeight="200.0" prefWidth="100.0" spacing="5.0">
<Region id="transparent-background" prefHeight="77.0" prefWidth="115.0" />
<VBox id="transparent-background" alignment="CENTER_RIGHT" prefHeight="200.0" prefWidth="100.0" spacing="5.0">
<children>
<Button fx:id="settingsButton" mnemonicParsing="true" onAction="#settingsButtonClicked" prefHeight="30.0" prefWidth="30.0" text="">
<padding>
@ -156,7 +156,7 @@
<Insets bottom="1.0" right="1.0" />
</GridPane.margin>
</HBox>
<ListView id="messageList" fx:id="messageList" focusTraversable="false" GridPane.columnIndex="1" GridPane.columnSpan="2147483647" GridPane.rowIndex="1" GridPane.rowSpan="2">
<ListView id="message-list" fx:id="messageList" focusTraversable="false" GridPane.columnIndex="1" GridPane.columnSpan="2147483647" GridPane.rowIndex="1" GridPane.rowSpan="2">
<GridPane.margin>
<Insets />
</GridPane.margin>
@ -166,9 +166,9 @@
</ListView>
<HBox alignment="CENTER" GridPane.columnIndex="1" GridPane.rowIndex="3">
<children>
<Label id="textEnterContainer" alignment="CENTER" minWidth="300.0" prefHeight="100.0" prefWidth="800.0">
<Label id="text-enter-container" alignment="CENTER" minWidth="300.0" prefHeight="100.0" prefWidth="800.0">
<graphic>
<TextArea id="messageEnter" fx:id="messageTextArea" disable="true" onInputMethodTextChanged="#messageTextUpdated" onKeyPressed="#checkPostConditions" onKeyTyped="#checkKeyCombination" prefHeight="100.0" prefWidth="1250.0" promptText="Enter Message" wrapText="true">
<TextArea id="message-enter" fx:id="messageTextArea" disable="true" onInputMethodTextChanged="#messageTextUpdated" onKeyPressed="#checkPostConditions" onKeyTyped="#checkKeyCombination" prefHeight="100.0" prefWidth="1250.0" promptText="Enter Message" wrapText="true">
<opaqueInsets>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</opaqueInsets>
@ -180,7 +180,7 @@
</Label>
<HBox prefHeight="38.0" prefWidth="100.0" spacing="5.0">
<children>
<Button id="roundButton" fx:id="postButton" defaultButton="true" disable="true" minWidth="40.0" mnemonicParsing="true" onAction="#postMessage" prefHeight="40.0" prefWidth="40.0" text="Post">
<Button id="round-button" fx:id="postButton" defaultButton="true" disable="true" minWidth="40.0" mnemonicParsing="true" onAction="#postMessage" prefHeight="40.0" prefWidth="40.0" text="Post">
<tooltip>
<Tooltip anchorLocation="WINDOW_TOP_LEFT" autoHide="true" maxWidth="350.0" text="Click this button to send the message. If it is disabled, you first have to select a contact to send it to. A message may automatically be sent when you press (Ctrl + ) Enter, according to your preferences. Additionally sends a message when pressing &quot;Alt&quot; + &quot;P&quot;." wrapText="true" />
</tooltip>
@ -198,12 +198,12 @@
<Insets left="10.0" />
</HBox.margin>
</Button>
<Button id="roundButton" fx:id="voiceButton" disable="true" minWidth="40.0" onAction="#voiceButtonClicked" prefHeight="40.0" prefWidth="40.0">
<Button id="round-button" fx:id="voiceButton" disable="true" minWidth="40.0" onAction="#voiceButtonClicked" prefHeight="40.0" prefWidth="40.0">
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding>
</Button>
<Button id="roundButton" fx:id="attachmentButton" disable="true" minWidth="40.0" mnemonicParsing="false" onAction="#attachmentButtonClicked" prefHeight="40.0" prefWidth="40.0">
<Button id="round-button" fx:id="attachmentButton" disable="true" minWidth="40.0" mnemonicParsing="false" onAction="#attachmentButtonClicked" prefHeight="40.0" prefWidth="40.0">
<padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding>
@ -220,7 +220,7 @@
</HBox>
<HBox prefHeight="100.0" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2">
<children>
<Label id="remainingCharsLabel" fx:id="remainingChars" ellipsisString="" maxHeight="30.0" maxWidth="180.0" prefHeight="30.0" prefWidth="180.0" text="remaining chars: 0/x" textFill="LIME" textOverrun="LEADING_WORD_ELLIPSIS" visible="false">
<Label id="remaining-chars-label" fx:id="remainingChars" ellipsisString="" maxHeight="30.0" maxWidth="180.0" prefHeight="30.0" prefWidth="180.0" text="remaining chars: 0/x" textFill="LIME" textOverrun="LEADING_WORD_ELLIPSIS" visible="false">
<padding>
<Insets bottom="5.0" top="5.0" />
</padding>
@ -246,9 +246,9 @@
<Insets bottom="5.0" right="10.0" top="5.0" />
</GridPane.margin>
</ImageView>
<HBox id="topBar" alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" GridPane.columnIndex="1">
<HBox id="top-bar" alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" GridPane.columnIndex="1">
<children>
<ImageView id="profilePic" fx:id="recipientProfilePic" fitHeight="43.0" fitWidth="43.0" pickOnBounds="true" preserveRatio="true">
<ImageView id="profile-pic" fx:id="recipientProfilePic" fitHeight="43.0" fitWidth="43.0" pickOnBounds="true" preserveRatio="true">
<HBox.margin>
<Insets left="20.0" top="5.0" />
</HBox.margin>
@ -267,7 +267,7 @@
</HBox.margin>
</VBox>
<Region prefHeight="200.0" prefWidth="200.0" HBox.hgrow="ALWAYS" />
<Button id="roundButton" fx:id="messageSearchButton" contentDisplay="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" prefHeight="40.0" prefWidth="40.0" visible="false">
<Button id="round-button" fx:id="messageSearchButton" contentDisplay="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" mnemonicParsing="false" prefHeight="40.0" prefWidth="40.0" visible="false">
<HBox.margin>
<Insets right="20.0" />
</HBox.margin>

4
client/src/main/resources/fxml/ContactSearchTab.fxml
View File

@ -26,7 +26,7 @@
<children>
<Label id="contact-search-enter-container" maxHeight="30.0" minHeight="30.0" prefHeight="30.0" prefWidth="325.0">
<graphic>
<TextArea id="contactSearchInput" fx:id="searchBar" focusTraversable="false" maxHeight="30.0" minHeight="30.0" onInputMethodTextChanged="#sendRequest" onKeyTyped="#sendRequest" prefHeight="30.0" prefWidth="200.0" promptText="Search Envoy Users">
<TextArea id="contact-search-input" fx:id="searchBar" focusTraversable="false" maxHeight="30.0" minHeight="30.0" onInputMethodTextChanged="#sendRequest" onKeyTyped="#sendRequest" prefHeight="30.0" prefWidth="200.0" promptText="Search Envoy Users">
<font>
<Font size="14.0" />
</font>
@ -45,7 +45,7 @@
<Insets bottom="17.0" top="5.0" />
</padding>
</HBox>
<ListView id="chatList" fx:id="userList" focusTraversable="false" onMouseClicked="#userListClicked" prefWidth="316.0" VBox.vgrow="ALWAYS">
<ListView id="chat-list" fx:id="userList" focusTraversable="false" onMouseClicked="#userListClicked" prefWidth="316.0" VBox.vgrow="ALWAYS">
<contextMenu>
<ContextMenu anchorLocation="CONTENT_TOP_LEFT" />
</contextMenu>

8
client/src/main/resources/fxml/GroupCreationTab.fxml
View File

@ -24,7 +24,7 @@
</Label>
<Label id="contact-search-enter-container" maxHeight="30.0" minHeight="30.0" prefHeight="30.0" prefWidth="325.0">
<graphic>
<TextArea id="contactSearchInput" fx:id="groupNameField" focusTraversable="false" maxHeight="30.0" minHeight="30.0" onInputMethodTextChanged="#textUpdated" onKeyTyped="#textUpdated" prefHeight="30.0" prefWidth="200.0" promptText="Enter Group Name">
<TextArea id="contact-search-input" fx:id="groupNameField" focusTraversable="false" maxHeight="30.0" minHeight="30.0" onInputMethodTextChanged="#textUpdated" onKeyTyped="#textUpdated" prefHeight="30.0" prefWidth="200.0" promptText="Enter Group Name">
<font>
<Font size="14.0" />
</font>
@ -40,8 +40,8 @@
<Label id="infoLabel-error" fx:id="errorMessageLabel" maxHeight="0.0" minHeight="0.0" prefHeight="0.0" textAlignment="CENTER" textFill="RED" VBox.vgrow="ALWAYS" />
<HBox fx:id="errorProceedBox" alignment="TOP_CENTER" maxHeight="0.0" minHeight="0.0" prefHeight="0.0" prefWidth="316.0" spacing="5.0">
<children>
<Button id="proceedButton" fx:id="proceedDupButton" maxHeight="0.0" minHeight="0.0" mnemonicParsing="false" onAction="#proceedOnNameDuplication" prefHeight="0.0" text="Proceed" />
<Button id="proceedButton" fx:id="cancelDupButton" maxHeight="0.0" minHeight="0.0" mnemonicParsing="false" onAction="#cancelOnNameDuplication" prefHeight="0.0" text="Cancel" />
<Button id="proceed-button" fx:id="proceedDupButton" maxHeight="0.0" minHeight="0.0" mnemonicParsing="false" onAction="#proceedOnNameDuplication" prefHeight="0.0" text="Proceed" />
<Button id="proceed-button" fx:id="cancelDupButton" maxHeight="0.0" minHeight="0.0" mnemonicParsing="false" onAction="#cancelOnNameDuplication" prefHeight="0.0" text="Cancel" />
</children>
</HBox>
<HBox id="underline" alignment="TOP_CENTER" prefWidth="200.0" spacing="5.0">
@ -64,7 +64,7 @@
<Insets bottom="5.0" top="5" />
</VBox.margin>
</Label>
<ListView id="chatList" fx:id="userList" focusTraversable="false" onMouseClicked="#userListClicked" prefWidth="316.0" VBox.vgrow="ALWAYS">
<ListView id="chat-list" fx:id="userList" focusTraversable="false" onMouseClicked="#userListClicked" prefWidth="316.0" VBox.vgrow="ALWAYS">
<contextMenu>
<ContextMenu anchorLocation="CONTENT_TOP_LEFT" />
</contextMenu>

12
client/src/main/resources/fxml/LoginScene.fxml
View File

@ -14,7 +14,7 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
<VBox id="loginBackground" alignment="TOP_CENTER" prefHeight="500.0" prefWidth="350.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.controller.LoginScene">
<VBox id="login-background" alignment="TOP_CENTER" prefHeight="500.0" prefWidth="350.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="envoy.client.ui.controller.LoginScene">
<children>
<ImageView fx:id="logo" fitHeight="80.0" fitWidth="80.0" pickOnBounds="true" preserveRatio="true">
<VBox.margin>
@ -55,12 +55,12 @@
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<TextField id="loginInputField" fx:id="userTextField" promptText="Username">
<TextField id="login-input-field" fx:id="userTextField" promptText="Username">
<GridPane.margin>
<Insets bottom="0.0" left="5.0" right="5.0" top="0.0" />
</GridPane.margin>
</TextField>
<PasswordField id="loginInputField" fx:id="passwordField" promptText=" Password" GridPane.rowIndex="1">
<PasswordField id="login-input-field" fx:id="passwordField" promptText=" Password" GridPane.rowIndex="1">
<GridPane.margin>
<Insets bottom="0.0" left="5.0" right="5.0" top="0.0" />
</GridPane.margin>
@ -68,7 +68,7 @@
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding>
</PasswordField>
<PasswordField id="loginInputField" fx:id="repeatPasswordField" promptText=" Repeat Password" visible="false" GridPane.rowIndex="2">
<PasswordField id="login-input-field" fx:id="repeatPasswordField" promptText=" Repeat Password" visible="false" GridPane.rowIndex="2">
<GridPane.margin>
<Insets bottom="0.0" left="5.0" right="5.0" top="0.0" />
</GridPane.margin>
@ -81,7 +81,7 @@
<Insets bottom="10.0" left="25.0" right="25.0" top="10.0" />
</VBox.margin>
</GridPane>
<Button id="loginButton" fx:id="loginButton" defaultButton="true" focusTraversable="false" mnemonicParsing="false" onAction="#loginButtonPressed" text="Login" textAlignment="CENTER">
<Button id="login-button" fx:id="loginButton" defaultButton="true" focusTraversable="false" mnemonicParsing="false" onAction="#loginButtonPressed" text="Login" textAlignment="CENTER">
<font>
<Font size="16.0" />
</font>
@ -95,7 +95,7 @@
<HBox alignment="CENTER" prefHeight="30.0" prefWidth="200.0">
<children>
<Label fx:id="registerTextLabel" text="No account yet?" />
<Button id="registerSwitch" fx:id="registerSwitch" accessibleRole="CHECK_BOX" focusTraversable="false" mnemonicParsing="false" onAction="#registerSwitchPressed" text="Register" />
<Button id="register-switch" fx:id="registerSwitch" accessibleRole="CHECK_BOX" focusTraversable="false" mnemonicParsing="false" onAction="#registerSwitchPressed" text="Register" />
</children>
<VBox.margin>
<Insets bottom="20.0" />