feat: drop LabelHelper#text(UILabel)

teletha · Nov 8, 2024 · 4330513 · 4330513
1 parent 1bf5231
commit 4330513
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 67 deletions.
diff --git a/src/main/java/viewtify/preference/PreferenceView.java b/src/main/java/viewtify/preference/PreferenceView.java
@@ -18,6 +18,7 @@
 import java.util.Set;
 
 import org.controlsfx.glyphfont.FontAwesome;
+import org.kordamp.ikonli.fontawesome5.FontAwesomeSolid;
 
 import javafx.collections.ObservableList;
 import javafx.scene.Node;
@@ -80,8 +81,8 @@ protected ViewDSL declareUI() {
                     });
                     $(vbox, style.right, () -> {
                         $(hbox, style.bar, () -> {
-                            $(importer);
-                            $(exporter);
+                            $(importer, style.icon);
+                            $(exporter, style.icon);
                             $(search, FormStyles.Column5, style.search);
                         });
                         $(scroll, FormStyles.Preferences, () -> {
@@ -143,7 +144,7 @@ interface style extends StyleDSL {
         };
 
         Style icon = () -> {
-            font.size(18, px).family("FontAwesome").color("-fx-mid-text-color");
+            font.size(13, px).color("-fx-mid-text-color");
             padding.size(6, px);
             cursor.pointer();
 
@@ -158,12 +159,8 @@ interface style extends StyleDSL {
      */
     @Override
     protected void initialize() {
-        importer.text(FontAwesome.Glyph.DOWNLOAD, style.icon)
-                .tooltip(en("Import preferences from file"))
-                .when(User.LeftClick, this::importPrefernces);
-        exporter.text(FontAwesome.Glyph.UPLOAD, style.icon)
-                .tooltip(en("Export the current preferences"))
-                .when(User.LeftClick, this::exportPreferences);
+        importer.text(FontAwesomeSolid.DOWNLOAD).tooltip(en("Import preferences from file")).when(User.LeftClick, this::importPrefernces);
+        exporter.text(FontAwesomeSolid.UPLOAD).tooltip(en("Export the current preferences")).when(User.LeftClick, this::exportPreferences);
 
         search.placeholder(en("Search from preferences")).clearable().prefix(FontAwesome.Glyph.SEARCH).observe().to(text -> {
             text = text.strip().toLowerCase();

diff --git a/src/main/java/viewtify/ui/calendar/CalendarView.java b/src/main/java/viewtify/ui/calendar/CalendarView.java
@@ -13,7 +13,7 @@
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
-import org.controlsfx.glyphfont.FontAwesome;
+import org.kordamp.ikonli.fontawesome5.FontAwesomeSolid;
 
 import kiss.I;
 import kiss.Managed;
@@ -78,9 +78,9 @@ protected ViewDSL declareUI() {
                         $(selectToday, Styles.today, FormStyles.Column2);
 
                         $(hbox, Styles.headerCenter, () -> {
-                            $(selectPrevious);
+                            $(selectPrevious, Styles.selector);
                             $(current, Styles.current);
-                            $(selectNext);
+                            $(selectNext, Styles.selector);
                         });
 
                         $(hbox, Styles.headerRight, () -> {
@@ -106,8 +106,8 @@ interface Styles extends StyleDSL {
         };
 
         Style selector = () -> {
-            font.size(20, px).color("-fx-mid-text-color").family("FontAwesome");
-            padding.horizontal(6, px).top(-4, px);
+            font.color("-fx-mid-text-color").size(14, px);
+            padding.horizontal(8, px).vertical(2, px);
         };
 
         Style current = () -> {
@@ -154,16 +154,16 @@ interface Styles extends StyleDSL {
     protected void initialize() {
         CalendarSetting setting = Preferences.of(CalendarSetting.class);
 
-        selectNext.text(FontAwesome.Glyph.ANGLE_RIGHT, Styles.selector).action(() -> currentView.next());
-        selectPrevious.text(FontAwesome.Glyph.ANGLE_LEFT, Styles.selector).action(() -> currentView.previous());
+        selectNext.text(FontAwesomeSolid.ANGLE_RIGHT).action(() -> currentView.next());
+        selectPrevious.text(FontAwesomeSolid.ANGLE_LEFT).action(() -> currentView.previous());
         selectToday.text(I.translate("Today")).action(() -> currentView.today());
 
         switchToDay.text(I.translate("Day")).action(() -> show(DayView.class, currentDate));
         switchToWeek.text(I.translate("Week")).action(() -> show(WeekView.class, currentDate));
         switchToMonth.text(I.translate("Month")).action(() -> show(MonthView.class, currentDate));
         switchToYear.text(I.translate("Year")).action(() -> show(YearView.class, currentDate));
 
-        preference.text(FontAwesome.Glyph.GEAR).popup(CalendarSettingView::new);
+        preference.text(FontAwesomeSolid.COG).popup(CalendarSettingView::new);
 
         show(setting.initialView.v, LocalDate.now());
 

diff --git a/src/main/java/viewtify/ui/calendar/Visualizers.java b/src/main/java/viewtify/ui/calendar/Visualizers.java
@@ -9,7 +9,7 @@
  */
 package viewtify.ui.calendar;
 
-import org.controlsfx.glyphfont.FontAwesome;
+import org.kordamp.ikonli.fontawesome5.FontAwesomeSolid;
 
 import javafx.scene.Node;
 import kiss.Managed;
@@ -230,9 +230,9 @@ interface Styles extends StyleDSL {
              */
             @Override
             protected void initialize() {
-                edit.text(FontAwesome.Glyph.PENCIL).tooltip(en("Edit")).enable(event.isEditable());
-                delete.text(FontAwesome.Glyph.TRASH).tooltip(en("Delete")).enable(event.isEditable());
-                close.text(FontAwesome.Glyph.CLOSE).tooltip(en("Close")).when(User.LeftClick, ViewtyDialog::close);
+                edit.text(FontAwesomeSolid.PEN).tooltip(en("Edit")).enable(event.isEditable());
+                delete.text(FontAwesomeSolid.TRASH).tooltip(en("Delete")).enable(event.isEditable());
+                close.text(FontAwesomeSolid.CROSS).tooltip(en("Close")).when(User.LeftClick, ViewtyDialog::close);
             }
         }
     }

diff --git a/src/main/java/viewtify/ui/dock/DockSystem.java b/src/main/java/viewtify/ui/dock/DockSystem.java
@@ -15,6 +15,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.UnaryOperator;
 
+import org.kordamp.ikonli.fontawesome5.FontAwesomeSolid;
+
 import javafx.application.Platform;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
@@ -48,9 +50,6 @@
 import javafx.stage.StageStyle;
 import javafx.stage.Window;
 import javafx.stage.WindowEvent;
-
-import org.controlsfx.glyphfont.FontAwesome;
-
 import kiss.I;
 import kiss.Managed;
 import kiss.Signal;
@@ -326,7 +325,7 @@ private static void openNewWindow(RootArea area, Bounds bounds, EventHandler<Win
      */
     public static void initialize() {
         initialize(icon -> {
-            icon.text(FontAwesome.Glyph.BARS).behaveLikeButton().context(menus -> {
+            icon.text(FontAwesomeSolid.BARS).behaveLikeButton().context(menus -> {
                 menus.menu(I.translate("Open new page"), sub -> {
                     for (DockProvider provider : I.find(DockProvider.class)) {
                         for (Dock item : provider.findDocks()) {

diff --git a/src/main/java/viewtify/ui/helper/LabelHelper.java b/src/main/java/viewtify/ui/helper/LabelHelper.java
@@ -13,6 +13,8 @@
 
 import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.glyphfont.INamedCharacter;
+import org.kordamp.ikonli.Ikon;
+import org.kordamp.ikonli.javafx.FontIcon;
 
 import javafx.collections.ObservableList;
 import javafx.geometry.Insets;
@@ -32,7 +34,6 @@
 import stylist.value.Color;
 import viewtify.StyleManipulator;
 import viewtify.Viewtify;
-import viewtify.ui.UILabel;
 import viewtify.ui.UserInterfaceProvider;
 import viewtify.util.FXUtils;
 
@@ -78,72 +79,52 @@ default Self text(Variable text) {
     }
 
     /**
-     * Set text.
-     * 
-     * @param text A text {@link Variable} to set.
-     * @return Chainable API.
-     */
-    default Self text(INamedCharacter text) {
-        return text(text, (Style[]) null);
-    }
-
-    /**
-     * Set text.
+     * Set icon.
      * 
-     * @param text A text {@link Variable} to set.
+     * @param icon An icon font.
      * @return Chainable API.
      */
-    default Self text(INamedCharacter text, Style... iconStyle) {
-        if (text != null) {
-            Glyph glyph = new Glyph("FontAwesome", text);
-            StyleHelper.of(glyph).style(iconStyle);
-            text(glyph);
+    default Self text(Ikon icon) {
+        if (icon != null) {
+            FontIcon font = new FontIcon(icon);
+            font.iconColorProperty().bind(property(Type.TextFill));
+            text(font);
         }
         return (Self) this;
     }
 
     /**
-     * Set honrizontal styled text.
+     * Set the specified {@link Node} as literal component.
      * 
-     * @param texts The text list.
+     * @param items A literal component to set.
      * @return Chainable API.
      */
-    default Self text(UILabel... texts) {
+    default Self text(UserInterfaceProvider<? extends Node>... items) {
         HBox box = new HBox();
         box.setAlignment(Pos.CENTER);
 
-        for (int i = 0; i < texts.length; i++) {
-            box.getChildren().add(texts[i].ui);
+        for (UserInterfaceProvider<? extends Node> item : items) {
+            box.getChildren().add(item.ui().getStyleableNode());
         }
         return text(box);
     }
 
     /**
-     * Set vertical styled text.
+     * Set the specified {@link Node} as literal component.
      * 
-     * @param texts The text list.
+     * @param items A literal component to set.
      * @return Chainable API.
      */
-    default Self textV(UILabel... texts) {
+    default Self textV(UserInterfaceProvider<? extends Node>... items) {
         VBox box = new VBox();
         box.setAlignment(Pos.CENTER);
 
-        for (int i = 0; i < texts.length; i++) {
-            box.getChildren().add(texts[i].ui);
+        for (UserInterfaceProvider<? extends Node> item : items) {
+            box.getChildren().add(item.ui());
         }
         return text(box);
     }
 
-    /**
-     * Set the specified {@link Node} as literal component.
-     * 
-     * @param text A literal component to set.
-     * @return Chainable API.
-     */
-    default Self text(UserInterfaceProvider text) {
-        return text(text.ui().getStyleableNode());
-    }
-
     /**
      * Set the specified {@link Node} as literal component.
      * 

diff --git a/src/main/java/viewtify/ui/toast/Toast.java b/src/main/java/viewtify/ui/toast/Toast.java
@@ -18,6 +18,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
+import org.kordamp.ikonli.fontawesome5.FontAwesomeSolid;
+
 import javafx.beans.value.WritableDoubleValue;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
@@ -27,9 +29,6 @@
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
 import javafx.stage.Popup;
-
-import org.controlsfx.glyphfont.FontAwesome;
-
 import kiss.Disposable;
 import kiss.I;
 import kiss.Signal;
@@ -487,7 +486,8 @@ private synchronized Popup ui() {
          * @return
          */
         private Node showCloseButton(Node node) {
-            UILabel label = new UILabel(null).text(FontAwesome.Glyph.CLOSE, styles.icon)
+            UILabel label = new UILabel(null).text(FontAwesomeSolid.TIMES)
+                    .style(styles.icon)
                     .tooltip(I.translate("Stop this task."))
                     .when(User.LeftClick, () -> {
                         remove(this);
@@ -529,6 +529,7 @@ private static interface styles extends StyleDSL {
 
         Style icon = () -> {
             cursor.pointer();
+            padding.size(2, px);
 
             $.hover(() -> {
                 font.color("-fx-focus-color");

diff --git a/src/project/java/viewtify/Project.java b/src/project/java/viewtify/Project.java
@@ -60,6 +60,8 @@ public class Project extends bee.api.Project {
         require("org.testfx", "openjfx-monocle", "jdk-12.0.1+2");
         require("org.controlsfx", "controlsfx");
         require("com.catwithawand", "BorderlessSceneFX");
+        require("org.kordamp.ikonli", "ikonli-javafx");
+        require("org.kordamp.ikonli", "ikonli-fontawesome5-pack");
 
         versionControlSystem("https://github.com/teletha/viewtify");
     }