Merge pull request #241 from DropSnorz/feat/explore-details-interactive

Interactive package details
DropSnorz · Apr 7, 2024 · 38dda05 · 38dda05
2 parents bff3eb9 + 4d82610
commit 38dda05
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 5 deletions.
diff --git a/owlplug-client/src/main/java/com/owlplug/explore/controllers/ExploreController.java b/owlplug-client/src/main/java/com/owlplug/explore/controllers/ExploreController.java
@@ -320,6 +320,12 @@ public void selectPackage(RemotePackage remotePackage) {
     packageInfoController.show();
   }
 
+  public void addSearchChip(String chip) {
+    if (chip != null && !chip.trim().isEmpty()) {
+      exploreChipView.getChips().add(exploreChipView.getConverter().fromString(chip));
+    }
+  }
+
   /**
    * Trigger bundle installation sequence.
    * 

diff --git a/owlplug-client/src/main/java/com/owlplug/explore/controllers/PackageInfoController.java b/owlplug-client/src/main/java/com/owlplug/explore/controllers/PackageInfoController.java
@@ -31,6 +31,7 @@
 import javafx.fxml.FXML;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
+import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
 import javafx.scene.effect.InnerShadow;
 import javafx.scene.image.Image;
@@ -73,7 +74,7 @@ public class PackageInfoController extends BaseController {
   @FXML
   private Button installButton;
   @FXML
-  private Label creatorLabel;
+  private Hyperlink creatorLink;
   @FXML
   private Label licenseLabel;
   @FXML
@@ -104,6 +105,10 @@ public void initialize() {
     sidebar.collapse();
     packageInfoContainer.getChildren().add(sidebar);
 
+    creatorLink.setOnAction(e -> {
+      exploreController.addSearchChip(creatorLink.getText());
+    });
+
     closeButton.setOnAction(e -> {
       sidebar.collapse();
     });
@@ -166,7 +171,7 @@ private void configureHeader(RemotePackage remotePackage) {
   private void configureBody(RemotePackage remotePackage) {
 
     // General fields binding
-    this.creatorLabel.setText(remotePackage.getCreator());
+    this.creatorLink.setText(remotePackage.getCreator());
     this.descriptionLabel.setText(remotePackage.getDescription());
 
     // License display
@@ -196,6 +201,10 @@ private void configureBody(RemotePackage remotePackage) {
     for (PackageTag tag : remotePackage.getTags()) {
       Node chip = new FakeChip(tag.getName());
       chip.getStyleClass().add("chip");
+      chip.getStyleClass().add("fake-chip");
+      chip.setOnMouseClicked(e -> {
+        exploreController.addSearchChip(tag.getName());
+      });
       tagContainer.getChildren().add(chip);
     }
 

diff --git a/owlplug-client/src/main/resources/fxml/menu/PackageInfoView.fxml b/owlplug-client/src/main/resources/fxml/menu/PackageInfoView.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.image.*?>
 <?import javafx.scene.layout.*?>
 
-<HBox fx:id="packageInfoContainer" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.owlplug.explore.controllers.PackageInfoController">
+<HBox fx:id="packageInfoContainer" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.owlplug.explore.controllers.PackageInfoController">
    <children>
       <VBox fx:id="packageInfoContent" maxWidth="-Infinity" minWidth="400.0" prefWidth="400.0">
          <children>
@@ -108,7 +108,7 @@
                                   <RowConstraints maxHeight="1.7976931348623157E308" minHeight="24.0" valignment="CENTER" vgrow="ALWAYS" />
                                 </rowConstraints>
                                  <children>
-                                    <Label fx:id="creatorLabel" text="CREATOR">
+                                    <Hyperlink fx:id="creatorLink" styleClass="hyperlink-disabled" text="CREATOR">
                                        <graphic>
                                           <ImageView fitHeight="16.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">
                                              <image>
@@ -117,7 +117,7 @@
                                           </ImageView>
                                        </graphic>
                                        <tooltip><Tooltip text="Creator" /></tooltip>
-                                    </Label>
+                                    </Hyperlink>
                                     <Label fx:id="typeLabel" text="TYPE" GridPane.rowIndex="1">
                                        <graphic>
                                           <ImageView fitHeight="16.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true">

diff --git a/owlplug-client/src/main/resources/owlplug.css b/owlplug-client/src/main/resources/owlplug.css
@@ -149,6 +149,11 @@ TextArea .content {
 	-fx-background-color: #657899
 }
 
+.fake-chip:hover {
+    -fx-cursor: hand;
+    -fx-background-color: #D4D4D4;
+}
+
 .button-danger{
 	-fx-background-color: danger-color;