Added elegant way of displaying remaining characters for a message
additionally FOUND (not fixed) a bug automatically posting a message when ctrl is no longer pressed
This commit is contained in:
		@@ -11,6 +11,7 @@ import javafx.fxml.FXML;
 | 
			
		||||
import javafx.scene.control.*;
 | 
			
		||||
import javafx.scene.input.KeyCode;
 | 
			
		||||
import javafx.scene.input.KeyEvent;
 | 
			
		||||
import javafx.scene.paint.Color;
 | 
			
		||||
 | 
			
		||||
import envoy.client.data.Chat;
 | 
			
		||||
import envoy.client.data.LocalDB;
 | 
			
		||||
@@ -56,6 +57,9 @@ public final class ChatSceneController {
 | 
			
		||||
	@FXML
 | 
			
		||||
	private TextArea messageTextArea;
 | 
			
		||||
 | 
			
		||||
	@FXML
 | 
			
		||||
	private Label remainingChars;
 | 
			
		||||
 | 
			
		||||
	private LocalDB			localDB;
 | 
			
		||||
	private Client			client;
 | 
			
		||||
	private WriteProxy		writeProxy;
 | 
			
		||||
@@ -63,9 +67,10 @@ public final class ChatSceneController {
 | 
			
		||||
 | 
			
		||||
	private Chat currentChat;
 | 
			
		||||
 | 
			
		||||
	private static final Settings	settings	= Settings.getInstance();
 | 
			
		||||
	private static final EventBus	eventBus	= EventBus.getInstance();
 | 
			
		||||
	private static final Logger		logger		= EnvoyLog.getLogger(ChatSceneController.class);
 | 
			
		||||
	private static final Settings	settings			= Settings.getInstance();
 | 
			
		||||
	private static final EventBus	eventBus			= EventBus.getInstance();
 | 
			
		||||
	private static final Logger		logger				= EnvoyLog.getLogger(ChatSceneController.class);
 | 
			
		||||
	private static final int		MAX_MESSAGE_LENGTH	= 255;
 | 
			
		||||
 | 
			
		||||
	@FXML
 | 
			
		||||
	private void initialize() {
 | 
			
		||||
@@ -138,6 +143,10 @@ public final class ChatSceneController {
 | 
			
		||||
				.orElseGet(() -> { final var chat = new Chat(user); localDB.getChats().add(chat); return chat; });
 | 
			
		||||
 | 
			
		||||
			messageList.setItems(FXCollections.observableList(currentChat.getMessages()));
 | 
			
		||||
 | 
			
		||||
			remainingChars.setVisible(true);
 | 
			
		||||
			remainingChars
 | 
			
		||||
				.setText(String.format("remaining chars: %d/%d", MAX_MESSAGE_LENGTH - messageTextArea.getText().length(), MAX_MESSAGE_LENGTH));
 | 
			
		||||
		}
 | 
			
		||||
		messageTextArea.setDisable(currentChat == null);
 | 
			
		||||
	}
 | 
			
		||||
@@ -167,10 +176,27 @@ public final class ChatSceneController {
 | 
			
		||||
 | 
			
		||||
	@FXML
 | 
			
		||||
	private void messageTextUpdated(KeyEvent e) {
 | 
			
		||||
		// TODO: Letting go of ctrl automatically posts a message. Needs to be fixed
 | 
			
		||||
		// soon.
 | 
			
		||||
 | 
			
		||||
		// Automatic sending of messages via (ctrl +) enter
 | 
			
		||||
		if (!postButton.isDisabled() && settings.isEnterToSend() && e.getCode() == KeyCode.ENTER
 | 
			
		||||
				|| !settings.isEnterToSend() && e.getCode() == KeyCode.CONTROL)
 | 
			
		||||
			postMessage();
 | 
			
		||||
		else postButton.setDisable(messageTextArea.getText().isBlank() || currentChat == null);
 | 
			
		||||
 | 
			
		||||
		// Truncating messages that are too long and staying at the same position
 | 
			
		||||
		if (messageTextArea.getText().length() >= MAX_MESSAGE_LENGTH) {
 | 
			
		||||
			messageTextArea.setText(messageTextArea.getText().substring(0, MAX_MESSAGE_LENGTH));
 | 
			
		||||
			messageTextArea.positionCaret(MAX_MESSAGE_LENGTH);
 | 
			
		||||
			messageTextArea.setScrollTop(Double.MAX_VALUE);
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		// Redesigning the remainingChars - Label
 | 
			
		||||
		final int	currentLength	= messageTextArea.getText().length();
 | 
			
		||||
		final int	remainingLength	= MAX_MESSAGE_LENGTH - currentLength;
 | 
			
		||||
		remainingChars.setText(String.format("remaining chars: %d/%d", remainingLength, MAX_MESSAGE_LENGTH));
 | 
			
		||||
		remainingChars.setTextFill(Color.rgb(currentLength, remainingLength, 0, 1));
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	/**
 | 
			
		||||
 
 | 
			
		||||
@@ -17,8 +17,8 @@
 | 
			
		||||
	</columnConstraints>
 | 
			
		||||
	<rowConstraints>
 | 
			
		||||
		<RowConstraints maxHeight="1.7976931348623157E308" minHeight="10.0" percentHeight="10.0" prefHeight="70.0" vgrow="SOMETIMES" />
 | 
			
		||||
		<RowConstraints maxHeight="1.7976931348623157E308" minHeight="10.0" percentHeight="60.0" prefHeight="326.2857404436384" vgrow="SOMETIMES" />
 | 
			
		||||
      <RowConstraints maxHeight="1.7976931348623157E308" minHeight="10.0" percentHeight="15.0" prefHeight="50.0" vgrow="SOMETIMES" />
 | 
			
		||||
		<RowConstraints maxHeight="1.7976931348623157E308" minHeight="10.0" percentHeight="70.0" prefHeight="326.2857404436384" vgrow="SOMETIMES" />
 | 
			
		||||
      <RowConstraints maxHeight="1.7976931348623157E308" minHeight="10.0" percentHeight="5.0" prefHeight="50.0" vgrow="SOMETIMES" />
 | 
			
		||||
		<RowConstraints maxHeight="1.7976931348623157E308" minHeight="10.0" percentHeight="15.0" prefHeight="100.0" vgrow="SOMETIMES" />
 | 
			
		||||
	</rowConstraints>
 | 
			
		||||
	<children>
 | 
			
		||||
@@ -27,7 +27,7 @@
 | 
			
		||||
		<Button fx:id="settingsButton" mnemonicParsing="true" onAction="#settingsButtonClicked" text="_Settings" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.valignment="CENTER" />
 | 
			
		||||
		<ListView fx:id="messageList" prefHeight="257.0" prefWidth="155.0" GridPane.columnIndex="1" GridPane.columnSpan="2" GridPane.rowIndex="1" GridPane.rowSpan="2" />
 | 
			
		||||
		<Button fx:id="postButton" defaultButton="true" disable="true" mnemonicParsing="true" onAction="#postButtonClicked" prefHeight="10.0" prefWidth="65.0" text="_Post" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER" />
 | 
			
		||||
      	<TextArea fx:id="messageTextArea" disable="true" onInputMethodTextChanged="#messageTextUpdated" onKeyReleased="#messageTextUpdated" prefHeight="200.0" prefWidth="200.0" wrapText="true" GridPane.columnIndex="1" GridPane.rowIndex="3" />
 | 
			
		||||
      	<TextArea fx:id="messageTextArea" disable="true" onInputMethodTextChanged="#messageTextUpdated" onKeyTyped="#messageTextUpdated" prefHeight="200.0" prefWidth="200.0" wrapText="true" GridPane.columnIndex="1" GridPane.rowIndex="3" />
 | 
			
		||||
      <Button mnemonicParsing="true" onAction="#addContactButtonClicked" text="_Add Contacts" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER">
 | 
			
		||||
         <padding>
 | 
			
		||||
            <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
 | 
			
		||||
@@ -36,5 +36,13 @@
 | 
			
		||||
            <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
 | 
			
		||||
         </GridPane.margin>
 | 
			
		||||
      </Button>
 | 
			
		||||
      <Label fx:id="remainingChars" disable="true" 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" GridPane.columnIndex="1" GridPane.rowIndex="2">
 | 
			
		||||
         <GridPane.margin>
 | 
			
		||||
            <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
 | 
			
		||||
         </GridPane.margin>
 | 
			
		||||
         <padding>
 | 
			
		||||
            <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
 | 
			
		||||
         </padding>
 | 
			
		||||
      </Label>
 | 
			
		||||
	</children>
 | 
			
		||||
</GridPane>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user