diff --git a/README.md b/README.md index 397b277..317e3cc 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,13 @@ -# Make your own app! - [appName] +# Make your own app! - Yet Another Collaborative Whiteboard App ## What is it ? -@torineos and @akomry's submission to `Make your own app!` game jam. -Probably a networking or multimedia app or something. +@akomry's submission to `Make your own app!` game jam. + +Basically, this is an online drawing app. It only has the most basic tools for now, pen and eraser with custom color, but I hope to be able to add more. ## Dependencies -You need at least **[Java 23](https://adoptium.net/temurin/releases/?version=23)** up and running. +Probably **[Java 23](https://adoptium.net/temurin/releases/?version=23)** up and running. ## Installation guide @@ -16,14 +17,20 @@ install a packaged zipped file. Then execute `[extract dir]/bin/app`. ## -Roadmap- - [x] Brainstorming -- [ ] Find a name -- [ ] List issues - +- [x] Find a name +- [x] List issues +- [x] Experiment with javafx Canvas +- [x] Implement Canvas creation +- [x] Implement TCP/IP server/client +- [x] Implement event callback +- [x] Implement brush, its size and color +- [x] Implement eraser +- [ ] Implement zoom control (WIP, sketchy zoom) +- [ ] Implement layering system ## License TBD ## Contributors -* @torineos * @akomry \ No newline at end of file diff --git a/graphical-app/pom.xml b/graphical-app/pom.xml index 46d3508..6c8253f 100644 --- a/graphical-app/pom.xml +++ b/graphical-app/pom.xml @@ -9,20 +9,22 @@ 1.0-SNAPSHOT graphical-app + UTF-8 -5.10.0 + 5.10.0 + org.openjfx javafx-controls - 17.0.6 + 24 org.openjfx javafx-fxml - 17.0.6 + 24 @@ -40,7 +42,7 @@ org.controlsfx controlsfx - 11.2.1 + 11.2.2 net.synedra @@ -59,7 +61,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.11.0 + 3.14.0 23 23 @@ -71,7 +73,6 @@ 0.0.8 - default-cli fr.emiko.graphicalapp/fr.emiko.graphicalapp.DrawApplication diff --git a/graphical-app/src/main/java/fr/emiko/graphicalapp/DrawApplication.java b/graphical-app/src/main/java/fr/emiko/graphicalapp/DrawApplication.java index 4b3b9b8..81eb4dc 100644 --- a/graphical-app/src/main/java/fr/emiko/graphicalapp/DrawApplication.java +++ b/graphical-app/src/main/java/fr/emiko/graphicalapp/DrawApplication.java @@ -3,16 +3,20 @@ package fr.emiko.graphicalapp; import javafx.application.Application; import javafx.fxml.FXMLLoader; import javafx.scene.Scene; +import javafx.scene.image.Image; import javafx.stage.Stage; +import javax.imageio.ImageIO; import java.io.IOException; +import java.util.Objects; public class DrawApplication extends Application { @Override public void start(Stage stage) throws IOException { FXMLLoader fxmlLoader = new FXMLLoader(DrawApplication.class.getResource("draw-view.fxml")); Scene scene = new Scene(fxmlLoader.load(), 1280, 720); - stage.setTitle("PixelWriter"); + stage.setTitle("Yet Another Collaborative Drawing App"); + stage.getIcons().add(new Image(Objects.requireNonNull(getClass().getResourceAsStream("icon.png")))); stage.setScene(scene); stage.show(); } diff --git a/graphical-app/src/main/resources/fr/emiko/graphicalapp/icon.png b/graphical-app/src/main/resources/fr/emiko/graphicalapp/icon.png new file mode 100644 index 0000000..22046a2 Binary files /dev/null and b/graphical-app/src/main/resources/fr/emiko/graphicalapp/icon.png differ