From 052e4f0fcbaf3a3995e2cfec60a6bc0dc5bc7bd8 Mon Sep 17 00:00:00 2001 From: Rohan Sircar Date: Sun, 20 Dec 2020 19:01:26 +0530 Subject: [PATCH] Refactored sfx control wrappers --- src/main/scala/nova/monadic_sfx/MainApp.scala | 3 ++- src/main/scala/nova/monadic_sfx/ui/DefaultUI.scala | 2 +- .../ui/components/todo/TodoListComponentOld.scala | 6 +++--- .../ui/components/todo/TodoListView.scala | 12 ++++++------ .../monadic_sfx/ui/controller/TodoController.scala | 12 ++++++------ .../controls}/ActionObservable.scala | 2 +- .../{implicits => util/controls}/FontIcon.scala | 2 +- .../{implicits => util/controls}/JFXButton.scala | 3 ++- .../{implicits => util/controls}/JFXListCell.scala | 2 +- .../{implicits => util/controls}/JFXListView.scala | 4 +--- .../{implicits => util/controls}/JFXSpinner.scala | 2 +- .../{implicits => util/controls}/JFXTextArea.scala | 2 +- .../{implicits => util/controls}/JFXTextField.scala | 2 +- .../controls}/JFXTreeTableView.scala | 2 +- .../{implicits => util/controls}/MenuItem.scala | 2 +- 15 files changed, 29 insertions(+), 29 deletions(-) rename src/main/scala/nova/monadic_sfx/{implicits => util/controls}/ActionObservable.scala (98%) rename src/main/scala/nova/monadic_sfx/{implicits => util/controls}/FontIcon.scala (96%) rename src/main/scala/nova/monadic_sfx/{implicits => util/controls}/JFXButton.scala (93%) rename src/main/scala/nova/monadic_sfx/{implicits => util/controls}/JFXListCell.scala (95%) rename src/main/scala/nova/monadic_sfx/{implicits => util/controls}/JFXListView.scala (96%) rename src/main/scala/nova/monadic_sfx/{implicits => util/controls}/JFXSpinner.scala (94%) rename src/main/scala/nova/monadic_sfx/{implicits => util/controls}/JFXTextArea.scala (96%) rename src/main/scala/nova/monadic_sfx/{implicits => util/controls}/JFXTextField.scala (96%) rename src/main/scala/nova/monadic_sfx/{implicits => util/controls}/JFXTreeTableView.scala (98%) rename src/main/scala/nova/monadic_sfx/{implicits => util/controls}/MenuItem.scala (82%) diff --git a/src/main/scala/nova/monadic_sfx/MainApp.scala b/src/main/scala/nova/monadic_sfx/MainApp.scala index 2e9777b..ae8dd84 100644 --- a/src/main/scala/nova/monadic_sfx/MainApp.scala +++ b/src/main/scala/nova/monadic_sfx/MainApp.scala @@ -11,7 +11,7 @@ import monix.bio.Task import monix.eval.Coeval import monix.{eval => me} import nova.monadic_sfx.executors.Schedulers -import nova.monadic_sfx.implicits.JFXButton +import nova.monadic_sfx.util.controls.JFXButton import nova.monadic_sfx.implicits._ import nova.monadic_sfx.ui.MyFxApp import nova.monadic_sfx.ui.components.router.FXRouter @@ -80,6 +80,7 @@ class MainAppDelegate(schedulers: Schedulers)(implicit logger: Logger[Task]) { val init = for { + //FXRouter does not allocate mutable state so it's ok to use pure here router <- Task.pure(new FXRouter[Page]) routerStore <- router.store(Page.Home, logger) todoStore <- TodoListStore(logger) diff --git a/src/main/scala/nova/monadic_sfx/ui/DefaultUI.scala b/src/main/scala/nova/monadic_sfx/ui/DefaultUI.scala index 55c857c..edd2f4e 100644 --- a/src/main/scala/nova/monadic_sfx/ui/DefaultUI.scala +++ b/src/main/scala/nova/monadic_sfx/ui/DefaultUI.scala @@ -1,6 +1,6 @@ package nova.monadic_sfx.ui -import nova.monadic_sfx.implicits.JFXSpinner +import nova.monadic_sfx.util.controls.JFXSpinner import scalafx.geometry.Insets import scalafx.geometry.Pos import scalafx.scene.Scene diff --git a/src/main/scala/nova/monadic_sfx/ui/components/todo/TodoListComponentOld.scala b/src/main/scala/nova/monadic_sfx/ui/components/todo/TodoListComponentOld.scala index daafe84..a6b8259 100644 --- a/src/main/scala/nova/monadic_sfx/ui/components/todo/TodoListComponentOld.scala +++ b/src/main/scala/nova/monadic_sfx/ui/components/todo/TodoListComponentOld.scala @@ -10,9 +10,9 @@ import monix.catnap.ConsumerF import monix.execution.Scheduler import monix.reactive.Observable import monix.reactive.Observer -import nova.monadic_sfx.implicits.FontIcon -import nova.monadic_sfx.implicits.IconLiteral -import nova.monadic_sfx.implicits.JFXListView +import nova.monadic_sfx.util.controls.FontIcon +import nova.monadic_sfx.util.controls.IconLiteral +import nova.monadic_sfx.util.controls.JFXListView import nova.monadic_sfx.implicits._ import nova.monadic_sfx.util.reactive.store._ import scalafx.Includes._ diff --git a/src/main/scala/nova/monadic_sfx/ui/components/todo/TodoListView.scala b/src/main/scala/nova/monadic_sfx/ui/components/todo/TodoListView.scala index 79c9609..2cb21e5 100644 --- a/src/main/scala/nova/monadic_sfx/ui/components/todo/TodoListView.scala +++ b/src/main/scala/nova/monadic_sfx/ui/components/todo/TodoListView.scala @@ -3,12 +3,12 @@ package nova.monadic_sfx.ui.components.todo import monix.bio.Task import monix.execution.cancelables.CompositeCancelable import monix.{eval => me} -import nova.monadic_sfx.implicits.FontIcon -import nova.monadic_sfx.implicits.IconLiteral -import nova.monadic_sfx.implicits.JFXButton -import nova.monadic_sfx.implicits.JFXListView -import nova.monadic_sfx.implicits.JFXTextField -import nova.monadic_sfx.implicits.MenuItem +import nova.monadic_sfx.util.controls.FontIcon +import nova.monadic_sfx.util.controls.IconLiteral +import nova.monadic_sfx.util.controls.JFXButton +import nova.monadic_sfx.util.controls.JFXListView +import nova.monadic_sfx.util.controls.JFXTextField +import nova.monadic_sfx.util.controls.MenuItem import nova.monadic_sfx.implicits._ import nova.monadic_sfx.util.reactive.store._ import org.gerweck.scalafx.util._ diff --git a/src/main/scala/nova/monadic_sfx/ui/controller/TodoController.scala b/src/main/scala/nova/monadic_sfx/ui/controller/TodoController.scala index 70cd159..300b3b8 100644 --- a/src/main/scala/nova/monadic_sfx/ui/controller/TodoController.scala +++ b/src/main/scala/nova/monadic_sfx/ui/controller/TodoController.scala @@ -6,12 +6,12 @@ import animatefx.animation.FadeIn import animatefx.util.{SequentialAnimationFX => SeqFX} import cats.effect.Sync import monix.eval.Task -import nova.monadic_sfx.implicits.FontIcon -import nova.monadic_sfx.implicits.IconLiteral -import nova.monadic_sfx.implicits.JFXButton -import nova.monadic_sfx.implicits.JFXListView -import nova.monadic_sfx.implicits.JFXTextArea -import nova.monadic_sfx.implicits.JFXTextField +import nova.monadic_sfx.util.controls.FontIcon +import nova.monadic_sfx.util.controls.IconLiteral +import nova.monadic_sfx.util.controls.JFXButton +import nova.monadic_sfx.util.controls.JFXListView +import nova.monadic_sfx.util.controls.JFXTextArea +import nova.monadic_sfx.util.controls.JFXTextField import nova.monadic_sfx.ui.components.todo.TodoListComponentOld import scalafx.collections.ObservableBuffer import scalafx.scene.control.Label diff --git a/src/main/scala/nova/monadic_sfx/implicits/ActionObservable.scala b/src/main/scala/nova/monadic_sfx/util/controls/ActionObservable.scala similarity index 98% rename from src/main/scala/nova/monadic_sfx/implicits/ActionObservable.scala rename to src/main/scala/nova/monadic_sfx/util/controls/ActionObservable.scala index 48b52db..3b8ebfe 100644 --- a/src/main/scala/nova/monadic_sfx/implicits/ActionObservable.scala +++ b/src/main/scala/nova/monadic_sfx/util/controls/ActionObservable.scala @@ -1,4 +1,4 @@ -package nova.monadic_sfx.implicits +package nova.monadic_sfx.util.controls import monix.execution.Cancelable import monix.execution.Scheduler diff --git a/src/main/scala/nova/monadic_sfx/implicits/FontIcon.scala b/src/main/scala/nova/monadic_sfx/util/controls/FontIcon.scala similarity index 96% rename from src/main/scala/nova/monadic_sfx/implicits/FontIcon.scala rename to src/main/scala/nova/monadic_sfx/util/controls/FontIcon.scala index 9f06658..27afcb5 100644 --- a/src/main/scala/nova/monadic_sfx/implicits/FontIcon.scala +++ b/src/main/scala/nova/monadic_sfx/util/controls/FontIcon.scala @@ -1,4 +1,4 @@ -package nova.monadic_sfx.implicits +package nova.monadic_sfx.util.controls import javafx.{scene => jfxs} import org.kordamp.ikonli.{javafx => ikonlifx} diff --git a/src/main/scala/nova/monadic_sfx/implicits/JFXButton.scala b/src/main/scala/nova/monadic_sfx/util/controls/JFXButton.scala similarity index 93% rename from src/main/scala/nova/monadic_sfx/implicits/JFXButton.scala rename to src/main/scala/nova/monadic_sfx/util/controls/JFXButton.scala index 19a6c7f..74089ca 100644 --- a/src/main/scala/nova/monadic_sfx/implicits/JFXButton.scala +++ b/src/main/scala/nova/monadic_sfx/util/controls/JFXButton.scala @@ -1,4 +1,4 @@ -package nova.monadic_sfx.implicits +package nova.monadic_sfx.util.controls import com.jfoenix.{controls => jfoenixc} import javafx.{scene => jfxs} @@ -6,6 +6,7 @@ import scalafx.Includes._ import scalafx.beans.property.ObjectProperty import scalafx.scene.Node import scalafx.scene.control.Button +import nova.monadic_sfx.implicits._ import jfxs.{paint => jfxsp} diff --git a/src/main/scala/nova/monadic_sfx/implicits/JFXListCell.scala b/src/main/scala/nova/monadic_sfx/util/controls/JFXListCell.scala similarity index 95% rename from src/main/scala/nova/monadic_sfx/implicits/JFXListCell.scala rename to src/main/scala/nova/monadic_sfx/util/controls/JFXListCell.scala index 712ee02..42d7413 100644 --- a/src/main/scala/nova/monadic_sfx/implicits/JFXListCell.scala +++ b/src/main/scala/nova/monadic_sfx/util/controls/JFXListCell.scala @@ -1,4 +1,4 @@ -package nova.monadic_sfx.implicits +package nova.monadic_sfx.util.controls import com.jfoenix.{controls => jfoenixc} import javafx.scene.{control => jfxsc} diff --git a/src/main/scala/nova/monadic_sfx/implicits/JFXListView.scala b/src/main/scala/nova/monadic_sfx/util/controls/JFXListView.scala similarity index 96% rename from src/main/scala/nova/monadic_sfx/implicits/JFXListView.scala rename to src/main/scala/nova/monadic_sfx/util/controls/JFXListView.scala index 42965ee..7b8a0b4 100644 --- a/src/main/scala/nova/monadic_sfx/implicits/JFXListView.scala +++ b/src/main/scala/nova/monadic_sfx/util/controls/JFXListView.scala @@ -1,4 +1,4 @@ -package nova.monadic_sfx.implicits +package nova.monadic_sfx.util.controls import com.jfoenix.{controls => jfoenixc} import monix.execution.Scheduler @@ -43,6 +43,4 @@ class JFXListView[T]( def expanded = delegate.expandedProperty() def expanded_=(v: Boolean) = expanded() = v - - } diff --git a/src/main/scala/nova/monadic_sfx/implicits/JFXSpinner.scala b/src/main/scala/nova/monadic_sfx/util/controls/JFXSpinner.scala similarity index 94% rename from src/main/scala/nova/monadic_sfx/implicits/JFXSpinner.scala rename to src/main/scala/nova/monadic_sfx/util/controls/JFXSpinner.scala index 11dd87e..44b6df5 100644 --- a/src/main/scala/nova/monadic_sfx/implicits/JFXSpinner.scala +++ b/src/main/scala/nova/monadic_sfx/util/controls/JFXSpinner.scala @@ -1,4 +1,4 @@ -package nova.monadic_sfx.implicits +package nova.monadic_sfx.util.controls import com.jfoenix.{controls => jfoenixc} import scalafx.scene.control.ProgressIndicator diff --git a/src/main/scala/nova/monadic_sfx/implicits/JFXTextArea.scala b/src/main/scala/nova/monadic_sfx/util/controls/JFXTextArea.scala similarity index 96% rename from src/main/scala/nova/monadic_sfx/implicits/JFXTextArea.scala rename to src/main/scala/nova/monadic_sfx/util/controls/JFXTextArea.scala index 5a0eb45..a0c0a83 100644 --- a/src/main/scala/nova/monadic_sfx/implicits/JFXTextArea.scala +++ b/src/main/scala/nova/monadic_sfx/util/controls/JFXTextArea.scala @@ -1,4 +1,4 @@ -package nova.monadic_sfx.implicits +package nova.monadic_sfx.util.controls import com.jfoenix.{controls => jfoenixc} import scalafx.Includes._ diff --git a/src/main/scala/nova/monadic_sfx/implicits/JFXTextField.scala b/src/main/scala/nova/monadic_sfx/util/controls/JFXTextField.scala similarity index 96% rename from src/main/scala/nova/monadic_sfx/implicits/JFXTextField.scala rename to src/main/scala/nova/monadic_sfx/util/controls/JFXTextField.scala index 43ba243..dcc4c50 100644 --- a/src/main/scala/nova/monadic_sfx/implicits/JFXTextField.scala +++ b/src/main/scala/nova/monadic_sfx/util/controls/JFXTextField.scala @@ -1,4 +1,4 @@ -package nova.monadic_sfx.implicits +package nova.monadic_sfx.util.controls import com.jfoenix.{controls => jfoenixc} import scalafx.Includes._ diff --git a/src/main/scala/nova/monadic_sfx/implicits/JFXTreeTableView.scala b/src/main/scala/nova/monadic_sfx/util/controls/JFXTreeTableView.scala similarity index 98% rename from src/main/scala/nova/monadic_sfx/implicits/JFXTreeTableView.scala rename to src/main/scala/nova/monadic_sfx/util/controls/JFXTreeTableView.scala index 27a5177..70ece16 100644 --- a/src/main/scala/nova/monadic_sfx/implicits/JFXTreeTableView.scala +++ b/src/main/scala/nova/monadic_sfx/util/controls/JFXTreeTableView.scala @@ -1,4 +1,4 @@ -package nova.monadic_sfx.implicits +package nova.monadic_sfx.util.controls import com.jfoenix.controls.datamodels.treetable.RecursiveTreeObject import com.jfoenix.{controls => jfoenixc} diff --git a/src/main/scala/nova/monadic_sfx/implicits/MenuItem.scala b/src/main/scala/nova/monadic_sfx/util/controls/MenuItem.scala similarity index 82% rename from src/main/scala/nova/monadic_sfx/implicits/MenuItem.scala rename to src/main/scala/nova/monadic_sfx/util/controls/MenuItem.scala index 104caf3..cb5fefa 100644 --- a/src/main/scala/nova/monadic_sfx/implicits/MenuItem.scala +++ b/src/main/scala/nova/monadic_sfx/util/controls/MenuItem.scala @@ -1,4 +1,4 @@ -package nova.monadic_sfx.implicits +package nova.monadic_sfx.util.controls import nova.monadic_sfx.implicits._ import scalafx.scene.{control => sfxc}