|
|
@ -18,7 +18,6 @@ import wow.doge.chatto.service.UserService |
|
|
import scala.concurrent.ExecutionContext |
|
|
import scala.concurrent.ExecutionContext |
|
|
import scala.concurrent.ExecutionContext.Implicits.global |
|
|
import scala.concurrent.ExecutionContext.Implicits.global |
|
|
import com.typesafe.scalalogging.LazyLogging |
|
|
import com.typesafe.scalalogging.LazyLogging |
|
|
// import wow.doge.chatto.controller.LoginController.Person |
|
|
|
|
|
import com.sfxcode.sapphire.core.value.FXBean |
|
|
import com.sfxcode.sapphire.core.value.FXBean |
|
|
import wow.doge.chatto.AppDataHandler |
|
|
import wow.doge.chatto.AppDataHandler |
|
|
import com.jfoenix.controls.JFXListView |
|
|
import com.jfoenix.controls.JFXListView |
|
|
@ -41,6 +40,27 @@ import wow.doge.chatto.messagebuble.BubbleSpec |
|
|
import javafx.scene.layout.Background |
|
|
import javafx.scene.layout.Background |
|
|
import javafx.scene.layout.BackgroundFill |
|
|
import javafx.scene.layout.BackgroundFill |
|
|
import javafx.geometry.Pos |
|
|
import javafx.geometry.Pos |
|
|
|
|
|
import scalafx.beans.property.ReadOnlyBufferProperty |
|
|
|
|
|
import scalafx.beans.property.ReadOnlyBufferWrapper |
|
|
|
|
|
import javafx.beans.property.ReadOnlyListProperty |
|
|
|
|
|
import scalafx.beans.property.BufferProperty |
|
|
|
|
|
import javafx.collections.FXCollections |
|
|
|
|
|
import com.sandec.mdfx.MDFXNode |
|
|
|
|
|
import javafx.scene.layout.BorderPane |
|
|
|
|
|
import javafx.scene.layout.Priority |
|
|
|
|
|
import net.synedra.validatorfx.Validator |
|
|
|
|
|
import wow.doge.chatto.control.JFXSmoothScroll |
|
|
|
|
|
import javafx.scene.control.ContextMenu |
|
|
|
|
|
import javafx.scene.control.MenuItem |
|
|
|
|
|
import javafx.scene.input.Clipboard |
|
|
|
|
|
import javafx.scene.input.ClipboardContent |
|
|
|
|
|
import scalafx.scene.input.KeyCodeCombination |
|
|
|
|
|
import scalafx.scene.input.KeyCode |
|
|
|
|
|
import scalafx.scene.input.KeyCombination |
|
|
|
|
|
import javafx.scene.input.DataFormat |
|
|
|
|
|
import wow.doge.chatto.control.MessageBox |
|
|
|
|
|
import javafx.scene.control.SelectionMode |
|
|
|
|
|
import scalafx.beans.property.BooleanProperty |
|
|
|
|
|
|
|
|
class ChatController @Inject() ( |
|
|
class ChatController @Inject() ( |
|
|
userService: UserService, |
|
|
userService: UserService, |
|
|
@ -49,71 +69,54 @@ class ChatController @Inject() ( |
|
|
with LazyLogging { |
|
|
with LazyLogging { |
|
|
|
|
|
|
|
|
// @FXML private var label: Label = _ |
|
|
// @FXML private var label: Label = _ |
|
|
@FXML private var flowPane: FlowPane = _ |
|
|
|
|
|
|
|
|
@FXML var chatMainPane: BorderPane = _ |
|
|
|
|
|
// @FXML private var flowPane: FlowPane = _ |
|
|
@FXML private var submitButton: Button = _ |
|
|
@FXML private var submitButton: Button = _ |
|
|
@FXML private var logoutButton: Button = _ |
|
|
@FXML private var logoutButton: Button = _ |
|
|
// @FXML private var chatTextArea: TextArea = _ |
|
|
// @FXML private var chatTextArea: TextArea = _ |
|
|
@FXML private var chatInput: TextArea = _ |
|
|
@FXML private var chatInput: TextArea = _ |
|
|
@FXML private var usersVBox: VBox = _ |
|
|
@FXML private var usersVBox: VBox = _ |
|
|
@FXML var usersListView: JFXListView[UserBox2] = _ |
|
|
@FXML var usersListView: JFXListView[UserBox2] = _ |
|
|
@FXML var chatListView: JFXListView[HBox] = _ |
|
|
|
|
|
|
|
|
@FXML var chatListView: JFXListView[MessageBox] = _ |
|
|
@FXML private var curUsr: Label = _ |
|
|
@FXML private var curUsr: Label = _ |
|
|
@FXML private var dataContent: Label = _ |
|
|
|
|
|
// applicationController.show |
|
|
|
|
|
private val usersListProperty = new SimpleListProperty( |
|
|
|
|
|
ObservableBuffer[UserBox2]() |
|
|
|
|
|
|
|
|
@FXML private var lastActiveLabel: Label = _ |
|
|
|
|
|
@FXML private var isOnlineLabel: Label = _ |
|
|
|
|
|
@FXML private var selectedUserBox: HBox = _ |
|
|
|
|
|
|
|
|
|
|
|
private val usersBuffer = ObservableBuffer.empty[UserBox2] |
|
|
|
|
|
private val usersListProperty = BufferProperty(usersBuffer) |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
|
* Readonly property wrapping an unmodifiable list. |
|
|
|
|
|
* Synchronized with the internal users list property. |
|
|
|
|
|
* Attemping to modify the internal list will throw an exception |
|
|
|
|
|
*/ |
|
|
|
|
|
val usersListROProp: ReadOnlyListProperty[UserBox2] = BufferProperty( |
|
|
|
|
|
FXCollections.unmodifiableObservableList(usersListProperty()) |
|
|
) |
|
|
) |
|
|
private val chatDataBuffer = ObservableBuffer[UserBox2]() |
|
|
|
|
|
private val chatDataStore: mutable.Map[String, ChatDataProperty] = |
|
|
|
|
|
TrieMap() |
|
|
|
|
|
|
|
|
|
|
|
// private lazy val curUserKeys = KeyBindings("curUser") |
|
|
|
|
|
// bindings.add("person", "Person ${_self.name()} with age of ${_self.age()} is active: ${_self.isActive()}") |
|
|
|
|
|
// private lazy val curUserAdapter = FXBeanAdapter[User](this) |
|
|
|
|
|
|
|
|
private val chatDataStore = TrieMap.empty[String, ChatDataProperty] |
|
|
|
|
|
|
|
|
private lazy val chatDataAdapter = FXBeanAdapter[ChatData](this) |
|
|
private lazy val chatDataAdapter = FXBeanAdapter[ChatData](this) |
|
|
|
|
|
|
|
|
override def didGainVisibilityFirstTime(): Unit = { |
|
|
override def didGainVisibilityFirstTime(): Unit = { |
|
|
super.didGainVisibilityFirstTime() |
|
|
super.didGainVisibilityFirstTime() |
|
|
// val ub = new UserBox() |
|
|
|
|
|
this.stage.resizable = true |
|
|
this.stage.resizable = true |
|
|
// ub.messageLabel.text = "Hi there" |
|
|
|
|
|
// ub.messageLabel.id = |
|
|
|
|
|
// ub.userRadioButton.text = "User 1" |
|
|
|
|
|
// usersVBox.children.clear() |
|
|
|
|
|
// usersVBox.children += ub |
|
|
|
|
|
// println("test") |
|
|
|
|
|
// println(s"Result = ${func()}") |
|
|
|
|
|
// offFX(println("hello from new thread")) |
|
|
|
|
|
// chatTextArea.visible <== !chatInput.text.isEmpty |
|
|
|
|
|
// chatTextArea.text <== chatInput.text |
|
|
|
|
|
|
|
|
|
|
|
// for (r <- userService.func2()) yield (logger.info(s"${r.body}")) |
|
|
|
|
|
|
|
|
|
|
|
// val person = Person(0, 10, "Billy") |
|
|
|
|
|
// val bean = FXBean[Person](person) |
|
|
|
|
|
// ub.messageLabel.text <== bean.getStringProperty("name") |
|
|
|
|
|
// bean.getStringProperty("name") <== chatInput.text |
|
|
|
|
|
|
|
|
|
|
|
// bean.getStringProperty("name")() = "Lester" |
|
|
|
|
|
// println(bean.getValue("name")) |
|
|
|
|
|
// println(bean.getStringProperty("name")()) |
|
|
|
|
|
// bean. |
|
|
|
|
|
// bean.updateValue("name", "Lester") |
|
|
|
|
|
// println(bean.bean) |
|
|
|
|
|
|
|
|
|
|
|
// val curUserBean = FXBean[User](User("None")) |
|
|
|
|
|
|
|
|
|
|
|
// logoutButton.onAction = (e) => |
|
|
|
|
|
|
|
|
|
|
|
// usersListView |
|
|
|
|
|
// .getSelectionModel() |
|
|
|
|
|
// .selectedItemProperty() |
|
|
|
|
|
// .addListener((_, _, newValue) => { |
|
|
|
|
|
// curUsr.text() = newValue.usernameLabel.text() |
|
|
|
|
|
// }) |
|
|
|
|
|
|
|
|
chatMainPane.hgrow = Priority.ALWAYS |
|
|
|
|
|
chatListView.selectionModel().selectionMode = SelectionMode.MULTIPLE |
|
|
|
|
|
|
|
|
|
|
|
chatDataAdapter.set(FXBean(ChatData.empty)) |
|
|
|
|
|
|
|
|
|
|
|
Array(submitButton, chatInput).foreach(n => { |
|
|
|
|
|
n.disableProperty() <== usersListView |
|
|
|
|
|
.selectionModel() |
|
|
|
|
|
.selectedItemProperty() |
|
|
|
|
|
.isNull() |
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
// curUserKeys.add("content", "${_self.data().content()}") |
|
|
// curUserKeys.add("content", "${_self.data().content()}") |
|
|
val chatDataAdapterKeys = KeyBindings() |
|
|
val chatDataAdapterKeys = KeyBindings() |
|
|
// chatDataAdapterKeys.add("currentUser", "${_self.userName()}") |
|
|
|
|
|
|
|
|
chatDataAdapterKeys.add("currentUser", "${_self.userName()}") |
|
|
// chatDataAdapterKeys.add( |
|
|
// chatDataAdapterKeys.add( |
|
|
// "lastActive", |
|
|
// "lastActive", |
|
|
// "${_self.lastActiveString()}" |
|
|
// "${_self.lastActiveString()}" |
|
|
@ -125,39 +128,97 @@ class ChatController @Inject() ( |
|
|
// curUserAdapter.addDateConverter() |
|
|
// curUserAdapter.addDateConverter() |
|
|
// curUserAdapter.addBindings(curUserKeys) |
|
|
// curUserAdapter.addBindings(curUserKeys) |
|
|
chatDataAdapter.addBindings(chatDataAdapterKeys) |
|
|
chatDataAdapter.addBindings(chatDataAdapterKeys) |
|
|
// curUsr.text <== chatDataAdapter.beanProperty |
|
|
|
|
|
// .getOrElse(FXBean(ChatData.empty)) |
|
|
|
|
|
// .getStringProperty("lastActiveString") |
|
|
|
|
|
usersListView |
|
|
usersListView |
|
|
.getSelectionModel() |
|
|
|
|
|
|
|
|
.selectionModel() |
|
|
.selectedItemProperty() |
|
|
.selectedItemProperty() |
|
|
.addListener((_, _, newValue) => { |
|
|
.addListener((_, _, newValue) => { |
|
|
if (newValue != null) { |
|
|
|
|
|
// val dataBean = |
|
|
|
|
|
// FXBean(User(newValue.usernameLabel.text(), Data("test data"))) |
|
|
|
|
|
// curUserAdapter |
|
|
|
|
|
// .set(dataBean) |
|
|
|
|
|
// chatDataAdapter.set(newValue.chatDataBean) |
|
|
|
|
|
val y = chatDataStore |
|
|
|
|
|
.get(newValue.username) |
|
|
|
|
|
val x = y |
|
|
|
|
|
|
|
|
Option(newValue).foreach(nv => { |
|
|
|
|
|
val maybeCDP = chatDataStore |
|
|
|
|
|
.get(nv.username) |
|
|
|
|
|
val chatDataBean = maybeCDP |
|
|
.map(_.bean) |
|
|
.map(_.bean) |
|
|
.getOrElse { |
|
|
.getOrElse { |
|
|
logger.error("Error null") |
|
|
logger.error("Error null") |
|
|
FXBean(ChatData.empty) |
|
|
FXBean(ChatData.empty) |
|
|
} |
|
|
} |
|
|
chatDataAdapter.set(x) |
|
|
|
|
|
y.map(z => chatListView.items <== z.prop) |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
chatDataAdapter.set(chatDataBean) |
|
|
|
|
|
maybeCDP.foreach(cdp => { |
|
|
|
|
|
// lastActiveLabel.text <== cdp.lastActive |
|
|
|
|
|
isOnlineLabel.text <== cdp.isActive.asString() |
|
|
|
|
|
chatListView.items <== cdp.messageBubbles |
|
|
|
|
|
}) |
|
|
|
|
|
}) |
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
val copyMessageMenuItem = new MenuItem("Copy Message") |
|
|
|
|
|
copyMessageMenuItem.accelerator = |
|
|
|
|
|
new KeyCodeCombination(KeyCode.C, KeyCombination.ControlDown) |
|
|
|
|
|
copyMessageMenuItem.onAction = _ => { |
|
|
|
|
|
val content = new ClipboardContent() |
|
|
|
|
|
val x = chatListView.getSelectionModel().getSelectedItems().map(_.message) |
|
|
|
|
|
// chatListView.selectionModel().selectedItem().message |
|
|
|
|
|
Option(x).foreach(message => { |
|
|
|
|
|
content.putString(message.mkString("\n")) |
|
|
|
|
|
Clipboard.getSystemClipboard().setContent(content) |
|
|
}) |
|
|
}) |
|
|
|
|
|
// val message = cdp.messageList(selectedIndex) |
|
|
|
|
|
|
|
|
|
|
|
// val maybeCDP = chatDataStore.get(chatDataAdapter.get.bean.userName) |
|
|
|
|
|
// maybeCDP.foreach(cdp => { |
|
|
|
|
|
// // val message = Option(cdp.messageList().get(selectedIndex)).toRight { |
|
|
|
|
|
// // "Unexpected error - message not found" |
|
|
|
|
|
// // } |
|
|
|
|
|
// // message.map(msg => { |
|
|
|
|
|
// // // content.putString(msg) |
|
|
|
|
|
// // // clipboard.setContent(content) |
|
|
|
|
|
// // // val content = clipboard.content |
|
|
|
|
|
// // // content.putString(msg) |
|
|
|
|
|
// // // clipboard.content = content |
|
|
|
|
|
// // clipboard.putString(msg) |
|
|
|
|
|
// // }) |
|
|
|
|
|
// // message.left.map(err => logger.error(err)) |
|
|
|
|
|
// }) |
|
|
|
|
|
} |
|
|
|
|
|
val chatListMenu = new ContextMenu() |
|
|
|
|
|
|
|
|
// curUsr.text <== usersListView |
|
|
|
|
|
// .getSelectionModel() |
|
|
|
|
|
// .getSelectedItem() |
|
|
|
|
|
// .usernameLabel |
|
|
|
|
|
// .text |
|
|
|
|
|
|
|
|
chatListMenu.items += copyMessageMenuItem |
|
|
|
|
|
chatListView.contextMenu = chatListMenu |
|
|
|
|
|
|
|
|
usersListView.items <== usersListProperty |
|
|
usersListView.items <== usersListProperty |
|
|
|
|
|
|
|
|
|
|
|
val validator = new Validator() |
|
|
|
|
|
|
|
|
|
|
|
submitButton.disable <== validator.containsErrorsProperty() |
|
|
|
|
|
|
|
|
|
|
|
submitButton.onAction = (e) => { |
|
|
|
|
|
// val msgBox = ChatDataProperty.createMdMessageBox2(chatInput.text()) |
|
|
|
|
|
// chatListView.items() += msgBox |
|
|
|
|
|
if (!chatInput.text().equals("") && |
|
|
|
|
|
!chatInput.text().equals(" ") && |
|
|
|
|
|
!chatInput.text().equals("\n")) { |
|
|
|
|
|
val maybeCDP = chatDataStore.get(chatDataAdapter.get.bean.userName) |
|
|
|
|
|
|
|
|
|
|
|
maybeCDP.foreach(cdp => { |
|
|
|
|
|
cdp.messageBubbles += ChatDataProperty.createMdMessageBox3( |
|
|
|
|
|
appDataHandler.appData.credentials.username, |
|
|
|
|
|
cdp.username(), |
|
|
|
|
|
chatInput.text() |
|
|
|
|
|
) |
|
|
|
|
|
}) |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
validator |
|
|
|
|
|
.createCheck() |
|
|
|
|
|
.withMethod(c => { |
|
|
|
|
|
val userName = chatInput.text() |
|
|
|
|
|
if (!userName.toLowerCase().equals(userName)) { |
|
|
|
|
|
c.error("Please use only lowercase letters.") |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
.dependsOn("chatInput", chatInput.text) |
|
|
|
|
|
.decorates(chatInput) |
|
|
|
|
|
.immediate() |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
override def didGainVisibility(): Unit = { |
|
|
override def didGainVisibility(): Unit = { |
|
|
@ -165,70 +226,60 @@ class ChatController @Inject() ( |
|
|
chatInput.requestFocus() |
|
|
chatInput.requestFocus() |
|
|
|
|
|
|
|
|
async { |
|
|
async { |
|
|
val willBeUsers = userService |
|
|
|
|
|
.getUsers(appDataHandler.appData.credentials) |
|
|
|
|
|
.map(_.body) |
|
|
|
|
|
val willBeActiveUsers = userService |
|
|
val willBeActiveUsers = userService |
|
|
.getActiveUsers(appDataHandler.appData.credentials) |
|
|
.getActiveUsers(appDataHandler.appData.credentials) |
|
|
.map(_.body) |
|
|
.map(_.body) |
|
|
val maybeUsers = await(willBeUsers) |
|
|
|
|
|
val maybeActiveUsers = await(willBeActiveUsers) |
|
|
val maybeActiveUsers = await(willBeActiveUsers) |
|
|
|
|
|
|
|
|
// maybeActiveUsers.foreach(println) |
|
|
|
|
|
logger.debug(s"$maybeActiveUsers") |
|
|
|
|
|
|
|
|
logger.debug(s"Received Users: $maybeActiveUsers") |
|
|
|
|
|
|
|
|
val maybeUserBoxes = maybeActiveUsers.map(users => { |
|
|
val maybeUserBoxes = maybeActiveUsers.map(users => { |
|
|
// usersBuffer ++= users |
|
|
|
|
|
users.map(user => { |
|
|
users.map(user => { |
|
|
// usersBuffer += FXBean(User(user)) |
|
|
|
|
|
// val ub = new UserBox() |
|
|
|
|
|
// ub.messageLabel.text = "Hi there" |
|
|
|
|
|
// ub.userRadioButton.text = user |
|
|
|
|
|
// ub |
|
|
|
|
|
// new Rectangle { |
|
|
|
|
|
// fill <== when(hover) choose (Color.Red) |
|
|
|
|
|
// } |
|
|
|
|
|
// val hb = new HBox |
|
|
|
|
|
val chatData = |
|
|
val chatData = |
|
|
ChatData(user.userName, user, ObservableBuffer.empty[String]) |
|
|
ChatData(user.userName, user, ObservableBuffer.empty[String]) |
|
|
// chatDataStore.updateWith(user.userName)(maybeCD => |
|
|
|
|
|
// maybeCD.map(cd => { |
|
|
|
|
|
// cd.messagesStringProperty += |
|
|
|
|
|
// }) |
|
|
|
|
|
// ) |
|
|
|
|
|
chatDataStore.put(user.userName, new ChatDataProperty(chatData)) |
|
|
chatDataStore.put(user.userName, new ChatDataProperty(chatData)) |
|
|
chatDataStore |
|
|
|
|
|
.get(user.userName) |
|
|
|
|
|
.map(cdp => { |
|
|
|
|
|
cdp.prop ++= Seq("hi", "hello", "bye") |
|
|
|
|
|
.map(s => ChatDataProperty.createMdMessageBox(s)) |
|
|
|
|
|
}) |
|
|
|
|
|
new UserBox2(user.userName, chatData) { |
|
|
new UserBox2(user.userName, chatData) { |
|
|
// this.children += new Label { |
|
|
|
|
|
// textProperty() = user |
|
|
|
|
|
// // textFillProperty <== when(this.hover) choose (Color.RED) otherwise (Color.BLUE) |
|
|
|
|
|
// } |
|
|
|
|
|
// fill <== when(this.hover) choose (Color.RED) otherwise (Color.BLUE) |
|
|
|
|
|
|
|
|
this.styleClass ++= Seq("text-white") |
|
|
} |
|
|
} |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
}) |
|
|
// maybeUserBoxes.map(userBoxes => { |
|
|
|
|
|
// // chatDataBuffer ++= userBoxes |
|
|
|
|
|
// usersListProperty ++= userBoxes |
|
|
|
|
|
// }) |
|
|
|
|
|
val messageBox = ChatDataProperty.createMdMessageBox("*hello!*") |
|
|
|
|
|
|
|
|
val messageBox = ChatDataProperty.createMdMessageBox2( |
|
|
|
|
|
"""**Hello world qefwew yeeehay bwergqwevqcqe** |
|
|
|
|
|
|**Hello world qefwew yeeehay bwergqwevqcqe** |
|
|
|
|
|
| |
|
|
|
|
|
| Hello World |
|
|
|
|
|
""".stripMargin |
|
|
|
|
|
) |
|
|
onFX { |
|
|
onFX { |
|
|
// maybeUserBoxes.map(userBoxes => { |
|
|
|
|
|
// chatDataBuffer ++= userBoxes |
|
|
|
|
|
// // usersListView.items() ++= userBoxes |
|
|
|
|
|
// // val x = new SimpleListProperty(ObservableBuffer(userBoxes)) |
|
|
|
|
|
// // usersListView.items <== x |
|
|
|
|
|
// }) |
|
|
|
|
|
maybeUserBoxes.map(userBoxes => { |
|
|
|
|
|
usersListProperty ++= userBoxes |
|
|
|
|
|
|
|
|
maybeUserBoxes.foreach(userBoxes => { |
|
|
|
|
|
usersBuffer ++= userBoxes |
|
|
}) |
|
|
}) |
|
|
chatListView.items() += messageBox |
|
|
|
|
|
|
|
|
chatListView.items() ++= Seq( |
|
|
|
|
|
messageBox, |
|
|
|
|
|
ChatDataProperty.createMdMessageBox2("hello"), |
|
|
|
|
|
ChatDataProperty.createMdMessageBox2( |
|
|
|
|
|
""" 1. Hello world qefwew yeeehay bwergqwevqcqe |
|
|
|
|
|
|1. Hello world qefwew yeeehay bwergqwevqcqe |
|
|
|
|
|
|1. Hello world qefwew yeeehay bwergqwevqcqe |
|
|
|
|
|
|1. Hello world qefwew yeeehay bwergqwevqcqe""".stripMargin |
|
|
|
|
|
) |
|
|
|
|
|
) |
|
|
|
|
|
// .map(node => { |
|
|
|
|
|
// node.prefWidthProperty <== (chatListView.prefWidthProperty - 200) |
|
|
|
|
|
// node |
|
|
|
|
|
// }) |
|
|
|
|
|
// JFXSmoothScroll.smoothScrollingListView(chatListView, 0.1) |
|
|
} |
|
|
} |
|
|
|
|
|
chatDataStore |
|
|
|
|
|
.map { case (key, value) => value } |
|
|
|
|
|
.foreach(cdp => { |
|
|
|
|
|
cdp.messageBubbles ++= Seq( |
|
|
|
|
|
ChatDataProperty.createMdMessageBox2("hi"), |
|
|
|
|
|
ChatDataProperty.createMdMessageBox2("hello"), |
|
|
|
|
|
ChatDataProperty.createMdMessageBox2("bye") |
|
|
|
|
|
) |
|
|
|
|
|
// .map(ChatDataProperty.createMdMessageBox) |
|
|
|
|
|
}) |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
def func() = { |
|
|
def func() = { |
|
|
@ -241,40 +292,29 @@ class ChatController @Inject() ( |
|
|
def actionLogout = onFX { |
|
|
def actionLogout = onFX { |
|
|
offFXAndWait { |
|
|
offFXAndWait { |
|
|
appDataHandler.clearCredentials() |
|
|
appDataHandler.clearCredentials() |
|
|
println(appDataHandler.appData) |
|
|
|
|
|
} |
|
|
} |
|
|
// curUserAdapter.set(User.empty) |
|
|
// curUserAdapter.set(User.empty) |
|
|
|
|
|
logger.debug(s"Logout - clearing credentials - ${appDataHandler.appData}") |
|
|
chatDataAdapter.set(FXBean(ChatData.empty)) |
|
|
chatDataAdapter.set(FXBean(ChatData.empty)) |
|
|
usersListView.items().clear() |
|
|
usersListView.items().clear() |
|
|
chatListView.items().clear() |
|
|
chatListView.items().clear() |
|
|
chatDataBuffer.clear() |
|
|
|
|
|
chatDataStore.clear() |
|
|
chatDataStore.clear() |
|
|
usersListProperty.clear() |
|
|
|
|
|
|
|
|
usersBuffer.clear() |
|
|
|
|
|
chatInput.clear() |
|
|
|
|
|
this.stage.maximized = false |
|
|
applicationController.logout() |
|
|
applicationController.logout() |
|
|
println(appDataHandler.appData) |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
object ChatController { |
|
|
|
|
|
lazy val markdownStyleSheet = |
|
|
|
|
|
getClass().getResource("/styles/markdown.css").toExternalForm() |
|
|
|
|
|
|
|
|
implicit class MyClipboardExtension(clipboard: Clipboard) { |
|
|
|
|
|
def putString(string: String) = { |
|
|
|
|
|
// val content = Option(clipboard.getContent(DataFormat.PLAIN_TEXT)) |
|
|
|
|
|
// .getOrElse(new ClipboardContent()) |
|
|
|
|
|
// content.putString(string) |
|
|
|
|
|
// clipboard.setContent(content) |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
final case class Person(id: Int, age: Int, name: String) |
|
|
|
|
|
final case class Data(content: String) |
|
|
|
|
|
final case class User(curUser: String, data: Data) |
|
|
|
|
|
object User { |
|
|
|
|
|
def empty = User("", Data("")) |
|
|
|
|
|
// Bindings.createObjectBinding() |
|
|
|
|
|
} |
|
|
|
|
|
// final case class ActiveUser( |
|
|
|
|
|
// userName: String, |
|
|
|
|
|
// online: Boolean, |
|
|
|
|
|
// lastActive: String |
|
|
|
|
|
// ) |
|
|
|
|
|
// object ActiveUser { |
|
|
|
|
|
// def empty = ActiveUser("empty", false, "empty") |
|
|
|
|
|
// } |
|
|
|
|
|
final case class ChatData( |
|
|
final case class ChatData( |
|
|
userName: String, |
|
|
userName: String, |
|
|
activeUser: ActiveUser, |
|
|
activeUser: ActiveUser, |
|
|
@ -294,21 +334,26 @@ object ChatData { |
|
|
class ChatDataProperty(chatData: ChatData) { |
|
|
class ChatDataProperty(chatData: ChatData) { |
|
|
import ChatDataProperty._ |
|
|
import ChatDataProperty._ |
|
|
val bean = FXBean(chatData) |
|
|
val bean = FXBean(chatData) |
|
|
val usernameProperty = bean.getStringProperty("userName") |
|
|
|
|
|
val isActiveProperty = bean.getBooleanProperty("activeUser.online") |
|
|
|
|
|
val lastActiveProperty = bean.getStringProperty("lastActiveString") |
|
|
|
|
|
val messagesStringProperty = new SimpleListProperty(chatData.messages) |
|
|
|
|
|
val prop = new SimpleListProperty(ObservableBuffer.empty[HBox]) |
|
|
|
|
|
// val x = messagesStringProperty.map(message => createMdMessageBox(message)) |
|
|
|
|
|
// prop <== messagesStringProperty.map(message => createMdMessageBox(message)) |
|
|
|
|
|
// prop <== new SimpleListProperty(x) |
|
|
|
|
|
|
|
|
val username = bean.getStringProperty("userName") |
|
|
|
|
|
val isActive = bean.getBooleanProperty("activeUser.online") |
|
|
|
|
|
val lastActive = bean.getStringProperty("lastActiveString") |
|
|
|
|
|
lazy val messageBubbles = BufferProperty( |
|
|
|
|
|
chatData.messages.map(ChatDataProperty.createMdMessageBox2) |
|
|
|
|
|
) |
|
|
|
|
|
def messageList = messageBubbles().map(_.message) |
|
|
|
|
|
// lazy val messages = messagesBubbleProperty |
|
|
|
|
|
// .get() |
|
|
|
|
|
// .map(_.messageText) |
|
|
} |
|
|
} |
|
|
object ChatDataProperty { |
|
|
object ChatDataProperty { |
|
|
|
|
|
lazy val markdownStyleSheet = |
|
|
|
|
|
getClass().getResource("/styles/markdown.css").toExternalForm() |
|
|
|
|
|
|
|
|
def createMdMessageBox(mdfxText: String) = { |
|
|
def createMdMessageBox(mdfxText: String) = { |
|
|
val mdfxNode = new BubbledMDFXNode(mdfxText); |
|
|
val mdfxNode = new BubbledMDFXNode(mdfxText); |
|
|
mdfxNode |
|
|
mdfxNode |
|
|
.getStylesheets() |
|
|
.getStylesheets() |
|
|
.add(ChatController.markdownStyleSheet); |
|
|
|
|
|
|
|
|
.add(markdownStyleSheet); |
|
|
mdfxNode.setBubbleSpec(BubbleSpec.FACE_RIGHT_CENTER); |
|
|
mdfxNode.setBubbleSpec(BubbleSpec.FACE_RIGHT_CENTER); |
|
|
mdfxNode.setBackground( |
|
|
mdfxNode.setBackground( |
|
|
new Background(new BackgroundFill(Color.LIGHTSTEELBLUE, null, null)) |
|
|
new Background(new BackgroundFill(Color.LIGHTSTEELBLUE, null, null)) |
|
|
@ -319,4 +364,49 @@ object ChatDataProperty { |
|
|
box.children += mdfxNode; |
|
|
box.children += mdfxNode; |
|
|
box |
|
|
box |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
def createMdMessageBox2(mdfxText: String) = { |
|
|
|
|
|
val mdfxNode = new MDFXNode(mdfxText); |
|
|
|
|
|
mdfxNode |
|
|
|
|
|
.getStylesheets() |
|
|
|
|
|
.add(markdownStyleSheet) |
|
|
|
|
|
mdfxNode.setMaxWidth(500) |
|
|
|
|
|
mdfxNode.vgrow = Priority.ALWAYS |
|
|
|
|
|
mdfxNode.setAlignment(Pos.CENTER) |
|
|
|
|
|
mdfxNode.styleClass = Seq("chat-message-box") |
|
|
|
|
|
|
|
|
|
|
|
val box = new MessageBox("", "", mdfxText) |
|
|
|
|
|
box.setAlignment(Pos.CENTER_RIGHT) |
|
|
|
|
|
// box.maxWidth(500) |
|
|
|
|
|
box.hgrow = Priority.ALWAYS |
|
|
|
|
|
box.vgrow = Priority.ALWAYS |
|
|
|
|
|
box.children ++= Seq(mdfxNode) |
|
|
|
|
|
box.fillHeight = true |
|
|
|
|
|
box |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
def createMdMessageBox3( |
|
|
|
|
|
sender: String, |
|
|
|
|
|
receiver: String, |
|
|
|
|
|
mdfxText: String |
|
|
|
|
|
) = { |
|
|
|
|
|
val mdfxNode = new MDFXNode(mdfxText); |
|
|
|
|
|
mdfxNode |
|
|
|
|
|
.getStylesheets() |
|
|
|
|
|
.add(markdownStyleSheet) |
|
|
|
|
|
mdfxNode.setMaxWidth(500) |
|
|
|
|
|
mdfxNode.vgrow = Priority.ALWAYS |
|
|
|
|
|
mdfxNode.setAlignment(Pos.CENTER) |
|
|
|
|
|
mdfxNode.styleClass = Seq("chat-message-box") |
|
|
|
|
|
|
|
|
|
|
|
val box = new MessageBox(sender, receiver, mdfxText) |
|
|
|
|
|
box.setAlignment(Pos.CENTER_RIGHT) |
|
|
|
|
|
// box.maxWidth(500) |
|
|
|
|
|
box.hgrow = Priority.ALWAYS |
|
|
|
|
|
box.vgrow = Priority.ALWAYS |
|
|
|
|
|
box.children ++= Seq(mdfxNode) |
|
|
|
|
|
box.fillHeight = true |
|
|
|
|
|
box |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
