You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/11/17 14:12:06 UTC
(causeway) branch 3646-fa.layers updated (987c8a4e41 -> ad9e7870cb)
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a change to branch 3646-fa.layers
in repository https://gitbox.apache.org/repos/asf/causeway.git
omit 987c8a4e41 CAUSEWAY-3646: remove the fa-lg/fa-2x modifiers that were auto added by the framework
new ad9e7870cb CAUSEWAY-3646: integrate FontAwesomeLayers with wkt vwr
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (987c8a4e41)
\
N -- N -- N refs/heads/3646-fa.layers (ad9e7870cb)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../metamodel/facets/members/cssclassfa/CssClassFaFactory.java | 9 +++++++++
.../ui/components/entity/icontitle/EntityIconAndTitlePanel.java | 9 ++-------
2 files changed, 11 insertions(+), 7 deletions(-)
(causeway) 01/01: CAUSEWAY-3646: integrate FontAwesomeLayers with wkt vwr
Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 3646-fa.layers
in repository https://gitbox.apache.org/repos/asf/causeway.git
commit ad9e7870cbd05fd1f5bdae5e2a0d47b72c268fab
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Nov 17 14:34:24 2023 +0100
CAUSEWAY-3646: integrate FontAwesomeLayers with wkt vwr
---
.../causeway/applib/fa/FontAwesomeLayers.java | 4 ++++
.../members/cssclassfa/CssClassFaFactory.java | 9 ++++++++
.../entity/icontitle/EntityIconAndTitlePanel.java | 19 +++++++++------
.../bootstrap/css/bootstrap-overrides-all-v2.css | 5 ++++
.../apache/causeway/viewer/wicket/ui/util/Wkt.java | 27 ++++++++++++++++++++++
5 files changed, 57 insertions(+), 7 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/causeway/applib/fa/FontAwesomeLayers.java b/api/applib/src/main/java/org/apache/causeway/applib/fa/FontAwesomeLayers.java
index 13dccbcfd4..c69c234e24 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/fa/FontAwesomeLayers.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/fa/FontAwesomeLayers.java
@@ -58,6 +58,10 @@ public class FontAwesomeLayers {
return new FontAwesomeLayers(null, null, List.of(new IconEntry(faClasses, null)), null);
}
+ public static FontAwesomeLayers iconStack(final IconEntry baseEntry, final IconEntry overlayEntry) {
+ return new FontAwesomeLayers(null, null, List.of(baseEntry, overlayEntry), null);
+ }
+
//TODO[CAUSEWAY-3646] design more factories as we write the tests
}
diff --git a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/CssClassFaFactory.java b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/CssClassFaFactory.java
index 4772e39b95..c58e65c124 100644
--- a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/CssClassFaFactory.java
+++ b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/facets/members/cssclassfa/CssClassFaFactory.java
@@ -21,6 +21,7 @@ package org.apache.causeway.core.metamodel.facets.members.cssclassfa;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.apache.causeway.applib.fa.FontAwesomeLayers;
import org.apache.causeway.applib.layout.component.CssClassFaPosition;
import org.apache.causeway.commons.internal.base._NullSafe;
import org.apache.causeway.commons.internal.base._Strings;
@@ -65,6 +66,14 @@ public interface CssClassFaFactory {
}
+ /**
+ * Creates the model object that is used for FA icon rendering.
+ * TODO[CAUSEWAY-3646] override in yet to be implemented new Factory sub class, that will handle the new object support method
+ */
+ default FontAwesomeLayers createLayers() {
+ return FontAwesomeLayers.singleIcon(asSpaceSeparatedWithAdditional("fa-lg"));
+ }
+
/**
* @implNote because {@link CssClassFaStaticFacetAbstract} has all the fa-icon logic,
* we simply reuse it here by creating an anonymous instance
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
index 35f4dcce0a..01e5df9dd5 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/components/entity/icontitle/EntityIconAndTitlePanel.java
@@ -22,7 +22,6 @@ import java.io.Serializable;
import java.util.Objects;
import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.AbstractLink;
import org.apache.causeway.commons.internal.assertions._Assert;
@@ -108,6 +107,16 @@ extends PanelAbstract<ManagedObject, ObjectAdapterModel> {
WktComponents.permanentlyHide(link, ID_ENTITY_ICON);
Wkt.labelAdd(link, ID_ENTITY_TITLE, titleAbbreviated("(no object)"));
} else {
+
+//TODO[CAUSEWAY-3646] debugging
+// WktComponents.permanentlyHide(link, ID_ENTITY_ICON);
+// Wkt.faIconLayersAdd(link, ID_ENTITY_FONT_AWESOME,
+// //FontAwesomeLayers.singleIcon("fa fa-cube fa-lg")
+// FontAwesomeLayers.iconStack(
+// new FontAwesomeLayers.IconEntry("fa-solid fa-circle fa-stack-2x", null),
+// new FontAwesomeLayers.IconEntry("fa-solid fa-flag fa-stack-1x fa-inverse", null))
+// );
+
linkedDomainObject.eitherIconOrFaClass()
.accept(
objectIcon->{
@@ -115,13 +124,9 @@ extends PanelAbstract<ManagedObject, ObjectAdapterModel> {
getImageResourceCache().resourceReferenceForObjectIcon(objectIcon));
WktComponents.permanentlyHide(link, ID_ENTITY_FONT_AWESOME);
},
- cssClassFaFactory->{
+ faFactory->{
WktComponents.permanentlyHide(link, ID_ENTITY_ICON);
- final Label dummyLabel = Wkt.labelAdd(link, ID_ENTITY_FONT_AWESOME, "");
- val faSizeModifier = getModel().getRenderingHint().isInTable()
- ? "fa-lg"
- : "fa-2x";
- Wkt.cssAppend(dummyLabel, cssClassFaFactory.asSpaceSeparatedWithAdditional(faSizeModifier));
+ Wkt.faIconLayersAdd(link, ID_ENTITY_FONT_AWESOME, faFactory.createLayers());
});
final TitleRecord title = determineTitle(linkedDomainObject);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css
index 1809cb6de3..1e9e8b1b59 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/bootstrap/css/bootstrap-overrides-all-v2.css
@@ -572,6 +572,11 @@ span.containedButtonPanel {
margin-right: 2px;
}
+/* fa icon size for page titles */
+.entityHeaderPanel .fa {
+ font-size: 1.5em;
+}
+
/** top alignment for additional buttons on scalar value inputs */
.scalarValueInput .additionalButtons .btn-group {
vertical-align: top;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java
index 342f9c3d30..365c73440c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/Wkt.java
@@ -91,7 +91,9 @@ import org.danekja.java.util.function.serializable.SerializableConsumer;
import org.springframework.lang.Nullable;
import org.apache.causeway.applib.Identifier;
+import org.apache.causeway.applib.fa.FontAwesomeLayers;
import org.apache.causeway.applib.value.NamedWithMimeType.CommonMimeType;
+import org.apache.causeway.commons.collections.Can;
import org.apache.causeway.commons.internal.base._Casts;
import org.apache.causeway.commons.internal.base._Strings;
import org.apache.causeway.commons.internal.debug._Probe;
@@ -643,6 +645,30 @@ public class Wkt {
return String.format("<i class=\"%s\"></i>", faClasses);
}
+ public MarkupComponent faIconLayers(
+ final String id,
+ final FontAwesomeLayers fontAwesomeLayers) {
+ var iconEntries = Can.ofCollection(fontAwesomeLayers.iconEntries());
+ if(iconEntries.isEmpty()) {
+ // fallback to cube icon
+ return markup(id, faIcon("fa fa-cube fa-lg"));
+ }
+ if(iconEntries.isCardinalityOne()) {
+ // use simple rendering (not a stack nor layered)
+ return markup(id, faIcon(iconEntries.getFirstElseFail().cssClasses()));
+ }
+ var sb = new StringBuilder();
+ iconEntries.forEach(iconEntry->sb.append(faIcon(iconEntry.cssClasses())));
+ var span = markup(id, sb.toString());
+ Wkt.cssAppend(span, "fa-stack");
+ return span;
+ }
+
+ public MarkupComponent faIconLayersAdd(final MarkupContainer container, final String id,
+ final FontAwesomeLayers faLayers) {
+ return add(container, faIconLayers(id, faLayers));
+ }
+
// -- FRAGMENT
/**
@@ -1140,4 +1166,5 @@ public class Wkt {
}
}
+
}