Add win10 icon pack. Fixes #97

kordamp · Nov 4, 2020 · 149910c · 149910c
1 parent 95e5a40
commit 149910c
Show file tree

Hide file tree

Showing 19 changed files with 1,867 additions and 1 deletion.
diff --git a/apps/sampler-javafx/sampler-javafx.gradle b/apps/sampler-javafx/sampler-javafx.gradle
@@ -59,6 +59,7 @@ dependencies {
     implementation project(':ikonli-typicons-pack')
     implementation project(':ikonli-weathericons-pack')
     implementation project(':ikonli-websymbols-pack')
+    implementation project(':ikonli-win10-pack')
     implementation project(':ikonli-zondicons-pack')
 
     implementation "org.openjfx:javafx-base:${javafxVersion}:${platform}"

diff --git a/apps/sampler-javafx/src/main/java/module-info.java b/apps/sampler-javafx/src/main/java/module-info.java
@@ -57,6 +57,7 @@
     requires org.kordamp.ikonli.typicons;
     requires org.kordamp.ikonli.weathericons;
     requires org.kordamp.ikonli.websymbols;
+    requires org.kordamp.ikonli.win10;
     requires org.kordamp.ikonli.zondicons;
     uses org.kordamp.ikonli.IkonHandler;
 }
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
@@ -97,6 +97,7 @@
 import org.kordamp.ikonli.typicons.Typicons;
 import org.kordamp.ikonli.weathericons.WeatherIcons;
 import org.kordamp.ikonli.websymbols.Websymbols;
+import org.kordamp.ikonli.win10.Win10;
 import org.kordamp.ikonli.zondicons.Zondicons;
 
 import java.net.URL;
@@ -182,6 +183,7 @@ public void start(Stage primaryStage) throws Exception {
         tabPane.getTabs().add(new DemoTab(Typicons.class, allOf(Typicons.class)));
         tabPane.getTabs().add(new DemoTab(WeatherIcons.class, allOf(WeatherIcons.class)));
         tabPane.getTabs().add(new DemoTab(Websymbols.class, allOf(Websymbols.class)));
+        tabPane.getTabs().add(new DemoTab(Win10.class, allOf(Win10.class)));
         tabPane.getTabs().add(new DemoTab(Zondicons.class, allOf(Zondicons.class)));
 
         Scene scene = new Scene(tabPane);

diff --git a/apps/sampler-swing/sampler-swing.gradle b/apps/sampler-swing/sampler-swing.gradle
@@ -57,6 +57,7 @@ dependencies {
     implementation project(':ikonli-themify-pack')
     implementation project(':ikonli-weathericons-pack')
     implementation project(':ikonli-websymbols-pack')
+    implementation project(':ikonli-win10-pack')
     implementation project(':ikonli-zondicons-pack')
 }
 

diff --git a/apps/sampler-swing/src/main/java/module-info.java b/apps/sampler-swing/src/main/java/module-info.java
@@ -54,6 +54,7 @@
     requires org.kordamp.ikonli.typicons;
     requires org.kordamp.ikonli.weathericons;
     requires org.kordamp.ikonli.websymbols;
+    requires org.kordamp.ikonli.win10;
     requires org.kordamp.ikonli.zondicons;
     uses org.kordamp.ikonli.IkonHandler;
 }
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
@@ -88,6 +88,7 @@
 import org.kordamp.ikonli.typicons.Typicons;
 import org.kordamp.ikonli.weathericons.WeatherIcons;
 import org.kordamp.ikonli.websymbols.Websymbols;
+import org.kordamp.ikonli.win10.Win10;
 import org.kordamp.ikonli.zondicons.Zondicons;
 
 import javax.swing.*;
