Support Unicode codepoints; Support latest MaterialDesign. Fixes #87

kordamp · Oct 31, 2020 · 59cbfc7 · 59cbfc7
1 parent ca61abf
commit 59cbfc7
Show file tree

Hide file tree

Showing 119 changed files with 32,739 additions and 14,090 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -1,3 +1,21 @@
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Copyright 2015-2020 Andres Almiray
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 name: Build
 
 on: [push, pull_request]

diff --git a/.gitignore b/.gitignore
@@ -9,5 +9,5 @@ target
 .classpath
 .project
 .gen-changelog.sh
-
+.tmp
 \.DS_Store
diff --git a/apps/sampler-javafx/src/main/java/org/kordamp/ikonli/sampler/javafx/Sampler.java b/apps/sampler-javafx/src/main/java/org/kordamp/ikonli/sampler/javafx/Sampler.java
@@ -54,7 +54,32 @@
 import org.kordamp.ikonli.maki2.Maki2;
 import org.kordamp.ikonli.mapicons.Mapicons;
 import org.kordamp.ikonli.material.Material;
-import org.kordamp.ikonli.materialdesign.MaterialDesign;
+import org.kordamp.ikonli.materialdesign.MaterialDesignA;
+import org.kordamp.ikonli.materialdesign.MaterialDesignB;
+import org.kordamp.ikonli.materialdesign.MaterialDesignC;
+import org.kordamp.ikonli.materialdesign.MaterialDesignD;
+import org.kordamp.ikonli.materialdesign.MaterialDesignE;
+import org.kordamp.ikonli.materialdesign.MaterialDesignF;
+import org.kordamp.ikonli.materialdesign.MaterialDesignG;
+import org.kordamp.ikonli.materialdesign.MaterialDesignH;
+import org.kordamp.ikonli.materialdesign.MaterialDesignI;
+import org.kordamp.ikonli.materialdesign.MaterialDesignJ;
+import org.kordamp.ikonli.materialdesign.MaterialDesignK;
+import org.kordamp.ikonli.materialdesign.MaterialDesignL;
+import org.kordamp.ikonli.materialdesign.MaterialDesignM;
+import org.kordamp.ikonli.materialdesign.MaterialDesignN;
+import org.kordamp.ikonli.materialdesign.MaterialDesignO;
+import org.kordamp.ikonli.materialdesign.MaterialDesignP;
+import org.kordamp.ikonli.materialdesign.MaterialDesignQ;
+import org.kordamp.ikonli.materialdesign.MaterialDesignR;
+import org.kordamp.ikonli.materialdesign.MaterialDesignS;
+import org.kordamp.ikonli.materialdesign.MaterialDesignT;
+import org.kordamp.ikonli.materialdesign.MaterialDesignU;
+import org.kordamp.ikonli.materialdesign.MaterialDesignV;
+import org.kordamp.ikonli.materialdesign.MaterialDesignW;
+import org.kordamp.ikonli.materialdesign.MaterialDesignX;
+import org.kordamp.ikonli.materialdesign.MaterialDesignY;
+import org.kordamp.ikonli.materialdesign.MaterialDesignZ;
 import org.kordamp.ikonli.metrizeicons.MetrizeIcons;
 import org.kordamp.ikonli.ociicons.Ociicons;
 import org.kordamp.ikonli.octicons.Octicons;
