From e7d85bd968038185bcf599e9082524b24a52fda5 Mon Sep 17 00:00:00 2001 From: DieGurke Date: Wed, 26 Aug 2020 15:50:46 +0200 Subject: [PATCH] unified id variable names to kebab-case --- .../client/ui/listcell/AbstractListCell.java | 2 +- .../envoy/client/ui/listcell/ChatControl.java | 4 +-- .../client/ui/listcell/ContactControl.java | 2 +- .../client/ui/listcell/MessageControl.java | 2 +- client/src/main/resources/css/base.css | 20 +++++------ client/src/main/resources/css/dark.css | 14 ++++---- client/src/main/resources/fxml/ChatScene.fxml | 34 +++++++++---------- .../main/resources/fxml/ContactSearchTab.fxml | 4 +-- .../main/resources/fxml/GroupCreationTab.fxml | 8 ++--- .../src/main/resources/fxml/LoginScene.fxml | 12 +++---- 10 files changed, 51 insertions(+), 51 deletions(-) diff --git a/client/src/main/java/envoy/client/ui/listcell/AbstractListCell.java b/client/src/main/java/envoy/client/ui/listcell/AbstractListCell.java index 45e424d..a763981 100644 --- a/client/src/main/java/envoy/client/ui/listcell/AbstractListCell.java +++ b/client/src/main/java/envoy/client/ui/listcell/AbstractListCell.java @@ -29,7 +29,7 @@ public abstract class AbstractListCell extends ListCell { public AbstractListCell(ListView listView) { this.listView = listView; setContentDisplay(ContentDisplay.GRAPHIC_ONLY); - getStyleClass().add("listElement"); + getStyleClass().add("list-element"); } @Override diff --git a/client/src/main/java/envoy/client/ui/listcell/ChatControl.java b/client/src/main/java/envoy/client/ui/listcell/ChatControl.java index 8e2a698..fae661d 100644 --- a/client/src/main/java/envoy/client/ui/listcell/ChatControl.java +++ b/client/src/main/java/envoy/client/ui/listcell/ChatControl.java @@ -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"); } } diff --git a/client/src/main/java/envoy/client/ui/listcell/ContactControl.java b/client/src/main/java/envoy/client/ui/listcell/ContactControl.java index eb4a483..c8571a6 100644 --- a/client/src/main/java/envoy/client/ui/listcell/ContactControl.java +++ b/client/src/main/java/envoy/client/ui/listcell/ContactControl.java @@ -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"); } } diff --git a/client/src/main/java/envoy/client/ui/listcell/MessageControl.java b/client/src/main/java/envoy/client/ui/listcell/MessageControl.java index 9b66c6c..50d3fab 100644 --- a/client/src/main/java/envoy/client/ui/listcell/MessageControl.java +++ b/client/src/main/java/envoy/client/ui/listcell/MessageControl.java @@ -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() diff --git a/client/src/main/resources/css/base.css b/client/src/main/resources/css/base.css index 9495823..bc6d471 100644 --- a/client/src/main/resources/css/base.css +++ b/client/src/main/resources/css/base.css @@ -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; } diff --git a/client/src/main/resources/css/dark.css b/client/src/main/resources/css/dark.css index 6c0c7b0..0126507 100644 --- a/client/src/main/resources/css/dark.css +++ b/client/src/main/resources/css/dark.css @@ -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; } diff --git a/client/src/main/resources/fxml/ChatScene.fxml b/client/src/main/resources/fxml/ChatScene.fxml index ac0ab92..8ddee10 100644 --- a/client/src/main/resources/fxml/ChatScene.fxml +++ b/client/src/main/resources/fxml/ChatScene.fxml @@ -45,7 +45,7 @@