From 1a002a9417ab6a397e30db169260bce7a8671b40 Mon Sep 17 00:00:00 2001 From: Smithor Date: Mon, 1 Jun 2026 13:05:23 -0600 Subject: [PATCH] Fixed Issue #4. The SnapKit repo is also changed to be up to date. There is no remotely viewable public repository for SnapKit right now, so mavenLocal() is added instead. --- build.gradle | 7 +++++-- src/snapbuild/app/Editor.java | 2 +- src/snapbuild/app/EditorPane.java | 2 +- src/snapbuild/app/FlatIcon.java | 18 +++++++++--------- src/snapbuild/app/FlatIconItem.java | 18 +++++++++--------- src/snapbuild/app/FlatIconPanel.java | 2 +- 6 files changed, 26 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index e7f1668..e06291b 100644 --- a/build.gradle +++ b/build.gradle @@ -15,10 +15,13 @@ java { targetCompatibility = JavaVersion.VERSION_17 } -repositories { } +repositories { + mavenLocal() +} dependencies { - implementation project(':SnapKit') + // SnapKit project + implementation 'com.reportmill:snapkit:2026.06' } application { diff --git a/src/snapbuild/app/Editor.java b/src/snapbuild/app/Editor.java index 04722a7..71f2a29 100644 --- a/src/snapbuild/app/Editor.java +++ b/src/snapbuild/app/Editor.java @@ -67,7 +67,7 @@ public Editor() _contentBox = new BoxView(); _contentBox.setFillWidth(true); _contentBox.setFillHeight(true); - _contentBox.setFill(ViewUtils.getBackFill()); + _contentBox.setFill(ViewThemeUtils.getBackFill()); _contentBox.setFill(BACK_FILL.blend(Color.WHITE, .8)); _contentBox.setBorder(new Color("#99"), 1); _contentBox.setEffect(new ShadowEffect()); diff --git a/src/snapbuild/app/EditorPane.java b/src/snapbuild/app/EditorPane.java index 0362127..d29a981 100644 --- a/src/snapbuild/app/EditorPane.java +++ b/src/snapbuild/app/EditorPane.java @@ -367,7 +367,7 @@ public void showPreview() contentCopy.setGrowWidth(false); contentCopy.setGrowHeight(false); if (contentCopy.getFill() == null) - contentCopy.setFill(ViewUtils.getBackFill()); + contentCopy.setFill(ViewThemeUtils.getBackFill()); contentCopy.setEffect(new ShadowEffect()); // Create BoxView to hold UI diff --git a/src/snapbuild/app/FlatIcon.java b/src/snapbuild/app/FlatIcon.java index a211d56..a79b98b 100644 --- a/src/snapbuild/app/FlatIcon.java +++ b/src/snapbuild/app/FlatIcon.java @@ -1,8 +1,8 @@ package snapbuild.app; import snap.gfx.Image; import snap.util.Convert; -import snap.util.JSArray; -import snap.util.JSObject; +import snap.util.JsonArray; +import snap.util.JsonObject; import snap.web.*; import java.util.*; @@ -50,22 +50,22 @@ public List getImageItemsForSearchString(String aSearchString) return null; // Get JSON response - JSObject json = (JSObject) httpResp.getJSON(); + JsonObject json = (JsonObject) httpResp.getJSON(); if (json == null) return null; // Get metadata, count, total - JSObject metaNode = (JSObject) json.getValue("metadata"); + JsonObject metaNode = (JsonObject) json.getValue("metadata"); int count = Convert.intValue(metaNode.getNativeValue("count")); int total = Convert.intValue(metaNode.getNativeValue("total")); System.out.println("Found " + count + " of " + total); // Get data - JSArray dataArrayJS = (JSArray) json.getValue("data"); + JsonArray dataArrayJS = (JsonArray) json.getValue("data"); List imageItems = new ArrayList<>(); for (int i = 0; i < count; i++) { - JSObject imageNode = (JSObject) dataArrayJS.getValue(i); + JsonObject imageNode = (JsonObject) dataArrayJS.getValue(i); FlatIconItem imgItem = new FlatIconItem(imageNode); imageItems.add(imgItem); } @@ -119,12 +119,12 @@ private static String getToken() return null; // Get JSON response - JSObject json = (JSObject) httpResp.getJSON(); + JsonObject json = (JsonObject) httpResp.getJSON(); if (json == null) return null; // Get data - JSObject dataNode = (JSObject) json.getValue("data"); + JsonObject dataNode = (JsonObject) json.getValue("data"); String token = dataNode.getStringValue("token"); //String expires = dataNode.getStringValue("expires"); @@ -137,7 +137,7 @@ private static String getToken() private static void addParamsToRequestAsJSON(HTTPRequest httpReq, String... thePairs) { // Create JSON Request and add pairs - JSObject jsonReq = new JSObject(); + JsonObject jsonReq = new JsonObject(); for (int i = 0; i < thePairs.length; i += 2) jsonReq.setNativeValue(thePairs[i], thePairs[i + 1]); diff --git a/src/snapbuild/app/FlatIconItem.java b/src/snapbuild/app/FlatIconItem.java index 8a6179b..2da8dcd 100644 --- a/src/snapbuild/app/FlatIconItem.java +++ b/src/snapbuild/app/FlatIconItem.java @@ -4,8 +4,8 @@ import snap.gfx.Font; import snap.gfx.Image; import snap.util.Convert; -import snap.util.JSValue; -import snap.util.JSObject; +import snap.util.JsonNode; +import snap.util.JsonObject; import snap.view.TextArea; import snap.view.ViewUtils; import java.util.LinkedHashMap; @@ -17,7 +17,7 @@ public class FlatIconItem { // The image item node - private JSObject _itemNode; + private JsonObject _itemNode; // The Id private int _id; @@ -37,7 +37,7 @@ public class FlatIconItem { /** * Constructor. */ - public FlatIconItem(JSObject aNode) + public FlatIconItem(JsonObject aNode) { _itemNode = aNode; @@ -49,14 +49,14 @@ public FlatIconItem(JSObject aNode) _desc = _itemNode.getStringValue("description"); // Get images.png node and pngCount - JSObject imagesNode = (JSObject) _itemNode.getValue("images"); - JSObject pngNode = imagesNode; //(JSObject) imagesNode.getValue("png"); - Map keyValues = pngNode.getKeyValues(); + JsonObject imagesNode = (JsonObject) _itemNode.getValue("images"); + JsonObject pngNode = imagesNode; //(JSObject) imagesNode.getValue("png"); + Map keyValues = pngNode.getKeyValues(); // Iterate over PNGs and add to PNG_URLs - for (Map.Entry entry : keyValues.entrySet()) { + for (Map.Entry entry : keyValues.entrySet()) { String key = entry.getKey(); - JSValue sizeNode = entry.getValue(); + JsonNode sizeNode = entry.getValue(); int size = Convert.intValue(key); String urls = sizeNode.getValueAsString(); _pngURLs.put(size, urls); diff --git a/src/snapbuild/app/FlatIconPanel.java b/src/snapbuild/app/FlatIconPanel.java index 8160503..8fe1c81 100644 --- a/src/snapbuild/app/FlatIconPanel.java +++ b/src/snapbuild/app/FlatIconPanel.java @@ -27,7 +27,7 @@ public class FlatIconPanel extends ViewController { Consumer _itemSelectedHandler; // Constants - private static Color ITEM_VIEW_MOUSE_OVER_COLOR = Color.CYAN.blend(ViewUtils.getBackFill().getColor(), .6); + private static Color ITEM_VIEW_MOUSE_OVER_COLOR = Color.CYAN.blend(ViewThemeUtils.getBackFill().getColor(), .6); /** * Initialize UI.