@@ -76,10 +101,6 @@
  * @author Andres Almiray
  */
 public class Sampler extends Application {
-    public static void main(String[] args) {
-        launch(Sampler.class);
-    }
-
     @Override
     public void start(Stage primaryStage) throws Exception {
         URL location = getClass().getResource("sampler.fxml");
@@ -111,7 +132,32 @@ public void start(Stage primaryStage) throws Exception {
         tabPane.getTabs().add(new DemoTab(Maki2.class, allOf(Maki2.class)));
         tabPane.getTabs().add(new DemoTab(Mapicons.class, allOf(Mapicons.class)));
         tabPane.getTabs().add(new DemoTab(Material.class, allOf(Material.class)));
-        tabPane.getTabs().add(new DemoTab(MaterialDesign.class, allOf(MaterialDesign.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignA.class, allOf(MaterialDesignA.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignB.class, allOf(MaterialDesignB.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignC.class, allOf(MaterialDesignC.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignD.class, allOf(MaterialDesignD.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignE.class, allOf(MaterialDesignE.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignF.class, allOf(MaterialDesignF.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignG.class, allOf(MaterialDesignG.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignH.class, allOf(MaterialDesignH.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignI.class, allOf(MaterialDesignI.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignJ.class, allOf(MaterialDesignJ.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignK.class, allOf(MaterialDesignK.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignL.class, allOf(MaterialDesignL.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignM.class, allOf(MaterialDesignM.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignN.class, allOf(MaterialDesignN.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignO.class, allOf(MaterialDesignO.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignP.class, allOf(MaterialDesignP.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignQ.class, allOf(MaterialDesignQ.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignR.class, allOf(MaterialDesignR.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignS.class, allOf(MaterialDesignS.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignT.class, allOf(MaterialDesignT.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignU.class, allOf(MaterialDesignU.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignV.class, allOf(MaterialDesignV.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignW.class, allOf(MaterialDesignW.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignX.class, allOf(MaterialDesignX.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignY.class, allOf(MaterialDesignY.class)));
+        tabPane.getTabs().add(new DemoTab(MaterialDesignZ.class, allOf(MaterialDesignZ.class)));
         tabPane.getTabs().add(new DemoTab(MetrizeIcons.class, allOf(MetrizeIcons.class)));
         tabPane.getTabs().add(new DemoTab(Ociicons.class, allOf(Ociicons.class)));
         tabPane.getTabs().add(new DemoTab(Octicons.class, allOf(Octicons.class)));
@@ -134,6 +180,10 @@ public void start(Stage primaryStage) throws Exception {
         primaryStage.show();
     }
 
+    public static void main(String[] args) {
+        launch(Sampler.class);
+    }
+
     private static class DemoTab extends Tab {
         private DemoTab(Class<? extends Ikon> iconFontClass, EnumSet<? extends Ikon> enumSet) throws Exception {
             super(iconFontClass.getSimpleName());

diff --git a/apps/sampler-swing/src/main/java/org/kordamp/ikonli/sampler/swing/Sampler.java b/apps/sampler-swing/src/main/java/org/kordamp/ikonli/sampler/swing/Sampler.java
@@ -44,7 +44,32 @@
 import org.kordamp.ikonli.maki2.Maki2;
 import org.kordamp.ikonli.mapicons.Mapicons;
 import org.kordamp.ikonli.material.Material;
-import org.kordamp.ikonli.materialdesign.MaterialDesign;
+import org.kordamp.ikonli.materialdesign.MaterialDesignA;
+import org.kordamp.ikonli.materialdesign.MaterialDesignB;
+import org.kordamp.ikonli.materialdesign.MaterialDesignC;
+import org.kordamp.ikonli.materialdesign.MaterialDesignD;
+import org.kordamp.ikonli.materialdesign.MaterialDesignE;
+import org.kordamp.ikonli.materialdesign.MaterialDesignF;
+import org.kordamp.ikonli.materialdesign.MaterialDesignG;
+import org.kordamp.ikonli.materialdesign.MaterialDesignH;
+import org.kordamp.ikonli.materialdesign.MaterialDesignI;
+import org.kordamp.ikonli.materialdesign.MaterialDesignJ;
+import org.kordamp.ikonli.materialdesign.MaterialDesignK;
+import org.kordamp.ikonli.materialdesign.MaterialDesignL;
+import org.kordamp.ikonli.materialdesign.MaterialDesignM;
+import org.kordamp.ikonli.materialdesign.MaterialDesignN;
+import org.kordamp.ikonli.materialdesign.MaterialDesignO;
+import org.kordamp.ikonli.materialdesign.MaterialDesignP;
+import org.kordamp.ikonli.materialdesign.MaterialDesignQ;
+import org.kordamp.ikonli.materialdesign.MaterialDesignR;
+import org.kordamp.ikonli.materialdesign.MaterialDesignS;
+import org.kordamp.ikonli.materialdesign.MaterialDesignT;
+import org.kordamp.ikonli.materialdesign.MaterialDesignU;
+import org.kordamp.ikonli.materialdesign.MaterialDesignV;
+import org.kordamp.ikonli.materialdesign.MaterialDesignW;
+import org.kordamp.ikonli.materialdesign.MaterialDesignX;
+import org.kordamp.ikonli.materialdesign.MaterialDesignY;
+import org.kordamp.ikonli.materialdesign.MaterialDesignZ;
 import org.kordamp.ikonli.metrizeicons.MetrizeIcons;
 import org.kordamp.ikonli.ociicons.Ociicons;
 import org.kordamp.ikonli.octicons.Octicons;
@@ -58,15 +83,8 @@
 import org.kordamp.ikonli.websymbols.Websymbols;
 import org.kordamp.ikonli.zondicons.Zondicons;
 
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JTabbedPane;
-import javax.swing.SwingUtilities;
-import javax.swing.WindowConstants;
-import java.awt.Dimension;
-import java.awt.GridLayout;
+import javax.swing.*;
+import java.awt.*;
 import java.util.EnumSet;
 
 import static java.util.EnumSet.allOf;
@@ -111,7 +129,32 @@ private static void launch() {
         createTab(tabPane, Maki2.class, new DemoTab(allOf(Maki2.class)));
         createTab(tabPane, Mapicons.class, new DemoTab(allOf(Mapicons.class)));
         createTab(tabPane, Material.class, new DemoTab(allOf(Material.class)));
-        createTab(tabPane, MaterialDesign.class, new DemoTab(allOf(MaterialDesign.class)));
+        createTab(tabPane, MaterialDesignA.class, new DemoTab(allOf(MaterialDesignA.class)));
+        createTab(tabPane, MaterialDesignB.class, new DemoTab(allOf(MaterialDesignB.class)));
+        createTab(tabPane, MaterialDesignC.class, new DemoTab(allOf(MaterialDesignC.class)));
+        createTab(tabPane, MaterialDesignD.class, new DemoTab(allOf(MaterialDesignD.class)));
+        createTab(tabPane, MaterialDesignE.class, new DemoTab(allOf(MaterialDesignE.class)));
+        createTab(tabPane, MaterialDesignF.class, new DemoTab(allOf(MaterialDesignF.class)));
+        createTab(tabPane, MaterialDesignG.class, new DemoTab(allOf(MaterialDesignG.class)));
+        createTab(tabPane, MaterialDesignH.class, new DemoTab(allOf(MaterialDesignH.class)));
+        createTab(tabPane, MaterialDesignI.class, new DemoTab(allOf(MaterialDesignI.class)));
+        createTab(tabPane, MaterialDesignJ.class, new DemoTab(allOf(MaterialDesignJ.class)));
+        createTab(tabPane, MaterialDesignK.class, new DemoTab(allOf(MaterialDesignK.class)));
+        createTab(tabPane, MaterialDesignL.class, new DemoTab(allOf(MaterialDesignL.class)));
+        createTab(tabPane, MaterialDesignM.class, new DemoTab(allOf(MaterialDesignM.class)));
+        createTab(tabPane, MaterialDesignN.class, new DemoTab(allOf(MaterialDesignN.class)));
+        createTab(tabPane, MaterialDesignO.class, new DemoTab(allOf(MaterialDesignO.class)));
+        createTab(tabPane, MaterialDesignP.class, new DemoTab(allOf(MaterialDesignP.class)));
+        createTab(tabPane, MaterialDesignQ.class, new DemoTab(allOf(MaterialDesignQ.class)));
+        createTab(tabPane, MaterialDesignR.class, new DemoTab(allOf(MaterialDesignR.class)));
+        createTab(tabPane, MaterialDesignS.class, new DemoTab(allOf(MaterialDesignS.class)));
+        createTab(tabPane, MaterialDesignT.class, new DemoTab(allOf(MaterialDesignT.class)));
+        createTab(tabPane, MaterialDesignU.class, new DemoTab(allOf(MaterialDesignU.class)));
+        createTab(tabPane, MaterialDesignV.class, new DemoTab(allOf(MaterialDesignV.class)));
+        createTab(tabPane, MaterialDesignW.class, new DemoTab(allOf(MaterialDesignW.class)));
+        createTab(tabPane, MaterialDesignX.class, new DemoTab(allOf(MaterialDesignX.class)));
+        createTab(tabPane, MaterialDesignY.class, new DemoTab(allOf(MaterialDesignY.class)));
+        createTab(tabPane, MaterialDesignZ.class, new DemoTab(allOf(MaterialDesignZ.class)));
         createTab(tabPane, MetrizeIcons.class, new DemoTab(allOf(MetrizeIcons.class)));
         createTab(tabPane, Ociicons.class, new DemoTab(allOf(Ociicons.class)));
         createTab(tabPane, Octicons.class, new DemoTab(allOf(Octicons.class)));

diff --git a/core/ikonli-core/src/main/java/org/kordamp/ikonli/Ikon.java b/core/ikonli-core/src/main/java/org/kordamp/ikonli/Ikon.java
@@ -23,5 +23,5 @@
 public interface Ikon {
     String getDescription();
 
-    char getCode();
+    int getCode();
 }
diff --git a/core/ikonli-core/src/main/java/org/kordamp/ikonli/Ikonli.java b/core/ikonli-core/src/main/java/org/kordamp/ikonli/Ikonli.java
@@ -33,9 +33,9 @@ public static Ikonli findByDescription(String description) {
     }
 
     private String description;
-    private char code;
+    private int code;
 
-    Ikonli(String description, char code) {
+    Ikonli(String description, int code) {
         this.description = description;
         this.code = code;
     }
@@ -46,7 +46,7 @@ public String getDescription() {
     }
 
     @Override
-    public char getCode() {
+    public int getCode() {
         return code;
     }
 }