@@ -179,6 +180,7 @@ private static void launch() {
         createTab(tabPane, Themify.class, new DemoTab(allOf(Themify.class)));
         createTab(tabPane, WeatherIcons.class, new DemoTab(allOf(WeatherIcons.class)));
         createTab(tabPane, Websymbols.class, new DemoTab(allOf(Websymbols.class)));
+        createTab(tabPane, Win10.class, new DemoTab(allOf(Win10.class)));
         createTab(tabPane, Zondicons.class, new DemoTab(allOf(Zondicons.class)));
 
         JFrame frame = new JFrame("Ikonli Sampler");

diff --git a/docs/guide/guide.gradle b/docs/guide/guide.gradle
@@ -165,7 +165,8 @@ asciidoctor {
             createIconGenerationTask(packName: 'ionicons4', iconClassName: 'org.kordamp.ikonli.ionicons4.Ionicons4Logo', iconName: 'ion', shortNameSize: 5, classifier: 'logo'),
             createIconGenerationTask(packName: 'ionicons4', iconClassName: 'org.kordamp.ikonli.ionicons4.Ionicons4Material', iconName: 'ion', shortNameSize: 5, classifier: 'material'),
             createIconGenerationTask(packName: 'themify', iconClassName: 'org.kordamp.ikonli.themify.Themify', iconName: 'ti', shortNameSize: 3),
-            createIconGenerationTask(packName: 'zondicons', iconClassName: 'org.kordamp.ikonli.zondicons.Zondicons', iconName: 'zondi', shortNameSize: 6)
+            createIconGenerationTask(packName: 'zondicons', iconClassName: 'org.kordamp.ikonli.zondicons.Zondicons', iconName: 'zondi', shortNameSize: 6),
+            createIconGenerationTask(packName: 'win10', iconClassName: 'org.kordamp.ikonli.win10.Win10', iconName: 'win10', shortNameSize: 6)
 
     attributes = [
             ikonliJdk8Version      : project.ikonliJdk8Version,
@@ -203,6 +204,7 @@ asciidoctor {
             themifyVersion         : project.themifyVersion,
             weathericonsVersion    : project.weathericonsVersion,
             websymbolsVersion      : project.websymbolsVersion,
+            win10Version           : project.win10Version,
             zondiconsVersion       : project.zondiconsVersion
     ]
 
@@ -247,6 +249,7 @@ asciidoctor {
         from project(':ikonli-themify-pack').file("src/main/resources/META-INF/resources/themify/${themifyVersion}")
         from project(':ikonli-weathericons-pack').file("src/main/resources/META-INF/resources/weathericons/${weathericonsVersion}")
         from project(':ikonli-websymbols-pack').file("src/main/resources/META-INF/resources/websymbols/${websymbolsVersion}")
+        from project(':ikonli-win10-pack').file("src/main/resources/META-INF/resources/win10/${win10Version}")
         from project(':ikonli-zondicons-pack').file("src/main/resources/META-INF/resources/zondicons/${zondiconsVersion}")
     }
 }
diff --git a/docs/guide/src/docs/asciidoc/cheat-sheet-win10.adoc b/docs/guide/src/docs/asciidoc/cheat-sheet-win10.adoc
@@ -0,0 +1,13 @@
+= Win10
+
+++++
+<link href='./css/icons8-win10.css' rel='stylesheet'>
+<style>
+    .win10 {
+        font-size: 32px;
+    }
+</style>
+++++
+
+include::{gradle-projectdir}/build/tmp/_win10_cheat_sheet.adoc[]
+
diff --git a/docs/guide/src/docs/asciidoc/icon-packs.adoc b/docs/guide/src/docs/asciidoc/icon-packs.adoc
@@ -911,6 +911,32 @@ compile '{project-group}:ikonli-websymbols-pack:{project-version}'
 </dependency>
 ----
 
+== Win10
+* Module: `org.kordamp.ikonli.win10`
+* Font version: {win10Version}
+* link:https://github.com/icons8/windows-10-icons[]
+* link:cheat-sheet-win10.html[Cheat-Sheet]
+
+=== Installing
+
+[source,groovy]
+[subs="attributes"]
+.gradle
+----
+compile '{project-group}:ikonli-win10-pack:{project-version}'
+----
+
+[source,xml]
+[subs="attributes,verbatim"]
+.maven
+----
+<dependency>
+    <groupId>{project-group}</groupId>
+    <artifactId>ikonli-win10-pack</artifactId>
+    <version>{project-version}</version>
+</dependency>
+----
+
 == Zondicons
  * Module: `org.kordamp.ikonli.zondicons`
  * Font version: {zondiconsVersion}

diff --git a/gradle.properties b/gradle.properties
@@ -64,6 +64,7 @@ typiconsVersion        = 2.0.7
 themifyVersion         = 1.0.1
 weathericonsVersion    = 2.0.10
 websymbolsVersion      = 0.0
+win10Version           = 1.0.1
 zondiconsVersion       = 20170712
 
 org.gradle.daemon      = true

diff --git a/icon-packs/ikonli-win10-pack/ikonli-win10-pack.gradle b/icon-packs/ikonli-win10-pack/ikonli-win10-pack.gradle
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+dependencies {
+    api project(':ikonli-core')
+    compileOnly "org.kordamp.jipsy:jipsy:${jipsyVersion}"
+    annotationProcessor "org.kordamp.jipsy:jipsy:${jipsyVersion}"
+}
diff --git a/icon-packs/ikonli-win10-pack/src/main/java/module-info.java b/icon-packs/ikonli-win10-pack/src/main/java/module-info.java
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ */
+module org.kordamp.ikonli.win10 {
+    requires org.kordamp.ikonli.core;
+    requires static org.kordamp.jipsy;
+    exports org.kordamp.ikonli.win10;
+
+    provides org.kordamp.ikonli.IkonHandler
+        with org.kordamp.ikonli.win10.Win10IkonHandler;
+}