Skip to content

Commit

Permalink
Add OCI icons
Browse files Browse the repository at this point in the history
  • Loading branch information
Andres Almiray committed Apr 10, 2020
1 parent 18b3fb6 commit b58ec58
Show file tree
Hide file tree
Showing 22 changed files with 587 additions and 4 deletions.
1 change: 1 addition & 0 deletions apps/sampler-javafx/sampler-javafx.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ dependencies {
implementation project(':ikonli-material-pack')
implementation project(':ikonli-materialdesign-pack')
implementation project(':ikonli-metrizeicons-pack')
implementation project(':ikonli-ociicons-pack')
implementation project(':ikonli-octicons-pack')
implementation project(':ikonli-openiconic-pack')
implementation project(':ikonli-paymentfont-pack')
Expand Down
1 change: 1 addition & 0 deletions apps/sampler-javafx/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
requires org.kordamp.ikonli.material;
requires org.kordamp.ikonli.materialdesign;
requires org.kordamp.ikonli.metrizeicons;
requires org.kordamp.ikonli.ociicons;
requires org.kordamp.ikonli.octicons;
requires org.kordamp.ikonli.openiconic;
requires org.kordamp.ikonli.paymentfont;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import org.kordamp.ikonli.material.Material;
import org.kordamp.ikonli.materialdesign.MaterialDesign;
import org.kordamp.ikonli.metrizeicons.MetrizeIcons;
import org.kordamp.ikonli.ociicons.Ociicons;
import org.kordamp.ikonli.octicons.Octicons;
import org.kordamp.ikonli.openiconic.Openiconic;
import org.kordamp.ikonli.paymentfont.PaymentFont;
Expand Down Expand Up @@ -108,6 +109,7 @@ public void start(Stage primaryStage) throws Exception {
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(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)));
tabPane.getTabs().add(new DemoTab(Openiconic.class, allOf(Openiconic.class)));
tabPane.getTabs().add(new DemoTab(PaymentFont.class, allOf(PaymentFont.class)));
Expand Down
1 change: 1 addition & 0 deletions apps/sampler-swing/sampler-swing.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ dependencies {
implementation project(':ikonli-material-pack')
implementation project(':ikonli-materialdesign-pack')
implementation project(':ikonli-metrizeicons-pack')
implementation project(':ikonli-ociicons-pack')
implementation project(':ikonli-octicons-pack')
implementation project(':ikonli-openiconic-pack')
implementation project(':ikonli-paymentfont-pack')
Expand Down
1 change: 1 addition & 0 deletions apps/sampler-swing/src/main/java/module-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
requires org.kordamp.ikonli.material;
requires org.kordamp.ikonli.materialdesign;
requires org.kordamp.ikonli.metrizeicons;
requires org.kordamp.ikonli.ociicons;
requires org.kordamp.ikonli.octicons;
requires org.kordamp.ikonli.openiconic;
requires org.kordamp.ikonli.paymentfont;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import org.kordamp.ikonli.material.Material;
import org.kordamp.ikonli.materialdesign.MaterialDesign;
import org.kordamp.ikonli.metrizeicons.MetrizeIcons;
import org.kordamp.ikonli.ociicons.Ociicons;
import org.kordamp.ikonli.octicons.Octicons;
import org.kordamp.ikonli.openiconic.Openiconic;
import org.kordamp.ikonli.paymentfont.PaymentFont;
Expand Down Expand Up @@ -107,6 +108,7 @@ private static void launch() {
createTab(tabPane, Material.class, new DemoTab(allOf(Material.class)));
createTab(tabPane, MaterialDesign.class, new DemoTab(allOf(MaterialDesign.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)));
createTab(tabPane, Openiconic.class, new DemoTab(allOf(Openiconic.class)));
createTab(tabPane, PaymentFont.class, new DemoTab(allOf(PaymentFont.class)));
Expand Down
3 changes: 3 additions & 0 deletions docs/guide/guide.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ asciidoctor {
createIconGenerationTask(packName: 'material', iconClassName: 'org.kordamp.ikonli.material.Material', iconName: 'gmi', shortNameSize: 4),
createIconGenerationTask(packName: 'materialdesign', iconClassName: 'org.kordamp.ikonli.materialdesign.MaterialDesign', iconName: 'mdi', shortNameSize: 4),
createIconGenerationTask(packName: 'metrizeicons', iconClassName: 'org.kordamp.ikonli.metrizeicons.MetrizeIcons', iconName: 'met', shortNameSize: 4),
createIconGenerationTask(packName: 'ociicons', iconClassName: 'org.kordamp.ikonli.ociicons.Ociicons', iconName: 'oci', shortNameSize: 4),
createIconGenerationTask(packName: 'octicons', iconClassName: 'org.kordamp.ikonli.octicons.Octicons', iconName: 'octicon', shortNameSize: 4),
createIconGenerationTask(packName: 'openiconic', iconClassName: 'org.kordamp.ikonli.openiconic.Openiconic', iconName: 'oi', dataGlyph: true),
createIconGenerationTask(packName: 'paymentfont', iconClassName: 'org.kordamp.ikonli.paymentfont.PaymentFont', iconName: 'pf', shortNameSize: 3),
Expand Down Expand Up @@ -150,6 +151,7 @@ asciidoctor {
materialVersion : project.materialVersion,
materialdesignVersion : project.materialdesignVersion,
metrizeiconsVersion : project.metrizeiconsVersion,
ociiconsVersion : project.ociiconsVersion,
octiconsVersion : project.octiconsVersion,
openiconicVersion : project.openiconicVersion,
paymentfontVersion : project.paymentfontVersion,
Expand Down Expand Up @@ -189,6 +191,7 @@ asciidoctor {
from project(':ikonli-material-pack').file("src/main/resources/META-INF/resources/material/${materialVersion}")
from project(':ikonli-materialdesign-pack').file("src/main/resources/META-INF/resources/materialdesignicons/${materialdesignVersion}")
from project(':ikonli-metrizeicons-pack').file("src/main/resources/META-INF/resources/metrizeicons/${metrizeiconsVersion}")
from project(':ikonli-ociicons-pack').file("src/main/resources/META-INF/resources/ociicons/${ociiconsVersion}")
from project(':ikonli-octicons-pack').file("src/main/resources/META-INF/resources/octicons/${octiconsVersion}")
from project(':ikonli-openiconic-pack').file("src/main/resources/META-INF/resources/openiconic/${openiconicVersion}")
from project(':ikonli-paymentfont-pack').file("src/main/resources/META-INF/resources/paymentfont/${paymentfontVersion}")
Expand Down
13 changes: 13 additions & 0 deletions docs/guide/src/docs/asciidoc/cheat-sheet-ociicons.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
= Ociicons

++++
<link href='./css/ociicons.css' rel='stylesheet'>
<style>
.oci {
font-size: 32px;
}
</style>
++++

include::{gradle-projectdir}/build/tmp/_ociicons_cheat_sheet.adoc[]

26 changes: 26 additions & 0 deletions docs/guide/src/docs/asciidoc/icon-packs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,32 @@ compile '{project-group}:ikonli-metrizeicons-pack:{project-version}'
</dependency>
----

== Ociicons
* Module: `org.kordamp.ikonli.ociicons`
* Font version: {ociiconsVersion}
* link:https://github.com/opencontainers/artwork#oci-icons[]
* link:cheat-sheet-ociicons.html[Cheat-Sheet]

=== Installing

[source,groovy]
[subs="attributes"]
.gradle
----
compile '{project-group}:ikonli-ociicons-pack:{project-version}'
----

[source,xml]
[subs="attributes,verbatim"]
.maven
----
<dependency>
<groupId>{project-group}</groupId>
<artifactId>ikonli-ociicons-pack</artifactId>
<version>{project-version}</version>
</dependency>
----

== Octicons
* Module: `org.kordamp.ikonli.octicons`
* Font version: {octiconsVersion}
Expand Down
7 changes: 4 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
# limitations under the License.
#

version = 11.3.5
version = 11.4.0-SNAPSHOT
group = org.kordamp.ikonli

javafxVersion = 11
jipsyVersion = 0.6.0
jacocoVersion = 0.8.5

osPluginVersion = 1.6.2
kordampPluginVersion = 0.31.2
kordampPomVersion = 1.10.2
kordampPluginVersion = 0.33.0
kordampPomVersion = 1.12.0
gitPluginVersion = 0.3.2

deviconsVersion = 1.8.0
Expand All @@ -49,6 +49,7 @@ mapiconsVersion = 3.0.0
materialVersion = 2.2.3
materialdesignVersion = 1.7.22
metrizeiconsVersion = 0.0
ociiconsVersion = 1.0
octiconsVersion = 4.3.0
openiconicVersion = 1.1.0
paymentfontVersion = 1.2.5
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
3 changes: 3 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

Expand Down
22 changes: 22 additions & 0 deletions icon-packs/ikonli-ociicons-pack/ikonli-ociicons-pack.gradle
Original file line number Diff line number Diff line change
@@ -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}"
}
25 changes: 25 additions & 0 deletions icon-packs/ikonli-ociicons-pack/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -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.ociicons {
requires org.kordamp.iconli.core;
requires static org.kordamp.jipsy;
exports org.kordamp.ikonli.ociicons;

provides org.kordamp.ikonli.IkonHandler
with org.kordamp.ikonli.ociicons.OciiconsIkonHandler;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
/*
* 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.
*/
package org.kordamp.ikonli.ociicons;

import org.kordamp.ikonli.Ikon;

/**
* @author Andres Almiray
*/
public enum Ociicons implements Ikon {
// latest is e940
TWOFA("oci-2fa", '\ue900'),
API("oci-api", '\ue901'),
AUTHENTICATION("oci-authentication", '\ue902'),
BATCH("oci-batch", '\ue903'),
BILLING("oci-billing", '\ue904'),
CDN("oci-cdn", '\ue905'),
CLI("oci-cli", '\ue906'),
CLOUD("oci-cloud", '\ue907'),
CONFIG("oci-config", '\ue908'),
CONFIG_SERVICE("oci-config-service", '\ue909'),
CONTAINER("oci-container", '\ue90a'),
CONTAINER_HOST("oci-container-host", '\ue90b'),
CONTAINER_IMAGE("oci-container-image", '\ue90c'),
CUSTOMER("oci-customer", '\ue90d'),
DATABASE("oci-database", '\ue90e'),
DEBUGGING("oci-debugging", '\ue90f'),
DESKTOP("oci-desktop", '\ue910'),
DEVELOPER("oci-developer", '\ue911'),
DEVICES("oci-devices", '\ue912'),
DISK("oci-disk", '\ue913'),
DISTRIBUTION("oci-distribution", '\ue914'),
DOCDB("oci-docdb", '\ue915'),
FILE("oci-file", '\ue916'),
FIREWALL("oci-firewall", '\ue917'),
FIREWALL_RULE("oci-firewall-rule", '\ue918'),
FUNCTIION("oci-functiion", '\ue919'),
GIT("oci-git", '\ue91a'),
HEALTH_MONITOR("oci-health-monitor", '\ue91b'),
INVOICE("oci-invoice", '\ue91c'),
IOT("oci-iot", '\ue91d'),
KEY_VAULT("oci-key-vault", '\ue91e'),
KEY("oci-key", '\ue91f'),
LAPTOP("oci-laptop", '\ue920'),
LEGACY_MAINFRAME("oci-legacy-mainframe", '\ue921'),
LOAD_BALANCER("oci-load-balancer", '\ue922'),
LOGGING("oci-logging", '\ue923'),
MACHINE_LEARNING("oci-machine-learning", '\ue924'),
MEDIA("oci-media", '\ue925'),
MEDIA_STREAMING("oci-media-streaming", '\ue926'),
MESSAGE("oci-message", '\ue927'),
MOBILE("oci-mobile", '\ue928'),
MONITORING("oci-monitoring", '\ue929'),
ONPREM("oci-onprem", '\ue92a'),
ORCHESTRATOR("oci-orchestrator", '\ue92b'),
PIPELINE("oci-pipeline", '\ue92c'),
POLICY_ENFORCE("oci-policy-enforce", '\ue92d'),
POLICY_MANAGER("oci-policy-manager", '\ue92e'),
QUEUE("oci-queue", '\ue92f'),
SBOM("oci-sbom", '\ue930'),
SCHEDULED_JOB("oci-scheduled-job", '\ue931'),
SDK("oci-sdk", '\ue932'),
SECURITY_SCANNING("oci-security-scanning", '\ue933'),
SERVER_DISK("oci-server-disk", '\ue934'),
SERVERLESS("oci-serverless", '\ue935'),
SERVER_RACK("oci-server-rack", '\ue936'),
SERVICE("oci-service", '\ue937'),
SHELL("oci-shell", '\ue938'),
SIGNATURE_JOB("oci-signature-job", '\ue939'),
SOURCE_ARTIFACT("oci-source-artifact", '\ue93a'),
STORAGE("oci-storage", '\ue93b'),
SUPPORT_PERSONNEL("oci-support-personnel", '\ue93c'),
TESTING("oci-testing", '\ue93d'),
VM("oci-vm", '\ue93e'),
VNET("oci-vnet", '\ue93f'),
WEB("oci-web", '\ue940');

private String description;
private char code;

Ociicons(String description, char code) {
this.description = description;
this.code = code;
}

public static Ociicons findByDescription(String description) {
for (Ociicons font : values()) {
if (font.getDescription().equals(description)) {
return font;
}
}
throw new IllegalArgumentException("Icon description '" + description + "' is invalid!");
}

@Override
public String getDescription() {
return description;
}

@Override
public char getCode() {
return code;
}
}
Loading

0 comments on commit b58ec58

Please sign in to comment.