nellemann/mdns-explorer
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Desktop builds. #1

Merged
nellemann merged 11 commits from desktop into main 2023-08-14 17:40:48 +00:00
Conversation 0 Commits 11 Files changed 23 +227 -332
16 changed files with 227 additions and 332 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 201bfc5b7d - Show all commits

106
build.gradle
View file

@ -1,13 +1,16 @@
import org.apache.tools.ant.filters.ReplaceTokens
plugins {
id 'application'
id 'org.openjfx.javafxplugin' version '0.0.14'
id "com.github.johnrengelman.shadow" version "8.1.1"
id 'com.gluonhq.gluonfx-gradle-plugin' version '1.0.19'
id 'com.google.osdetector' version '1.7.3'
id 'org.beryx.jlink' version '2.26.0'
//id "com.github.johnrengelman.shadow" version "8.1.1"
//id 'com.gluonhq.gluonfx-gradle-plugin' version '1.0.19'
}
import org.apache.tools.ant.filters.ReplaceTokens
repositories {
mavenCentral()
mavenLocal()
@ -27,23 +30,22 @@ tasks.withType(JavaCompile).configureEach {
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
modularity.inferModulePath = false
//modularity.inferModulePath = false
}
/* This is to be able to build with a JDK not bundled with JavaFX */
javafx {
version = '21+'
version = '17.0.8'
modules = [ 'javafx.controls', 'javafx.fxml' ]
// platform("linux-aarch64")
}
dependencies {
implementation 'com.gluonhq:charm-glisten:6.2.3'
implementation 'com.gluonhq:glisten-afterburner:2.1.0'
implementation 'org.slf4j:slf4j-api:2.0.7' // Logging API
runtimeOnly 'org.slf4j:slf4j-simple:2.0.7' // Logging API
implementation 'javax.inject:javax.inject:1'
implementation 'javax.annotation:javax.annotation-api:1.3.2'
implementation 'org.jmdns:jmdns:3.5.8'
testImplementation 'org.spockframework:spock-core:2.3-groovy-3.0'
@ -54,7 +56,7 @@ test {
useJUnitPlatform()
}
/*
gluonfx {
verbose = true
target = project.hasProperty("target") ? project.getProperty("target") : 'host'
@ -102,18 +104,96 @@ gluonfx {
//skipSigning = true // Will not run or deploy if not signed
}
}
}*/
/*
shadowJar {
//archiveBaseName.set("vtd-poc-app")
//archiveClassifier.set('all')
archiveVersion.set("${System.env.BITBUCKET_BRANCH ?: 'dev' }")
}
}*/
tasks.build.dependsOn tasks.shadowJar
//tasks.build.dependsOn tasks.shadowJar
tasks.processResources {
filesMatching('**/configuration.properties') {
filter(ReplaceTokens, tokens: [copyright: '2023', version: System.env.BITBUCKET_BUILD_NUMBER ?: 'development' ])
}
}
jlink {
forceMerge 'slf4j'
options = [
'--strip-debug',
'--compress', '2',
'--no-header-files',
'--no-man-pages'
]
launcher {
name = 'mDNS-Explorer'
noConsole = true
}
// Only works with Java 14 (and later)
jpackage {
imageName = "mDNS-Explorer"
skipInstaller = true
installerName = "mDNS-Explorer-${osdetector.arch}"
installerOptions += [
'--vendor', 'Nellemann Data',
'--description', 'mDNS Explorer',
'--copyright', 'Mark Nellemann <mark.nellemann@gmail.com>',
'--app-version', version
]
// Requires: https://wixtoolset.org/ to create installer on Windows
if(osdetector.os == 'windows') {
installerType = 'msi'
skipInstaller = false
installerOptions += [
'--win-per-user-install',
'--win-dir-chooser',
'--win-menu',
// '--icon', 'src/main/resources/icon.ico'
]
}
// Requires: xcode-select --install
if(osdetector.os == 'osx') {
installerType = 'dmg'
skipInstaller = false
installerOptions += [
//'--icon', 'src/main/resources/icon.icns'
]
}
if(osdetector.os == 'linux') {
installerOptions += [
'--linux-menu-group', 'Internet',
'--linux-shortcut',
//'--icon', 'src/main/resources/icon_256x256.png'
]
if (osdetector.release.isLike('debian')) {
installerType = 'deb'
skipInstaller = false
installerOptions += [
'--linux-deb-maintainer', 'mark.nellemann@gmail.com'
]
} else if (osdetector.release.isLike('centos')) {
installerType = 'rpm'
skipInstaller = false
installerOptions += [
'--linux-rpm-license-type', 'APACHE-20'
]
}
}
}
}

3
settings.gradle
View file

@ -1,9 +1,6 @@
pluginManagement {
repositories {
mavenLocal()
maven {
url "https://nexus.gluonhq.com/nexus/content/repositories/releases"
}
gradlePluginPortal()
}
}

50
src/main/java/biz/nellemann/mdexpl/App.java
View file

@ -1,36 +1,58 @@
package biz.nellemann.mdexpl;
import biz.nellemann.mdexpl.view.AppViewManager;
import com.gluonhq.charm.glisten.application.AppManager;
import com.gluonhq.charm.glisten.visual.Swatch;
import javafx.application.Application;
import javafx.application.Platform;
import javafx.fxml.FXMLLoader;
import javafx.scene.Scene;
import javafx.scene.image.Image;
import javafx.stage.Stage;
import javafx.stage.WindowEvent;
import java.util.Objects;
import java.awt.Taskbar;
import java.awt.Toolkit;
import java.awt.Taskbar.Feature;
import java.io.IOException;
public class App extends Application {
private final AppManager appManager = AppManager.initialize(this::postInit);
@Override
public void init() {
AppViewManager.registerViewsAndDrawer();
Platform.setImplicitExit(true);
}
@Override
public void start(Stage primaryStage) {
//System.setProperty(com.gluonhq.attach.util.Constants.ATTACH_DEBUG,"true");
appManager.start(primaryStage);
public void start(Stage primaryStage) throws IOException {
// Make all stages close and the app exit when the primary stage is closed
primaryStage.setOnCloseRequest(e -> Platform.exit());
// Set icon on the application bar
var appIcon = new Image("/icon.png");
primaryStage.getIcons().add(appIcon);
// Set icon on the taskbar/dock
if (Taskbar.isTaskbarSupported()) {
var taskbar = Taskbar.getTaskbar();
if (taskbar.isSupported(Feature.ICON_IMAGE)) {
final Toolkit defaultToolkit = Toolkit.getDefaultToolkit();
var dockIcon = defaultToolkit.getImage(getClass().getResource("/icon.png"));
taskbar.setIconImage(dockIcon);
}
}
FXMLLoader fxmlLoader = new FXMLLoader(App.class.getResource("main.fxml"));
Scene scene = new Scene(fxmlLoader.load());
primaryStage.setTitle("mDNS Explorer");
primaryStage.setScene(scene);
primaryStage.show();
}
private void postInit(Scene scene) {
Swatch.GREEN.assignTo(scene);
//scene.getStylesheets().add(App.class.getResource("style.css").toExternalForm());
((Stage) scene.getWindow()).getIcons().add(new Image(Objects.requireNonNull(App.class.getResourceAsStream("/icon.png"))));
@Override
public void stop() {
}

55
src/main/java/biz/nellemann/mdexpl/MainPresenter.java Normal file
View file

@ -0,0 +1,55 @@
package biz.nellemann.mdexpl;
import biz.nellemann.mdexpl.model.NetworkService;
import biz.nellemann.mdexpl.service.DiscoveryService;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.event.EventHandler;
import javafx.fxml.FXML;
import javafx.scene.control.ListView;
import javafx.scene.layout.BorderPane;
import javafx.stage.WindowEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import java.util.ResourceBundle;
public class MainPresenter {
private static final Logger log = LoggerFactory.getLogger(MainPresenter.class);
@FXML
private BorderPane view;
@FXML
private ResourceBundle resources;
@FXML
private ListView<NetworkService> listView;
@Inject
DiscoveryService discoveryService;
private final ObservableList<NetworkService> devicesList = FXCollections.observableArrayList();
@FXML
public void initialize() {
log.info("initialize()");
view.addEventFilter(WindowEvent.WINDOW_CLOSE_REQUEST, event -> {
log.info("Window closing");
discoveryService.destroy();
});
discoveryService = new DiscoveryService();
discoveryService.initialize();
discoveryService.setObservableList(devicesList);
listView.setItems(devicesList);
listView.setCellFactory(p -> new NetworkServiceCell());
}
}

41
src/main/java/biz/nellemann/mdexpl/NetworkServiceCell.java
View file

@ -1,40 +1,37 @@
package biz.nellemann.mdexpl;
import biz.nellemann.mdexpl.model.NetworkService;
import com.gluonhq.attach.util.impl.ClipboardUtils;
import com.gluonhq.charm.glisten.control.CharmListCell;
import com.gluonhq.charm.glisten.control.ListTile;
import javafx.application.Platform;
import javafx.scene.control.ListCell;
import javafx.scene.input.ClipboardContent;
import javafx.scene.layout.HBox;
import javafx.scene.shape.Rectangle;
import javafx.scene.input.Clipboard;
import java.util.Optional;
public class NetworkServiceCell extends CharmListCell<NetworkService> {
public class NetworkServiceCell extends ListCell<NetworkService> {
private final ListTile tile;
private final Rectangle icon;
private final Clipboard clipboard;
private final ClipboardContent clipboardContent;
HBox hBox;
public NetworkServiceCell() {
clipboard = Clipboard.getSystemClipboard();
clipboardContent = new ClipboardContent();
this.tile = new ListTile();
//imageView = new ImageView();
//imageView.setFitHeight(15);
//imageView.setFitWidth(25);
//tile.setPrimaryGraphic(imageView);
icon = new Rectangle();
icon.setHeight(25);
icon.setWidth(25);
tile.setPrimaryGraphic(icon);
tile.setOnMouseClicked(e -> {
clipboardContent.putString(itemProperty().get().getUrl());
clipboard.setContent(clipboardContent);
this.setGraphic(icon);
this.setOnMouseClicked(e -> {
if(itemProperty().get() != null) {
clipboardContent.putString(itemProperty().get().getUrl());
clipboard.setContent(clipboardContent);
};
});
setText(null);
}
@ -43,16 +40,14 @@ public class NetworkServiceCell extends CharmListCell<NetworkService> {
@Override
public void updateItem(NetworkService item, boolean empty) {
super.updateItem(item, empty);
if (item != null && !empty) {
tile.textProperty().setAll(item.getName(),
item.getApp() + " (" + item.getSubType() + ") - " + item.getUrl()
);
icon.setFill(item.getColor());
setGraphic(tile);
} else {
if (empty) {
setText(null);
setGraphic(null);
} else {
setText(item.toString());
icon.setFill(item.getColor());
setGraphic(icon);
}
}
}

20
src/main/java/biz/nellemann/mdexpl/model/MainModel.java
View file

@ -1,20 +0,0 @@
package biz.nellemann.mdexpl.model;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.PostConstruct;
import javax.inject.Singleton;
@Singleton
public class MainModel {
private static final Logger log = LoggerFactory.getLogger(MainModel.class);
@PostConstruct
public void initialize() {
log.info("initialize()");
}
}

2
src/main/java/biz/nellemann/mdexpl/model/NetworkService.java
View file

@ -74,7 +74,7 @@ public class NetworkService {
@Override
public String toString() {
return name + " (" + type + "), app=" + app + ", url=" + url;
return name + " (" + app + ") " + url;
}

4
src/main/java/biz/nellemann/mdexpl/service/DiscoveryService.java
View file

@ -7,8 +7,6 @@ import javafx.scene.paint.Color;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import javax.inject.Singleton;
import javax.jmdns.JmDNS;
import java.io.IOException;
@ -71,7 +69,6 @@ public class DiscoveryService {
}};
@PostConstruct
public void initialize() {
log.info("initialize()");
try {
@ -82,7 +79,6 @@ public class DiscoveryService {
}
@PreDestroy
public void destroy() {
if(jmdns != null) {
try {

64
src/main/java/biz/nellemann/mdexpl/view/AboutPresenter.java
View file

@ -1,64 +0,0 @@
package biz.nellemann.mdexpl.view;
import com.gluonhq.charm.glisten.application.AppManager;
import com.gluonhq.charm.glisten.control.AppBar;
import com.gluonhq.charm.glisten.mvc.View;
import com.gluonhq.charm.glisten.visual.MaterialDesignIcon;
import javafx.fxml.FXML;
import javafx.scene.control.Label;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import java.util.ResourceBundle;
public class AboutPresenter {
private static final Logger log = LoggerFactory.getLogger(AboutPresenter.class);
@FXML
private ResourceBundle resources;
@FXML
View about;
@FXML
Label labelInfoWebsite;
@FXML
Label labelVersion;
@Inject String appVersion;
@Inject String aboutWebsite;
@FXML
public void initialize() {
log.info("initialize()");
about.showingProperty().addListener((obs, oldValue, newValue) -> {
if (newValue) {
AppManager appManager = AppManager.getInstance();
AppBar appBar = appManager.getAppBar();
appBar.setNavIcon(MaterialDesignIcon.MENU.button(e ->
appManager.getDrawer().open()));
appBar.setTitleText("About");
appBar.getActionItems().add(MaterialDesignIcon.CLOSE.button(e -> {
appManager.goHome();
}));
}
});
labelVersion.setText(appVersion);
labelInfoWebsite.setText(aboutWebsite);
}
}

52
src/main/java/biz/nellemann/mdexpl/view/AppViewManager.java
View file

@ -1,52 +0,0 @@
package biz.nellemann.mdexpl.view;
import biz.nellemann.mdexpl.App;
import com.gluonhq.charm.glisten.afterburner.AppView;
import com.gluonhq.charm.glisten.afterburner.AppViewRegistry;
import com.gluonhq.charm.glisten.afterburner.Utils;
import com.gluonhq.charm.glisten.application.AppManager;
import com.gluonhq.charm.glisten.control.Avatar;
import com.gluonhq.charm.glisten.control.NavigationDrawer;
import com.gluonhq.charm.glisten.visual.MaterialDesignIcon;
import javafx.scene.image.Image;
import java.util.Locale;
import java.util.Objects;
import static com.gluonhq.charm.glisten.afterburner.AppView.Flag.*;
public class AppViewManager {
public static final AppViewRegistry REGISTRY = new AppViewRegistry();
// Shown in drawer
public static final AppView PRIMARY_VIEW = view("Explorer", MainPresenter.class, MaterialDesignIcon.HOME, SHOW_IN_DRAWER, HOME_VIEW, SKIP_VIEW_STACK);
public static final AppView ABOUT_VIEW = view("About", AboutPresenter.class, MaterialDesignIcon.HELP, SHOW_IN_DRAWER);
private static AppView view(String title, Class<?> presenterClass, MaterialDesignIcon menuIcon, AppView.Flag... flags ) {
return REGISTRY.createView(name(presenterClass), title, presenterClass, menuIcon, flags);
}
private static String name(Class<?> presenterClass) {
return presenterClass.getSimpleName().toUpperCase(Locale.ROOT).replace("PRESENTER", "");
}
public static void registerViewsAndDrawer() {
for (AppView view : REGISTRY.getViews()) {
view.registerView();
}
NavigationDrawer.Header header = new NavigationDrawer.Header("mDNS Explorer",
"Multicast DNS Explorer",
new Avatar(48, new Image(Objects.requireNonNull(App.class.getResourceAsStream("/icon.png"))))
);
Utils.buildDrawer(AppManager.getInstance().getDrawer(), header, REGISTRY.getViews());
//NavigationDrawer.Footer footer = new NavigationDrawer.Footer("Bla");
//AppManager.getInstance().getDrawer().setFooter(footer);
}
}

77
src/main/java/biz/nellemann/mdexpl/view/MainPresenter.java
View file

@ -1,77 +0,0 @@
package biz.nellemann.mdexpl.view;
import biz.nellemann.mdexpl.NetworkServiceCell;
import biz.nellemann.mdexpl.model.NetworkService;
import biz.nellemann.mdexpl.model.MainModel;
import biz.nellemann.mdexpl.service.DiscoveryService;
import com.gluonhq.charm.glisten.application.AppManager;
import com.gluonhq.charm.glisten.control.AppBar;
import com.gluonhq.charm.glisten.control.CharmListView;
import com.gluonhq.charm.glisten.control.LifecycleEvent;
import com.gluonhq.charm.glisten.mvc.View;
import com.gluonhq.charm.glisten.visual.MaterialDesignIcon;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.fxml.FXML;
import javafx.scene.input.MouseEvent;
import javafx.scene.input.TouchEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.inject.Inject;
import java.util.ResourceBundle;
public class MainPresenter {
private static final Logger log = LoggerFactory.getLogger(MainPresenter.class);
@FXML
private View main;
@Inject
private MainModel model;
@Inject
private DiscoveryService discoveryService;
@FXML
private ResourceBundle resources;
@FXML
private CharmListView<NetworkService, Integer> charmListView;
private final ObservableList<NetworkService> devicesList = FXCollections.observableArrayList();
@FXML
public void initialize() {
log.info("initialize()");
main.showingProperty().addListener((obs, oldValue, newValue) -> {
if (newValue) {
AppManager appManager = AppManager.getInstance();
AppBar appBar = appManager.getAppBar();
appBar.setNavIcon(MaterialDesignIcon.MENU.button(e ->
appManager.getDrawer().open()));
appBar.setTitleText("mDNS Explorer");
}
});
discoveryService.setObservableList(devicesList);
charmListView.setItems(devicesList);
charmListView.setCellFactory(p -> new NetworkServiceCell());
}
public void onEventShowing(LifecycleEvent lifecycleEvent) {
}
public void onEventHiding(LifecycleEvent lifecycleEvent) {
}
}

12
src/main/java/module-info.java Normal file
View file

@ -0,0 +1,12 @@
module biz.nellemann.mdexpl {
requires javafx.controls;
requires javafx.fxml;
requires javax.jmdns;
requires org.slf4j;
requires javax.inject;
requires java.annotation;
requires java.desktop;
opens biz.nellemann.mdexpl to javafx.fxml;
exports biz.nellemann.mdexpl;
}

0
src/main/resources/biz/nellemann/mdexpl/view/configuration.properties → src/main/resources/biz/nellemann/mdexpl/configuration.properties
View file

12
src/main/resources/biz/nellemann/mdexpl/main.fxml Normal file
View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.ListView?>
<?import javafx.scene.layout.BorderPane?>
<BorderPane fx:id="view" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/17.0.8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="biz.nellemann.mdexpl.MainPresenter">
<center>
<ListView fx:id="listView" BorderPane.alignment="CENTER" />
</center>
</BorderPane>

45
src/main/resources/biz/nellemann/mdexpl/view/about.fxml
View file

@ -1,45 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import com.gluonhq.charm.glisten.control.Icon?>
<?import com.gluonhq.charm.glisten.mvc.View?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
<View fx:id="about" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="biz.nellemann.mdexpl.view.AboutPresenter">
<VBox alignment="CENTER">
<Label alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" minHeight="-Infinity" minWidth="-Infinity" text="mDNS Explorer">
<VBox.margin>
<Insets bottom="5.0" />
</VBox.margin>
<font>
<Font size="36.0" />
</font>
</Label>
<Label fx:id="labelVersion" alignment="CENTER" layoutX="10.0" layoutY="234.0" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" text="version" textAlignment="CENTER">
<VBox.margin>
<Insets bottom="5.0" top="5.0" />
</VBox.margin>
</Label>
<HBox alignment="CENTER" spacing="5.0">
<children>
<Icon content="INFO" />
<Label fx:id="labelInfoWebsite" alignment="CENTER" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" textAlignment="CENTER">
</Label>
</children>
<VBox.margin>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</VBox.margin>
</HBox>
</VBox>
<padding>
<Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
</padding>
</View>

16
src/main/resources/biz/nellemann/mdexpl/view/main.fxml
View file

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import com.gluonhq.charm.glisten.control.BottomNavigation?>
<?import com.gluonhq.charm.glisten.control.BottomNavigationButton?>
<?import com.gluonhq.charm.glisten.control.CharmListView?>
<?import com.gluonhq.charm.glisten.control.Icon?>
<?import com.gluonhq.charm.glisten.mvc.View?>
<?import javafx.scene.layout.BorderPane?>
<View fx:id="main" onHiding="#onEventHiding" onShowing="#onEventShowing" xmlns="http://javafx.com/javafx/20.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="biz.nellemann.mdexpl.view.MainPresenter">
<center>
<CharmListView fx:id="charmListView" BorderPane.alignment="CENTER" />
</center>
</View>